Unverified Commit 5980b7a7 authored by Simon Esposito's avatar Simon Esposito Committed by GitHub
Browse files

Add Nakama API to get users by facebook ID (#551) 

Resolves #548
parent fe2763ac

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ All notable changes to this project are documented below. 
The format is based on [keep a changelog](http://keepachangelog.com) and this project uses [semantic versioning](http://semver.org).



## [Unreleased]

### Added

- Added Nakama API to get users by facebook ID.



### Fixed

- Fix an issue that prevented the JavaScript runtime hooks to be invoked correctly.

- Fix the delete button not working in the console leaderboard listing.

go.mod

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

	github.com/gorilla/websocket v1.4.2

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

	github.com/heroiclabs/nakama-common v1.12.0

	github.com/heroiclabs/nakama-common v1.12.1-0.20210215124839-bf495fa30713

	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect

	github.com/jackc/pgx v3.5.0+incompatible

	github.com/jmhodges/levigo v1.0.0 // indirect

go.sum

+2 −4
Original line number Diff line number Diff line
@@ -198,10 +198,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.0.1/go.mod h1:oVMjMN64nzEcepv1kdZKg 
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.11.1-0.20210204123435-b06844f83f0c h1:h3vOxFXzI59n2zN9O2I6y8hxFs3D5c2bVTcy0AL+fZE=

github.com/heroiclabs/nakama-common v1.11.1-0.20210204123435-b06844f83f0c/go.mod h1:li7bMQwOYA0NjT3DM4NKQBNruULPa2hrqdiSaaTwui4=

github.com/heroiclabs/nakama-common v1.12.0 h1:PLyEsC9onuO79j80fbExVyG3N8xRi7OHW4nw6beD3cg=

github.com/heroiclabs/nakama-common v1.12.0/go.mod h1:li7bMQwOYA0NjT3DM4NKQBNruULPa2hrqdiSaaTwui4=

github.com/heroiclabs/nakama-common v1.12.1-0.20210215124839-bf495fa30713 h1:rJu3e+1VcwIV1gMal5ChIFdVHKJndFmUxyYaEoRWu94=

github.com/heroiclabs/nakama-common v1.12.1-0.20210215124839-bf495fa30713/go.mod h1:li7bMQwOYA0NjT3DM4NKQBNruULPa2hrqdiSaaTwui4=

github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=

github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=

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

server/runtime_go_nakama.go

+3 −3
Original line number Diff line number Diff line
@@ -415,8 +415,8 @@ func (n *RuntimeGoNakamaModule) AccountExportId(ctx context.Context, userID stri 
	return exportString, nil

}



func (n *RuntimeGoNakamaModule) UsersGetId(ctx context.Context, userIDs []string) ([]*api.User, error) {

	if len(userIDs) == 0 {

func (n *RuntimeGoNakamaModule) UsersGetId(ctx context.Context, userIDs []string, facebookIDs []string) ([]*api.User, error) {

	if len(userIDs) == 0 && len(facebookIDs) == 0 {

		return make([]*api.User, 0), nil

	}
@@ -426,7 +426,7 @@ func (n *RuntimeGoNakamaModule) UsersGetId(ctx context.Context, userIDs []string 
		}

	}



	users, err := GetUsers(ctx, n.logger, n.db, n.tracker, userIDs, nil, nil)

	users, err := GetUsers(ctx, n.logger, n.db, n.tracker, userIDs, nil, facebookIDs)

	if err != nil {

		return nil, err

	}

server/runtime_javascript_nakama.go

+32 −13
Original line number Diff line number Diff line
@@ -1470,29 +1470,48 @@ func (n *runtimeJavascriptNakamaModule) accountExportId(r *goja.Runtime) func(go 


func (n *runtimeJavascriptNakamaModule) usersGetId(r *goja.Runtime) func(goja.FunctionCall) goja.Value {

	return func(f goja.FunctionCall) goja.Value {

		var input []interface{}

		if f.Argument(0) == goja.Undefined() {

			panic(r.NewTypeError("expects list of user ids"))

		} else {

		var userIds []string

		if f.Argument(0) != goja.Undefined() && f.Argument(0) != goja.Null() {

			var ok bool

			input, ok = f.Argument(0).Export().([]interface{})

			userIdsIn, ok := f.Argument(0).Export().([]interface{})

			if !ok {

				panic(r.NewTypeError("Invalid argument - user ids must be an array."))

			}

		}



		userIDs := make([]string, 0, len(input))

		for _, userID := range input {

			uIds := make([]string, 0, len(userIdsIn))

			for _, userID := range userIdsIn {

				id, ok := userID.(string)

				if !ok {

					panic(r.NewTypeError(fmt.Sprintf("invalid user id: %v - must be a string", userID)))

				} else if _, err := uuid.FromString(id); err != nil {

					panic(r.NewTypeError(fmt.Sprintf("invalid user id: %v", userID)))

				}

			userIDs = append(userIDs, id)

				uIds = append(uIds, id)

			}

			userIds = uIds

		}



		var facebookIds []string

		if f.Argument(1) != goja.Undefined() && f.Argument(1) != goja.Null() {

			facebookIdsIn, ok := f.Argument(1).Export().([]interface{})

			if !ok {

				panic(r.NewTypeError("Invalid argument - facebook ids must be an array."))

			}

			fIds := make([]string, 0, len(facebookIdsIn))

			for _, fIdIn := range facebookIdsIn {

				fId, ok := fIdIn.(string)

				if !ok {

					panic(r.NewTypeError("Invalid argument - facebook id must be a string"))

				}

				fIds = append(fIds, fId)

			}

			facebookIds = fIds

		}



		if userIds == nil && facebookIds == nil {

			return r.ToValue(make([]string, 0, 0))

		}



		users, err := GetUsers(context.Background(), n.logger, n.db, n.tracker, userIDs, nil, nil)

		users, err := GetUsers(context.Background(), n.logger, n.db, n.tracker, userIds, nil, facebookIds)

		if err != nil {

			panic(r.NewGoError(fmt.Errorf("failed to get users: %s", err.Error())))

		}