Commit ce725b02 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Correct naming of delete notifications before/after hook registration functions.

parent 33c38670

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Surface error message from Apple authentication JWT verification failures.

- Improve user online status lookups.

- Build with Go 1.18.1 release.

- Correct naming of delete notifications before/after hook registration functions.



### Fixed

- Fix data returned by StreamUserList in JS runtime.

go.mod

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ require ( 
	github.com/gorilla/mux v1.8.0

	github.com/gorilla/websocket v1.4.2

	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0

	github.com/heroiclabs/nakama-common v1.22.1-0.20220421143658-94ea09b04aff

	github.com/heroiclabs/nakama-common v1.22.1-0.20220506145920-4c0b3c5a4a43

	github.com/jackc/pgconn v1.10.0

	github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451

	github.com/jackc/pgtype v1.8.1

go.sum

+2 −2
Original line number Diff line number Diff line
@@ -255,8 +255,8 @@ github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHh 
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=

github.com/heroiclabs/nakama-common v1.22.1-0.20220421143658-94ea09b04aff h1:o0b1y1lK0Vmkmta27L/2/zUzXgFcHGtgK+jatuuFWDk=

github.com/heroiclabs/nakama-common v1.22.1-0.20220421143658-94ea09b04aff/go.mod h1:WF4YG46afwY3ibzsXnkt3zvhQ3tBY03IYeU7xSLr8HE=

github.com/heroiclabs/nakama-common v1.22.1-0.20220506145920-4c0b3c5a4a43 h1:aNV5cSox9Bby8wClFmxVL7YjgzzyO/cXDrRvM4R3424=

github.com/heroiclabs/nakama-common v1.22.1-0.20220506145920-4c0b3c5a4a43/go.mod h1:WF4YG46afwY3ibzsXnkt3zvhQ3tBY03IYeU7xSLr8HE=

github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=

github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=

server/api_notification.go

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ func (s *ApiServer) DeleteNotifications(ctx context.Context, in *api.DeleteNotif 
	userID := ctx.Value(ctxUserIDKey{}).(uuid.UUID)



	// Before hook.

	if fn := s.runtime.BeforeDeleteNotification(); fn != nil {

	if fn := s.runtime.BeforeDeleteNotifications(); fn != nil {

		beforeFn := func(clientIP, clientPort string) error {

			result, err, code := fn(ctx, s.logger, ctx.Value(ctxUserIDKey{}).(uuid.UUID).String(), ctx.Value(ctxUsernameKey{}).(string), ctx.Value(ctxVarsKey{}).(map[string]string), ctx.Value(ctxExpiryKey{}).(int64), clientIP, clientPort, in)

			if err != nil {
@@ -130,7 +130,7 @@ func (s *ApiServer) DeleteNotifications(ctx context.Context, in *api.DeleteNotif 
	}



	// After hook.

	if fn := s.runtime.AfterDeleteNotification(); fn != nil {

	if fn := s.runtime.AfterDeleteNotifications(); fn != nil {

		afterFn := func(clientIP, clientPort string) error {

			return fn(ctx, s.logger, ctx.Value(ctxUserIDKey{}).(uuid.UUID).String(), ctx.Value(ctxUsernameKey{}).(string), ctx.Value(ctxVarsKey{}).(map[string]string), ctx.Value(ctxExpiryKey{}).(int64), clientIP, clientPort, in)

		}

server/runtime.go

+24 −24
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ type ( 
	RuntimeAfterListMatchesFunction                        func(ctx context.Context, logger *zap.Logger, userID, username string, vars map[string]string, expiry int64, clientIP, clientPort string, out *api.MatchList, in *api.ListMatchesRequest) error

	RuntimeBeforeListNotificationsFunction                 func(ctx context.Context, logger *zap.Logger, userID, username string, vars map[string]string, expiry int64, clientIP, clientPort string, in *api.ListNotificationsRequest) (*api.ListNotificationsRequest, error, codes.Code)

	RuntimeAfterListNotificationsFunction                  func(ctx context.Context, logger *zap.Logger, userID, username string, vars map[string]string, expiry int64, clientIP, clientPort string, out *api.NotificationList, in *api.ListNotificationsRequest) error

	RuntimeBeforeDeleteNotificationFunction                func(ctx context.Context, logger *zap.Logger, userID, username string, vars map[string]string, expiry int64, clientIP, clientPort string, in *api.DeleteNotificationsRequest) (*api.DeleteNotificationsRequest, error, codes.Code)

	RuntimeAfterDeleteNotificationFunction                 func(ctx context.Context, logger *zap.Logger, userID, username string, vars map[string]string, expiry int64, clientIP, clientPort string, in *api.DeleteNotificationsRequest) error

	RuntimeBeforeDeleteNotificationsFunction               func(ctx context.Context, logger *zap.Logger, userID, username string, vars map[string]string, expiry int64, clientIP, clientPort string, in *api.DeleteNotificationsRequest) (*api.DeleteNotificationsRequest, error, codes.Code)

	RuntimeAfterDeleteNotificationsFunction                func(ctx context.Context, logger *zap.Logger, userID, username string, vars map[string]string, expiry int64, clientIP, clientPort string, in *api.DeleteNotificationsRequest) error

	RuntimeBeforeListStorageObjectsFunction                func(ctx context.Context, logger *zap.Logger, userID, username string, vars map[string]string, expiry int64, clientIP, clientPort string, in *api.ListStorageObjectsRequest) (*api.ListStorageObjectsRequest, error, codes.Code)

	RuntimeAfterListStorageObjectsFunction                 func(ctx context.Context, logger *zap.Logger, userID, username string, vars map[string]string, expiry int64, clientIP, clientPort string, out *api.StorageObjectList, in *api.ListStorageObjectsRequest) error

	RuntimeBeforeReadStorageObjectsFunction                func(ctx context.Context, logger *zap.Logger, userID, username string, vars map[string]string, expiry int64, clientIP, clientPort string, in *api.ReadStorageObjectsRequest) (*api.ReadStorageObjectsRequest, error, codes.Code)
@@ -344,7 +344,7 @@ type RuntimeBeforeReqFunctions struct { 
	beforeLinkSteamFunction                         RuntimeBeforeLinkSteamFunction

	beforeListMatchesFunction                       RuntimeBeforeListMatchesFunction

	beforeListNotificationsFunction                 RuntimeBeforeListNotificationsFunction

	beforeDeleteNotificationFunction                RuntimeBeforeDeleteNotificationFunction

	beforeDeleteNotificationsFunction               RuntimeBeforeDeleteNotificationsFunction

	beforeListStorageObjectsFunction                RuntimeBeforeListStorageObjectsFunction

	beforeReadStorageObjectsFunction                RuntimeBeforeReadStorageObjectsFunction

	beforeWriteStorageObjectsFunction               RuntimeBeforeWriteStorageObjectsFunction
@@ -419,7 +419,7 @@ type RuntimeAfterReqFunctions struct { 
	afterLinkSteamFunction                         RuntimeAfterLinkSteamFunction

	afterListMatchesFunction                       RuntimeAfterListMatchesFunction

	afterListNotificationsFunction                 RuntimeAfterListNotificationsFunction

	afterDeleteNotificationFunction                RuntimeAfterDeleteNotificationFunction

	afterDeleteNotificationsFunction               RuntimeAfterDeleteNotificationsFunction

	afterListStorageObjectsFunction                RuntimeAfterListStorageObjectsFunction

	afterReadStorageObjectsFunction                RuntimeAfterReadStorageObjectsFunction

	afterWriteStorageObjectsFunction               RuntimeAfterWriteStorageObjectsFunction
@@ -818,8 +818,8 @@ func NewRuntime(ctx context.Context, logger, startupLogger *zap.Logger, db *sql. 
	if allBeforeReqFunctions.beforeListNotificationsFunction != nil {

		startupLogger.Info("Registered JavaScript runtime Before function invocation", zap.String("id", "listnotifications"))

	}

	if allBeforeReqFunctions.beforeDeleteNotificationFunction != nil {

		startupLogger.Info("Registered JavaScript runtime Before function invocation", zap.String("id", "deletenotification"))

	if allBeforeReqFunctions.beforeDeleteNotificationsFunction != nil {

		startupLogger.Info("Registered JavaScript runtime Before function invocation", zap.String("id", "deletenotifications"))

	}

	if allBeforeReqFunctions.beforeListStorageObjectsFunction != nil {

		startupLogger.Info("Registered JavaScript runtime Before function invocation", zap.String("id", "liststorageobjects"))
@@ -1080,9 +1080,9 @@ func NewRuntime(ctx context.Context, logger, startupLogger *zap.Logger, db *sql. 
		allBeforeReqFunctions.beforeListNotificationsFunction = luaBeforeReqFunctions.beforeListNotificationsFunction

		startupLogger.Info("Registered Lua runtime Before function invocation", zap.String("id", "listnotifications"))

	}

	if luaBeforeReqFunctions.beforeDeleteNotificationFunction != nil {

		allBeforeReqFunctions.beforeDeleteNotificationFunction = luaBeforeReqFunctions.beforeDeleteNotificationFunction

		startupLogger.Info("Registered Lua runtime Before function invocation", zap.String("id", "deletenotification"))

	if luaBeforeReqFunctions.beforeDeleteNotificationsFunction != nil {

		allBeforeReqFunctions.beforeDeleteNotificationsFunction = luaBeforeReqFunctions.beforeDeleteNotificationsFunction

		startupLogger.Info("Registered Lua runtime Before function invocation", zap.String("id", "deletenotifications"))

	}

	if luaBeforeReqFunctions.beforeListStorageObjectsFunction != nil {

		allBeforeReqFunctions.beforeListStorageObjectsFunction = luaBeforeReqFunctions.beforeListStorageObjectsFunction
@@ -1370,9 +1370,9 @@ func NewRuntime(ctx context.Context, logger, startupLogger *zap.Logger, db *sql. 
		allBeforeReqFunctions.beforeListNotificationsFunction = goBeforeReqFunctions.beforeListNotificationsFunction

		startupLogger.Info("Registered Go runtime Before function invocation", zap.String("id", "listnotifications"))

	}

	if goBeforeReqFunctions.beforeDeleteNotificationFunction != nil {

		allBeforeReqFunctions.beforeDeleteNotificationFunction = goBeforeReqFunctions.beforeDeleteNotificationFunction

		startupLogger.Info("Registered Go runtime Before function invocation", zap.String("id", "deletenotification"))

	if goBeforeReqFunctions.beforeDeleteNotificationsFunction != nil {

		allBeforeReqFunctions.beforeDeleteNotificationsFunction = goBeforeReqFunctions.beforeDeleteNotificationsFunction

		startupLogger.Info("Registered Go runtime Before function invocation", zap.String("id", "deletenotifications"))

	}

	if goBeforeReqFunctions.beforeListStorageObjectsFunction != nil {

		allBeforeReqFunctions.beforeListStorageObjectsFunction = goBeforeReqFunctions.beforeListStorageObjectsFunction
@@ -1613,8 +1613,8 @@ func NewRuntime(ctx context.Context, logger, startupLogger *zap.Logger, db *sql. 
	if allAfterReqFunctions.afterListNotificationsFunction != nil {

		startupLogger.Info("Registered JavaScript runtime After function invocation", zap.String("id", "listnotifications"))

	}

	if allAfterReqFunctions.afterDeleteNotificationFunction != nil {

		startupLogger.Info("Registered JavaScript runtime After function invocation", zap.String("id", "deletenotification"))

	if allAfterReqFunctions.afterDeleteNotificationsFunction != nil {

		startupLogger.Info("Registered JavaScript runtime After function invocation", zap.String("id", "deletenotifications"))

	}

	if allAfterReqFunctions.afterListStorageObjectsFunction != nil {

		startupLogger.Info("Registered JavaScript runtime After function invocation", zap.String("id", "liststorageobjects"))
@@ -1875,9 +1875,9 @@ func NewRuntime(ctx context.Context, logger, startupLogger *zap.Logger, db *sql. 
		allAfterReqFunctions.afterListNotificationsFunction = luaAfterReqFunctions.afterListNotificationsFunction

		startupLogger.Info("Registered Lua runtime After function invocation", zap.String("id", "listnotifications"))

	}

	if luaAfterReqFunctions.afterDeleteNotificationFunction != nil {

		allAfterReqFunctions.afterDeleteNotificationFunction = luaAfterReqFunctions.afterDeleteNotificationFunction

		startupLogger.Info("Registered Lua runtime After function invocation", zap.String("id", "deletenotification"))

	if luaAfterReqFunctions.afterDeleteNotificationsFunction != nil {

		allAfterReqFunctions.afterDeleteNotificationsFunction = luaAfterReqFunctions.afterDeleteNotificationsFunction

		startupLogger.Info("Registered Lua runtime After function invocation", zap.String("id", "deletenotifications"))

	}

	if luaAfterReqFunctions.afterListStorageObjectsFunction != nil {

		allAfterReqFunctions.afterListStorageObjectsFunction = luaAfterReqFunctions.afterListStorageObjectsFunction
@@ -2165,9 +2165,9 @@ func NewRuntime(ctx context.Context, logger, startupLogger *zap.Logger, db *sql. 
		allAfterReqFunctions.afterListNotificationsFunction = goAfterReqFunctions.afterListNotificationsFunction

		startupLogger.Info("Registered Go runtime After function invocation", zap.String("id", "listnotifications"))

	}

	if goAfterReqFunctions.afterDeleteNotificationFunction != nil {

		allAfterReqFunctions.afterDeleteNotificationFunction = goAfterReqFunctions.afterDeleteNotificationFunction

		startupLogger.Info("Registered Go runtime After function invocation", zap.String("id", "deletenotification"))

	if goAfterReqFunctions.afterDeleteNotificationsFunction != nil {

		allAfterReqFunctions.afterDeleteNotificationsFunction = goAfterReqFunctions.afterDeleteNotificationsFunction

		startupLogger.Info("Registered Go runtime After function invocation", zap.String("id", "deletenotifications"))

	}

	if goAfterReqFunctions.afterListStorageObjectsFunction != nil {

		allAfterReqFunctions.afterListStorageObjectsFunction = goAfterReqFunctions.afterListStorageObjectsFunction
@@ -2807,12 +2807,12 @@ func (r *Runtime) AfterListNotifications() RuntimeAfterListNotificationsFunction 
	return r.afterReqFunctions.afterListNotificationsFunction

}



func (r *Runtime) BeforeDeleteNotification() RuntimeBeforeDeleteNotificationFunction {

	return r.beforeReqFunctions.beforeDeleteNotificationFunction

func (r *Runtime) BeforeDeleteNotifications() RuntimeBeforeDeleteNotificationsFunction {

	return r.beforeReqFunctions.beforeDeleteNotificationsFunction

}



func (r *Runtime) AfterDeleteNotification() RuntimeAfterDeleteNotificationFunction {

	return r.afterReqFunctions.afterDeleteNotificationFunction

func (r *Runtime) AfterDeleteNotifications() RuntimeAfterDeleteNotificationsFunction {

	return r.afterReqFunctions.afterDeleteNotificationsFunction

}



func (r *Runtime) BeforeListStorageObjects() RuntimeBeforeListStorageObjectsFunction {