diff --git a/iap/iap.go b/iap/iap.go index 822b7e72d3c0d55e5094d155e05b60a9303fba38..da61b886723d92475910e33688a55cc84a776d66 100644 --- a/iap/iap.go +++ b/iap/iap.go @@ -23,13 +23,14 @@ import ( "encoding/pem" "errors" "fmt" - "github.com/dgrijalva/jwt-go" "io/ioutil" "net/http" "net/url" "strings" "sync" "time" + + "github.com/dgrijalva/jwt-go" ) const ( diff --git a/migrate/migrate.go b/migrate/migrate.go index 6c9ae9f42b2cb95888e2e0954fa6db54c09cfbc2..2ecd79ea5ac8d5f8bd31cf47ac63ed30fb681ade 100644 --- a/migrate/migrate.go +++ b/migrate/migrate.go @@ -20,9 +20,6 @@ import ( "errors" "flag" "fmt" - "github.com/jackc/pgconn" - "github.com/jackc/pgerrcode" - _ "github.com/jackc/pgx/v4/stdlib" "io/ioutil" "math" "net/url" @@ -31,11 +28,13 @@ import ( "strings" "time" + "github.com/heroiclabs/nakama/v3/server" + "github.com/jackc/pgconn" + "github.com/jackc/pgerrcode" + _ "github.com/jackc/pgx/v4/stdlib" migrate "github.com/rubenv/sql-migrate" "go.uber.org/zap" "go.uber.org/zap/zapcore" - - "github.com/heroiclabs/nakama/v3/server" ) const ( diff --git a/server/api_account.go b/server/api_account.go index dae04ead4e20743785fd28052c718cc79d55a18b..b6a1991bfaec44f9f99f1e2651699c65df6b6fd3 100644 --- a/server/api_account.go +++ b/server/api_account.go @@ -17,6 +17,7 @@ package server import ( "context" "errors" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/jackc/pgconn" diff --git a/server/api_authenticate.go b/server/api_authenticate.go index 8ff3efe1beadd5b19a8386c8084e58c87d28687e..c838163836af69d3dc6da1e7b6fb10b47620cba4 100644 --- a/server/api_authenticate.go +++ b/server/api_authenticate.go @@ -22,11 +22,10 @@ import ( "strings" "time" - "go.uber.org/zap" - "github.com/dgrijalva/jwt-go" "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" + "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/server/api_channel.go b/server/api_channel.go index c90229f25649eef2b036fc03b3f5a0b9a3f5f82a..a146b2ab0e342c9d498af47ea5a58073ac9ceaaa 100644 --- a/server/api_channel.go +++ b/server/api_channel.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "go.uber.org/zap" diff --git a/server/api_event.go b/server/api_event.go index 85c2447978262dd061e3bc073efb99806c8d9597..a5301bebbdbdc2689af10b7ffcba304ae837107e 100644 --- a/server/api_event.go +++ b/server/api_event.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "go.uber.org/zap" diff --git a/server/api_friend.go b/server/api_friend.go index a0eda48a6cf8cf3fe02e6ad7872123918c98a450..6462477bf68b32723214f1f359e0f9e9cf2ff701 100644 --- a/server/api_friend.go +++ b/server/api_friend.go @@ -16,13 +16,14 @@ package server import ( "context" + "strconv" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" - "strconv" ) func (s *ApiServer) ListFriends(ctx context.Context, in *api.ListFriendsRequest) (*api.FriendList, error) { diff --git a/server/api_group.go b/server/api_group.go index 2ff902d37dfb57547f0a89f09c4eb634657c78a4..88e0cea9af9cc5a5c24dd3a9017b8d714692acd3 100644 --- a/server/api_group.go +++ b/server/api_group.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "go.uber.org/zap" diff --git a/server/api_leaderboard.go b/server/api_leaderboard.go index b00afe36ffd225eadc07e79e3edc2fff377d3205..b0de5eb6f29f9bae9aea0f54ad336676ce56f6e0 100644 --- a/server/api_leaderboard.go +++ b/server/api_leaderboard.go @@ -18,7 +18,6 @@ import ( "bytes" "context" "encoding/json" - "google.golang.org/protobuf/types/known/wrapperspb" "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" @@ -26,6 +25,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" + "google.golang.org/protobuf/types/known/wrapperspb" ) func (s *ApiServer) DeleteLeaderboardRecord(ctx context.Context, in *api.DeleteLeaderboardRecordRequest) (*emptypb.Empty, error) { diff --git a/server/api_link.go b/server/api_link.go index a969e5157334174fa373d5f9fc3daa31bcf02c9d..59fd4e487f214ee3374ed2340f79781db1669989 100644 --- a/server/api_link.go +++ b/server/api_link.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "go.uber.org/zap" diff --git a/server/api_match.go b/server/api_match.go index 553620cc1440425d21dcbaed349e36bf1a988ea5..62c1acd961fe9cb2046ae664306ada19f85bcf7b 100644 --- a/server/api_match.go +++ b/server/api_match.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "go.uber.org/zap" diff --git a/server/api_purchase.go b/server/api_purchase.go index e530d7ee7f82b28cf8ee795aff4e922dc635dbae..3e8ae637a96d737d509911de291dcfe0e86ac478 100644 --- a/server/api_purchase.go +++ b/server/api_purchase.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama-common/runtime" diff --git a/server/api_session.go b/server/api_session.go index 342ea62c0306dd1c8dc572dd8d8620ed13216f0c..d0f96c9382f212f60d25d19facb2f557bb2884ed 100644 --- a/server/api_session.go +++ b/server/api_session.go @@ -16,13 +16,13 @@ package server import ( "context" - "github.com/gofrs/uuid" - "google.golang.org/protobuf/types/known/emptypb" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "google.golang.org/protobuf/types/known/emptypb" ) func (s *ApiServer) SessionRefresh(ctx context.Context, in *api.SessionRefreshRequest) (*api.Session, error) { diff --git a/server/api_storage.go b/server/api_storage.go index b2325a79c9239419d92aa145eac8308c1e8f05a3..c2ec8328be2071759330a81015776415efaeb6c7 100644 --- a/server/api_storage.go +++ b/server/api_storage.go @@ -19,10 +19,9 @@ import ( "context" "encoding/json" - "go.uber.org/zap" - "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" + "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" diff --git a/server/api_tournament.go b/server/api_tournament.go index 7ca8aa16b96d504bc2774ba2f2fecc8f06932c37..43fd7b6b74380b93bb1b4b4030dd8a40fe69a1a9 100644 --- a/server/api_tournament.go +++ b/server/api_tournament.go @@ -20,16 +20,15 @@ import ( "encoding/base64" "encoding/gob" "encoding/json" - "google.golang.org/protobuf/types/known/wrapperspb" "time" - "go.uber.org/zap" - "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" + "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" + "google.golang.org/protobuf/types/known/wrapperspb" ) func (s *ApiServer) JoinTournament(ctx context.Context, in *api.JoinTournamentRequest) (*emptypb.Empty, error) { diff --git a/server/api_unlink.go b/server/api_unlink.go index e44ed6b987a4cca6d675dc36fe336ea78766eb66..bc707561a96252c23208a9ea5054c13439447ae2 100644 --- a/server/api_unlink.go +++ b/server/api_unlink.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "go.uber.org/zap" diff --git a/server/api_user.go b/server/api_user.go index 731de87268684f4093247088b2592d36aaebb034..deb5596f8d824811782e0977503b768bdbc6f9b4 100644 --- a/server/api_user.go +++ b/server/api_user.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "go.uber.org/zap" diff --git a/server/console.go b/server/console.go index c9a599230ffc14dea85f5959d5079c9a59e12150..3cd779ac2a41f7c9de7dea4683d72e59b667926e 100644 --- a/server/console.go +++ b/server/console.go @@ -29,18 +29,16 @@ import ( "time" "github.com/dgrijalva/jwt-go" - "google.golang.org/protobuf/encoding/protojson" - "github.com/gorilla/handlers" "github.com/gorilla/mux" grpcgw "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/heroiclabs/nakama/v3/console" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - - "github.com/heroiclabs/nakama/v3/console" + "google.golang.org/protobuf/encoding/protojson" ) var restrictedMethods = map[string]console.UserRole{ diff --git a/server/console_account.go b/server/console_account.go index 36f3a503163495889fa64cd35a1e24b3ad498dfd..3f7404e9fde5352a369ff9301ec161387398b164 100644 --- a/server/console_account.go +++ b/server/console_account.go @@ -21,21 +21,19 @@ import ( "encoding/base64" "encoding/gob" "encoding/json" - "google.golang.org/protobuf/types/known/timestamppb" "strconv" "strings" - "github.com/jackc/pgtype" - "golang.org/x/crypto/bcrypt" - "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" + "github.com/heroiclabs/nakama/v3/console" + "github.com/jackc/pgtype" "go.uber.org/zap" + "golang.org/x/crypto/bcrypt" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" - - "github.com/heroiclabs/nakama/v3/console" + "google.golang.org/protobuf/types/known/timestamppb" ) type consoleAccountCursor struct { diff --git a/server/console_api_explorer.go b/server/console_api_explorer.go index 7074cd30800cc0922f3f11d069fd7de3e37b3562..b723c1f82d6120fd4183c6451f8308be8f8469ea 100644 --- a/server/console_api_explorer.go +++ b/server/console_api_explorer.go @@ -4,6 +4,11 @@ import ( "context" "database/sql" "fmt" + "reflect" + "sort" + "strings" + "time" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama/v3/console" @@ -13,10 +18,6 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" - "reflect" - "sort" - "strings" - "time" ) type MethodName string diff --git a/server/console_authenticate.go b/server/console_authenticate.go index c7d27cf3df0dd5d20745ea6d58c147795b81b4ae..98f29856dc08b9db8bff05cf800c47be713527d1 100644 --- a/server/console_authenticate.go +++ b/server/console_authenticate.go @@ -16,21 +16,19 @@ package server import ( "context" - "crypto" "database/sql" "errors" "fmt" "time" + "github.com/dgrijalva/jwt-go" + "github.com/heroiclabs/nakama/v3/console" "github.com/jackc/pgtype" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - - "github.com/dgrijalva/jwt-go" - "github.com/heroiclabs/nakama/v3/console" ) type ConsoleTokenClaims struct { diff --git a/server/console_leaderboard.go b/server/console_leaderboard.go index d71990e733758fb3996388c652d34825a6b0da14..9d82a96f91da2c8203cd86f4b7c0120996079f19 100644 --- a/server/console_leaderboard.go +++ b/server/console_leaderboard.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama/v3/console" diff --git a/server/console_match.go b/server/console_match.go index ba56447bb366c2e08862f5dd0f127d1aa8a12a63..47af130e232af7be23222f74f7c07993d04bc80e 100644 --- a/server/console_match.go +++ b/server/console_match.go @@ -16,13 +16,14 @@ package server import ( "context" + "strings" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama/v3/console" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "strings" ) func (s *ConsoleServer) ListMatches(ctx context.Context, in *api.ListMatchesRequest) (*api.MatchList, error) { diff --git a/server/console_purchase.go b/server/console_purchase.go index 7ade9f3d10d8c441770ae16bc2245090728bffd7..ad329393dea5a091d796e5b47c71c488e7ff9a89 100644 --- a/server/console_purchase.go +++ b/server/console_purchase.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama/v3/console" diff --git a/server/console_runtime.go b/server/console_runtime.go index 17b11851484e358ddb22fcd728889363c22c67ce..c2d2e5e77e0c3b4df23b7d11e575bac3b194b905 100644 --- a/server/console_runtime.go +++ b/server/console_runtime.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/heroiclabs/nakama/v3/console" "google.golang.org/protobuf/types/known/emptypb" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/server/console_status.go b/server/console_status.go index 03d27dcfa433bce8617bfe981c7de8e612504f13..6a0e0e48df13ffbcca5c1c5f853ae5b30a1505e8 100644 --- a/server/console_status.go +++ b/server/console_status.go @@ -16,13 +16,14 @@ package server import ( "context" + "time" + "github.com/heroiclabs/nakama/v3/console" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" "google.golang.org/protobuf/types/known/timestamppb" - "time" ) func (s *ConsoleServer) GetStatus(ctx context.Context, in *emptypb.Empty) (*console.StatusList, error) { diff --git a/server/console_storage.go b/server/console_storage.go index 0c302462589a7a8b0f14df0a60942f112dafcccd..aad4cd65069fadd4ce2e68662e9be35c632e3ef3 100644 --- a/server/console_storage.go +++ b/server/console_storage.go @@ -21,7 +21,6 @@ import ( "encoding/base64" "encoding/gob" "encoding/json" - "google.golang.org/protobuf/types/known/timestamppb" "strconv" "sync/atomic" @@ -33,6 +32,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" + "google.golang.org/protobuf/types/known/timestamppb" ) type consoleStorageCursor struct { diff --git a/server/console_storage_import.go b/server/console_storage_import.go index 07c4bfa554ff45ea7abb3157da02bf8551d976c4..c573e3cdf51768c2e3d9c37fd17e37d632a92793 100644 --- a/server/console_storage_import.go +++ b/server/console_storage_import.go @@ -22,8 +22,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/heroiclabs/nakama/v3/console" - "google.golang.org/protobuf/types/known/wrapperspb" "io" "io/ioutil" "net/http" @@ -32,7 +30,9 @@ import ( "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" + "github.com/heroiclabs/nakama/v3/console" "go.uber.org/zap" + "google.golang.org/protobuf/types/known/wrapperspb" ) type importStorageObject struct { diff --git a/server/console_unlink.go b/server/console_unlink.go index 8745bf10eb2618e0f9a57d0527c3f0ff0f5fd816..ab70432bc167154c7051046ff4e8676f6f2d9372 100644 --- a/server/console_unlink.go +++ b/server/console_unlink.go @@ -16,6 +16,7 @@ package server import ( "context" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama/v3/console" "go.uber.org/zap" diff --git a/server/core_account.go b/server/core_account.go index 71e3331a811c990a44a851abf977568dce87012e..8a8451655f6f8cf9f64008eb8b14e259edea4534 100644 --- a/server/core_account.go +++ b/server/core_account.go @@ -19,6 +19,9 @@ import ( "database/sql" "encoding/json" "errors" + "strconv" + "strings" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama/v3/console" @@ -29,8 +32,6 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/wrapperspb" - "strconv" - "strings" ) var ErrAccountNotFound = errors.New("account not found") diff --git a/server/core_channel.go b/server/core_channel.go index e9c98eb62fbd01dc45a64651a25c078a762d2964..92108711357995d68c888154f967557c188ee366 100644 --- a/server/core_channel.go +++ b/server/core_channel.go @@ -22,8 +22,6 @@ import ( "encoding/gob" "errors" "fmt" - "google.golang.org/protobuf/types/known/timestamppb" - "google.golang.org/protobuf/types/known/wrapperspb" "strings" "time" @@ -31,6 +29,8 @@ import ( "github.com/heroiclabs/nakama-common/api" "github.com/jackc/pgtype" "go.uber.org/zap" + "google.golang.org/protobuf/types/known/timestamppb" + "google.golang.org/protobuf/types/known/wrapperspb" ) var ( diff --git a/server/core_friend.go b/server/core_friend.go index 4f12a763fe61e7678482a79f90fc1ff04ce03672..293f5e025d12a4eaa0a85b9f7ef10ffa8f242d66 100644 --- a/server/core_friend.go +++ b/server/core_friend.go @@ -16,23 +16,22 @@ package server import ( "bytes" + "context" "database/sql" "encoding/base64" "encoding/gob" "encoding/json" "errors" "fmt" - "google.golang.org/protobuf/types/known/timestamppb" - "google.golang.org/protobuf/types/known/wrapperspb" "strconv" "time" - "context" - "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/jackc/pgtype" "go.uber.org/zap" + "google.golang.org/protobuf/types/known/timestamppb" + "google.golang.org/protobuf/types/known/wrapperspb" ) var ErrFriendInvalidCursor = errors.New("friend cursor invalid") diff --git a/server/core_group.go b/server/core_group.go index 83e4913e0bff95674375de10df62304f326c983f..1253a011a36b2e24d60c8e1e86b88246b579863f 100644 --- a/server/core_group.go +++ b/server/core_group.go @@ -23,21 +23,20 @@ import ( "encoding/json" "errors" "fmt" - "github.com/jackc/pgconn" - "google.golang.org/protobuf/types/known/timestamppb" - "google.golang.org/protobuf/types/known/wrapperspb" "strconv" "strings" "time" - "github.com/heroiclabs/nakama-common/rtapi" - "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" + "github.com/heroiclabs/nakama-common/rtapi" + "github.com/jackc/pgconn" "github.com/jackc/pgtype" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "google.golang.org/protobuf/types/known/timestamppb" + "google.golang.org/protobuf/types/known/wrapperspb" ) var ( diff --git a/server/core_leaderboard.go b/server/core_leaderboard.go index b3de31475941b9bd5a856c039b64934cc34c0109..696a46db0bbbc3fd840494d95671e349e9e1b67d 100644 --- a/server/core_leaderboard.go +++ b/server/core_leaderboard.go @@ -21,8 +21,6 @@ import ( "encoding/base64" "encoding/gob" "errors" - "google.golang.org/protobuf/types/known/timestamppb" - "google.golang.org/protobuf/types/known/wrapperspb" "strconv" "strings" "time" @@ -31,6 +29,8 @@ import ( "github.com/heroiclabs/nakama-common/api" "github.com/jackc/pgtype" "go.uber.org/zap" + "google.golang.org/protobuf/types/known/timestamppb" + "google.golang.org/protobuf/types/known/wrapperspb" ) var ( diff --git a/server/core_notification.go b/server/core_notification.go index 873eaeecf70cfe1f12f8a5ff8531618bace461ff..5ac2d99762449c342ac7ceb7fdb4a0e7784659fe 100644 --- a/server/core_notification.go +++ b/server/core_notification.go @@ -20,16 +20,16 @@ import ( "database/sql" "encoding/base64" "encoding/gob" - "google.golang.org/protobuf/types/known/timestamppb" "strconv" "strings" + "time" "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama-common/rtapi" "github.com/jackc/pgtype" "go.uber.org/zap" - "time" + "google.golang.org/protobuf/types/known/timestamppb" ) const ( diff --git a/server/core_purchase.go b/server/core_purchase.go index 4e622f8855f150f8c2524c09d7c2785a29685d1e..0fe7a1b60fa26a03bd06894b7b70a4f66a946d0e 100644 --- a/server/core_purchase.go +++ b/server/core_purchase.go @@ -22,6 +22,11 @@ import ( "encoding/gob" "errors" "fmt" + "net/http" + "strconv" + "strings" + "time" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama-common/runtime" @@ -31,10 +36,6 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" - "net/http" - "strconv" - "strings" - "time" ) var ErrPurchasesListInvalidCursor = errors.New("purchases list cursor invalid") diff --git a/server/core_session.go b/server/core_session.go index 9245c847a4c2db85e9317be7933742054698f367..041f91eb7a9320dee064938d6b8b07908140c937 100644 --- a/server/core_session.go +++ b/server/core_session.go @@ -18,8 +18,8 @@ import ( "context" "database/sql" "errors" - "github.com/gofrs/uuid" + "github.com/gofrs/uuid" "github.com/jackc/pgtype" "go.uber.org/zap" "google.golang.org/grpc/codes" diff --git a/server/core_storage.go b/server/core_storage.go index 4a72d0e00c97745612e2434ba2a07e09122e8bb1..9287346568f8704915cf44506c413d6626dc3aa1 100644 --- a/server/core_storage.go +++ b/server/core_storage.go @@ -16,23 +16,22 @@ package server import ( "bytes" + "context" "crypto/md5" "database/sql" "encoding/base64" "encoding/gob" "errors" "fmt" - "github.com/jackc/pgconn" - "google.golang.org/protobuf/types/known/timestamppb" "sort" - "context" - "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" + "github.com/jackc/pgconn" "github.com/jackc/pgtype" "go.uber.org/zap" "google.golang.org/grpc/codes" + "google.golang.org/protobuf/types/known/timestamppb" ) var ( diff --git a/server/core_tournament.go b/server/core_tournament.go index 433af9996dc2c08403694ee4364970a938f2d3b1..0be7c67b83c12f0e083ad4d8b36fcef002f0c268 100644 --- a/server/core_tournament.go +++ b/server/core_tournament.go @@ -22,8 +22,6 @@ import ( "encoding/gob" "errors" "fmt" - "google.golang.org/protobuf/types/known/timestamppb" - "google.golang.org/protobuf/types/known/wrapperspb" "strconv" "strings" "time" @@ -33,6 +31,8 @@ import ( "github.com/heroiclabs/nakama/v3/internal/cronexpr" "github.com/jackc/pgtype" "go.uber.org/zap" + "google.golang.org/protobuf/types/known/timestamppb" + "google.golang.org/protobuf/types/known/wrapperspb" ) var ( diff --git a/server/core_unlink.go b/server/core_unlink.go index 0915952915a0fa0b93557015bf215b9f72811c2e..679e8358575014fffa7331c83babef37a2f6217c 100644 --- a/server/core_unlink.go +++ b/server/core_unlink.go @@ -17,13 +17,14 @@ package server import ( "context" "database/sql" + "strconv" + "strings" + "github.com/gofrs/uuid" "github.com/heroiclabs/nakama/v3/social" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "strconv" - "strings" ) func UnlinkApple(ctx context.Context, logger *zap.Logger, db *sql.DB, config Config, socialClient *social.Client, id uuid.UUID, token string) error { diff --git a/server/core_user.go b/server/core_user.go index c14b845a75f1a007a07501882c88cf1d98360457..25070e311241a7dbe7ee21c5d8dbfd97f14bcc6e 100644 --- a/server/core_user.go +++ b/server/core_user.go @@ -17,7 +17,6 @@ package server import ( "context" "database/sql" - "google.golang.org/protobuf/types/known/timestamppb" "strconv" "strings" @@ -25,6 +24,7 @@ import ( "github.com/heroiclabs/nakama-common/api" "github.com/jackc/pgtype" "go.uber.org/zap" + "google.golang.org/protobuf/types/known/timestamppb" ) func GetUsers(ctx context.Context, logger *zap.Logger, db *sql.DB, tracker Tracker, ids, usernames, fbIDs []string) (*api.Users, error) { diff --git a/server/core_wallet.go b/server/core_wallet.go index ccd63ecb2844c75a370c0ea1157042e8a570194f..0ad0b86b7bbc49afda9004f473c1352df19ca6e6 100644 --- a/server/core_wallet.go +++ b/server/core_wallet.go @@ -23,13 +23,13 @@ import ( "encoding/json" "errors" "fmt" - "github.com/heroiclabs/nakama-common/runtime" "sort" "strconv" "strings" "time" "github.com/gofrs/uuid" + "github.com/heroiclabs/nakama-common/runtime" "github.com/jackc/pgtype" "go.uber.org/zap" ) diff --git a/server/db.go b/server/db.go index 47cbf37987abcf53a3afede51c67eaf47140c0e6..a08bf87b029ca9743dccdbcc9de42595214c7b04 100644 --- a/server/db.go +++ b/server/db.go @@ -18,6 +18,7 @@ import ( "context" "database/sql" "errors" + "github.com/jackc/pgconn" "github.com/jackc/pgerrcode" ) diff --git a/server/db_error.go b/server/db_error.go index e6645634acb56b1912b92d6ccc5ff17bbe7a89df..aa0dbe7ecc2e576c00d52b8795afa2e195458f83 100644 --- a/server/db_error.go +++ b/server/db_error.go @@ -17,6 +17,7 @@ package server import ( "errors" "fmt" + "github.com/jackc/pgerrcode" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/server/leaderboard_rank_cache.go b/server/leaderboard_rank_cache.go index ca95f40c92cac8e00299040d301f2a2c55976a37..1c4c22db5e53b3473274c2cd09292a2cdd9d6aa8 100644 --- a/server/leaderboard_rank_cache.go +++ b/server/leaderboard_rank_cache.go @@ -19,11 +19,9 @@ import ( "sync" "time" - "github.com/heroiclabs/nakama/v3/internal/skiplist" - - "github.com/heroiclabs/nakama-common/api" - "github.com/gofrs/uuid" + "github.com/heroiclabs/nakama-common/api" + "github.com/heroiclabs/nakama/v3/internal/skiplist" "go.uber.org/zap" ) diff --git a/server/leaderboard_scheduler.go b/server/leaderboard_scheduler.go index bc9ded33df8c1f44c0b4e1cbf8109ad7219599e5..afb2000d379234a89310f356da8b71c66ad5b1ab 100644 --- a/server/leaderboard_scheduler.go +++ b/server/leaderboard_scheduler.go @@ -21,7 +21,6 @@ import ( "time" "go.uber.org/atomic" - "go.uber.org/zap" ) diff --git a/server/match_handler.go b/server/match_handler.go index a1f76ebdde9c198bac7ead0f3c03aede4c6e7647..cdcbb6861b5a23988f7a344976a119de600413b4 100644 --- a/server/match_handler.go +++ b/server/match_handler.go @@ -18,10 +18,10 @@ import ( "context" "errors" "fmt" - "github.com/heroiclabs/nakama-common/runtime" "time" "github.com/gofrs/uuid" + "github.com/heroiclabs/nakama-common/runtime" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/server/matchmaker.go b/server/matchmaker.go index cc699fe7ce4ddd76fd965833a7b93e699d8c80eb..9684381889fefe649ebd513ec49fe0f5f7b6d63a 100644 --- a/server/matchmaker.go +++ b/server/matchmaker.go @@ -18,18 +18,18 @@ import ( "context" "errors" "fmt" - "github.com/blevesearch/bleve/v2/index/upsidedown" - "github.com/dgrijalva/jwt-go" - "github.com/heroiclabs/nakama-common/rtapi" - "github.com/heroiclabs/nakama-common/runtime" - "github.com/heroiclabs/nakama/v3/gtreap_compact" - "go.uber.org/atomic" "sync" "time" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/analysis/analyzer/keyword" + "github.com/blevesearch/bleve/v2/index/upsidedown" + "github.com/dgrijalva/jwt-go" "github.com/gofrs/uuid" + "github.com/heroiclabs/nakama-common/rtapi" + "github.com/heroiclabs/nakama-common/runtime" + "github.com/heroiclabs/nakama/v3/gtreap_compact" + "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/server/metrics.go b/server/metrics.go index bdc24b7bfca4dc88a87208b56182e012b7fd8469..2133d03101d8a7a25a0d808096185bbe645ce0b3 100644 --- a/server/metrics.go +++ b/server/metrics.go @@ -23,11 +23,10 @@ import ( "strings" "time" - "go.uber.org/atomic" - "github.com/gorilla/handlers" "github.com/uber-go/tally" "github.com/uber-go/tally/prometheus" + "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/server/pipeline_channel.go b/server/pipeline_channel.go index 3b0312e74efde5ffe0b981b1cc8c775e052b2582..17c6cbbbe6c5802f3ec4a44048b92c1f8b5f9cd3 100644 --- a/server/pipeline_channel.go +++ b/server/pipeline_channel.go @@ -20,8 +20,6 @@ import ( "encoding/json" "errors" "fmt" - "google.golang.org/protobuf/types/known/timestamppb" - "google.golang.org/protobuf/types/known/wrapperspb" "regexp" "time" "unicode/utf8" @@ -31,6 +29,8 @@ import ( "github.com/heroiclabs/nakama-common/rtapi" "github.com/jackc/pgtype" "go.uber.org/zap" + "google.golang.org/protobuf/types/known/timestamppb" + "google.golang.org/protobuf/types/known/wrapperspb" ) const ( diff --git a/server/pipeline_match.go b/server/pipeline_match.go index 4f66f478d9c9e9c421dc86490ca2503a4e6ff3bc..cfe1343933615f5f4d0dced637aa3dcf51db25bd 100644 --- a/server/pipeline_match.go +++ b/server/pipeline_match.go @@ -17,7 +17,6 @@ package server import ( "crypto" "fmt" - "google.golang.org/protobuf/types/known/wrapperspb" "strings" "time" @@ -25,6 +24,7 @@ import ( "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/rtapi" "go.uber.org/zap" + "google.golang.org/protobuf/types/known/wrapperspb" ) type matchDataFilter struct { diff --git a/server/pipeline_status.go b/server/pipeline_status.go index 13e0f4042aad21650edeafec2ff1ff586493104e..bf134fe2407a3da0fea42f747e3845fdae264719 100644 --- a/server/pipeline_status.go +++ b/server/pipeline_status.go @@ -15,13 +15,13 @@ package server import ( - "google.golang.org/protobuf/types/known/wrapperspb" "strconv" "strings" "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/rtapi" "go.uber.org/zap" + "google.golang.org/protobuf/types/known/wrapperspb" ) func (p *Pipeline) statusFollow(logger *zap.Logger, session Session, envelope *rtapi.Envelope) { diff --git a/server/runtime.go b/server/runtime.go index b05c4882d9b630c2e77e20b2737caa4cbfbf3660..e2606e4b3e06bb5261dcf3e46e394dc758ec9d6a 100644 --- a/server/runtime.go +++ b/server/runtime.go @@ -24,14 +24,12 @@ import ( "sync" "time" - "go.uber.org/atomic" - - "github.com/heroiclabs/nakama-common/runtime" - "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama-common/rtapi" + "github.com/heroiclabs/nakama-common/runtime" "github.com/heroiclabs/nakama/v3/social" + "go.uber.org/atomic" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/protobuf/encoding/protojson" diff --git a/server/runtime_event.go b/server/runtime_event.go index 151a91f44ff0ec05e69d632e712375b9af2b17c7..be92d08dd9309bc785022a33b20541da732bfab0 100644 --- a/server/runtime_event.go +++ b/server/runtime_event.go @@ -16,6 +16,7 @@ package server import ( "context" + "go.uber.org/zap" ) diff --git a/server/runtime_go.go b/server/runtime_go.go index a70b3b8b5d72bf8193484360195b3d8a927bf6d5..ea88e6f4edb66d48e9ada2452a6ce0d8aaed8c5e 100644 --- a/server/runtime_go.go +++ b/server/runtime_go.go @@ -18,9 +18,6 @@ import ( "context" "database/sql" "errors" - - "go.uber.org/atomic" - "path/filepath" "plugin" "strings" @@ -31,6 +28,7 @@ import ( "github.com/heroiclabs/nakama-common/rtapi" "github.com/heroiclabs/nakama-common/runtime" "github.com/heroiclabs/nakama/v3/social" + "go.uber.org/atomic" "go.uber.org/zap" "google.golang.org/grpc/codes" "google.golang.org/protobuf/encoding/protojson" diff --git a/server/runtime_go_logger.go b/server/runtime_go_logger.go index 98a0accf38b407295af2e852e26273cb0ecd36b8..e3adf6ac725c6a6ae760737bbea57a543c724ef2 100644 --- a/server/runtime_go_logger.go +++ b/server/runtime_go_logger.go @@ -16,10 +16,11 @@ package server import ( "fmt" - nkruntime "github.com/heroiclabs/nakama-common/runtime" - "go.uber.org/zap" "runtime" "strings" + + nkruntime "github.com/heroiclabs/nakama-common/runtime" + "go.uber.org/zap" ) type RuntimeGoLogger struct { diff --git a/server/runtime_go_nakama.go b/server/runtime_go_nakama.go index 934f0ef6692597b15ea9e4489f9f093f873ae3a0..a45d6bcd2e6ad5aa6c1ca2417270a2595e732bb7 100644 --- a/server/runtime_go_nakama.go +++ b/server/runtime_go_nakama.go @@ -23,8 +23,6 @@ import ( "encoding/json" "errors" "fmt" - "google.golang.org/protobuf/types/known/timestamppb" - "google.golang.org/protobuf/types/known/wrapperspb" "os" "strings" "sync" @@ -38,6 +36,8 @@ import ( "github.com/heroiclabs/nakama/v3/social" "go.uber.org/zap" "google.golang.org/protobuf/encoding/protojson" + "google.golang.org/protobuf/types/known/timestamppb" + "google.golang.org/protobuf/types/known/wrapperspb" ) type RuntimeGoNakamaModule struct { diff --git a/server/runtime_javascript.go b/server/runtime_javascript.go index 68e59a17dacd072e2709bfdee9d4a595be766070..3da9a7708b19b4c96421c34e3c39803cd149f4cf 100644 --- a/server/runtime_javascript.go +++ b/server/runtime_javascript.go @@ -20,6 +20,12 @@ import ( "encoding/json" "errors" "fmt" + "io/ioutil" + "os" + "path/filepath" + "sort" + "strings" + "github.com/dop251/goja" "github.com/dop251/goja/ast" "github.com/gofrs/uuid" @@ -32,11 +38,6 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "io/ioutil" - "os" - "path/filepath" - "sort" - "strings" ) const JsEntrypointFilename = "index.js" diff --git a/server/runtime_javascript_init.go b/server/runtime_javascript_init.go index 06f2e89b0680fc247ad011e9f3c7a07cdd5e049a..4d2f8b389412c30bbbb4fbebf13a8462292c3d76 100644 --- a/server/runtime_javascript_init.go +++ b/server/runtime_javascript_init.go @@ -20,9 +20,8 @@ import ( "strings" "sync" - "github.com/dop251/goja/ast" - "github.com/dop251/goja" + "github.com/dop251/goja/ast" "go.uber.org/zap" ) diff --git a/server/runtime_javascript_localcache.go b/server/runtime_javascript_localcache.go index 95f46715c513a53d4c9d505e2d8b1256ce07f89c..5a0597a1c1ae4da0396f844b2a684ea7e4a2ee25 100644 --- a/server/runtime_javascript_localcache.go +++ b/server/runtime_javascript_localcache.go @@ -15,8 +15,9 @@ package server import ( - "github.com/dop251/goja" "sync" + + "github.com/dop251/goja" ) type RuntimeJavascriptLocalCache struct { diff --git a/server/runtime_javascript_logger.go b/server/runtime_javascript_logger.go index b6dc418e5f0cb81382fc0da2a4543b0856a91675..87c2bcbe3437de40ba27d33afe94bc84a3a87a19 100644 --- a/server/runtime_javascript_logger.go +++ b/server/runtime_javascript_logger.go @@ -17,6 +17,7 @@ package server import ( "errors" "fmt" + "github.com/dop251/goja" "go.uber.org/zap" ) diff --git a/server/runtime_javascript_nakama.go b/server/runtime_javascript_nakama.go index b48f08cac46dcfedb79c595eda4b26ac07883859..5a4644019fa80d9423f8895f6c208f607951d65d 100644 --- a/server/runtime_javascript_nakama.go +++ b/server/runtime_javascript_nakama.go @@ -34,26 +34,25 @@ import ( "encoding/pem" "errors" "fmt" - "github.com/heroiclabs/nakama-common/runtime" - "google.golang.org/protobuf/encoding/protojson" - "google.golang.org/protobuf/types/known/timestamppb" - "google.golang.org/protobuf/types/known/wrapperspb" "io" "io/ioutil" "net/http" "strings" "time" - "github.com/heroiclabs/nakama-common/rtapi" - "github.com/heroiclabs/nakama/v3/internal/cronexpr" - "github.com/dgrijalva/jwt-go" "github.com/dop251/goja" "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" + "github.com/heroiclabs/nakama-common/rtapi" + "github.com/heroiclabs/nakama-common/runtime" + "github.com/heroiclabs/nakama/v3/internal/cronexpr" "github.com/heroiclabs/nakama/v3/social" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" + "google.golang.org/protobuf/encoding/protojson" + "google.golang.org/protobuf/types/known/timestamppb" + "google.golang.org/protobuf/types/known/wrapperspb" ) type runtimeJavascriptNakamaModule struct { diff --git a/server/runtime_lua.go b/server/runtime_lua.go index bef7aec792f8ecbcde6751ff7595aa4e70abcb00..d68bccb4c6af17b035546784de6625f30576b127 100644 --- a/server/runtime_lua.go +++ b/server/runtime_lua.go @@ -28,14 +28,13 @@ import ( "strings" "sync" - "go.uber.org/atomic" - "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama-common/rtapi" "github.com/heroiclabs/nakama-common/runtime" lua "github.com/heroiclabs/nakama/v3/internal/gopher-lua" "github.com/heroiclabs/nakama/v3/social" + "go.uber.org/atomic" "go.uber.org/zap" "go.uber.org/zap/zapcore" "google.golang.org/grpc/codes" diff --git a/server/runtime_lua_bit32.go b/server/runtime_lua_bit32.go index 22d26e0f03791f1764aa91013af9c69510f8cd85..9499921feaea101345d4171946c0183100da4195 100644 --- a/server/runtime_lua_bit32.go +++ b/server/runtime_lua_bit32.go @@ -18,7 +18,7 @@ import ( "math" "math/bits" - "github.com/heroiclabs/nakama/v3/internal/gopher-lua" + lua "github.com/heroiclabs/nakama/v3/internal/gopher-lua" ) var ( diff --git a/server/runtime_lua_context.go b/server/runtime_lua_context.go index 67a77ab3452bfcb96fe1a01a764fb01ea8b0c390..d6ee353e805e341ff4dc2cee7d07fb9e066011da 100644 --- a/server/runtime_lua_context.go +++ b/server/runtime_lua_context.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "github.com/heroiclabs/nakama/v3/internal/gopher-lua" + lua "github.com/heroiclabs/nakama/v3/internal/gopher-lua" ) const ( diff --git a/server/runtime_lua_loadlib.go b/server/runtime_lua_loadlib.go index afc9f8f6fd45cef971490301b070ab59b55c932b..e3686c166255ce59f9519398b86b41a8751d2dfc 100644 --- a/server/runtime_lua_loadlib.go +++ b/server/runtime_lua_loadlib.go @@ -29,7 +29,7 @@ import ( "path/filepath" "strings" - "github.com/heroiclabs/nakama/v3/internal/gopher-lua" + lua "github.com/heroiclabs/nakama/v3/internal/gopher-lua" ) const emptyLString lua.LString = lua.LString("") diff --git a/server/runtime_lua_nakama.go b/server/runtime_lua_nakama.go index 18b1342df841968de4d5ff94b253be3869d4ecc4..f8686798c5abce4d9281cec4db262449aa6c5b0b 100644 --- a/server/runtime_lua_nakama.go +++ b/server/runtime_lua_nakama.go @@ -32,9 +32,6 @@ import ( "encoding/json" "encoding/pem" "fmt" - "github.com/heroiclabs/nakama-common/runtime" - "google.golang.org/protobuf/types/known/timestamppb" - "google.golang.org/protobuf/types/known/wrapperspb" "io" "io/ioutil" "net/http" @@ -43,16 +40,18 @@ import ( "time" "github.com/dgrijalva/jwt-go" - "google.golang.org/protobuf/encoding/protojson" - "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/api" "github.com/heroiclabs/nakama-common/rtapi" + "github.com/heroiclabs/nakama-common/runtime" "github.com/heroiclabs/nakama/v3/internal/cronexpr" lua "github.com/heroiclabs/nakama/v3/internal/gopher-lua" "github.com/heroiclabs/nakama/v3/social" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" + "google.golang.org/protobuf/encoding/protojson" + "google.golang.org/protobuf/types/known/timestamppb" + "google.golang.org/protobuf/types/known/wrapperspb" ) type ctxLoggerFields struct{} diff --git a/server/runtime_lua_oslib.go b/server/runtime_lua_oslib.go index f611ce7613dc53895c3935fda2c4310945b06415..934704470fd4885ad4be64437fae61195add04a7 100644 --- a/server/runtime_lua_oslib.go +++ b/server/runtime_lua_oslib.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/heroiclabs/nakama/v3/internal/gopher-lua" + lua "github.com/heroiclabs/nakama/v3/internal/gopher-lua" ) var startedAt time.Time diff --git a/server/session_registry.go b/server/session_registry.go index 2f59a46fb006475b378d06708d56ac5795759518..09eba1f283601dc4c0f3251c6ffa10bdaf722a51 100644 --- a/server/session_registry.go +++ b/server/session_registry.go @@ -16,13 +16,12 @@ package server import ( "context" - "github.com/heroiclabs/nakama-common/runtime" "sync" - "go.uber.org/atomic" - "github.com/gofrs/uuid" "github.com/heroiclabs/nakama-common/rtapi" + "github.com/heroiclabs/nakama-common/runtime" + "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/server/session_ws.go b/server/session_ws.go index 805b59199a20f735d88ee7fb4b1cd268f4bd490a..37a8e015b97e5a67b0dab4a6419c19b7eb16419a 100644 --- a/server/session_ws.go +++ b/server/session_ws.go @@ -18,13 +18,10 @@ import ( "context" "errors" "fmt" + "net" "sync" "time" - "google.golang.org/protobuf/proto" - - "net" - "github.com/gofrs/uuid" "github.com/gorilla/websocket" "github.com/heroiclabs/nakama-common/rtapi" @@ -32,6 +29,7 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" "google.golang.org/protobuf/encoding/protojson" + "google.golang.org/protobuf/proto" ) var ErrSessionQueueFull = errors.New("session outgoing queue full") diff --git a/server/status_handler.go b/server/status_handler.go index c17bf458d4df28b43710a48dfa798537ea292f15..cdc2d53276112254fb7e7172c85369c2c5b07e1f 100644 --- a/server/status_handler.go +++ b/server/status_handler.go @@ -16,9 +16,10 @@ package server import ( "context" + "runtime" + "github.com/heroiclabs/nakama/v3/console" "go.uber.org/zap" - "runtime" ) type StatusHandler interface { diff --git a/server/tracker.go b/server/tracker.go index d1a7f50470b35e71ecee4d85a450c41350497978..412773065bf6b2a59c1de77f46ba271a1b4a3f9d 100644 --- a/server/tracker.go +++ b/server/tracker.go @@ -17,7 +17,6 @@ package server import ( "context" "fmt" - "google.golang.org/protobuf/types/known/wrapperspb" "sync" syncAtomic "sync/atomic" "time" @@ -29,6 +28,7 @@ import ( "go.uber.org/zap" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/wrapperspb" ) const ( diff --git a/social/social.go b/social/social.go index 707a6b461fd8157e87cb02d4c3bb2fe88ce056b2..d4498e8eeb86e902320f57bf2d28b738bbf258a7 100644 --- a/social/social.go +++ b/social/social.go @@ -26,7 +26,6 @@ import ( "encoding/pem" "errors" "fmt" - "go.uber.org/zap" "io/ioutil" "math/big" "net/http" @@ -37,6 +36,7 @@ import ( "time" "github.com/dgrijalva/jwt-go" + "go.uber.org/zap" ) // Client is responsible for making calls to different providers