Commit fd910988 authored by Chris Molozian's avatar Chris Molozian
Browse files

Lower constraint on minimum customid length to 6 characters.

parent 18b2dc6f

server/api_authenticate.go

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ func (s *ApiServer) AuthenticateCustom(ctx context.Context, in *api.Authenticate 
		return nil, status.Error(codes.InvalidArgument, "Custom ID is required.")

	} else if invalidCharsRegex.MatchString(in.Account.Id) {

		return nil, status.Error(codes.InvalidArgument, "Custom ID invalid, no spaces or control characters allowed.")

	} else if len(in.Account.Id) < 10 || len(in.Account.Id) > 128 {

		return nil, status.Error(codes.InvalidArgument, "Custom ID invalid, must be 10-128 bytes.")

	} else if len(in.Account.Id) < 6 || len(in.Account.Id) > 128 {

		return nil, status.Error(codes.InvalidArgument, "Custom ID invalid, must be 6-128 bytes.")

	}



	username := in.Username

server/api_link.go

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ func (s *ApiServer) LinkCustom(ctx context.Context, in *api.AccountCustom) (*emp 
		return nil, status.Error(codes.InvalidArgument, "Custom ID is required.")

	} else if invalidCharsRegex.MatchString(customID) {

		return nil, status.Error(codes.InvalidArgument, "Invalid custom ID, no spaces or control characters allowed.")

	} else if len(customID) < 10 || len(customID) > 128 {

		return nil, status.Error(codes.InvalidArgument, "Invalid custom ID, must be 10-128 bytes.")

	} else if len(customID) < 6 || len(customID) > 128 {

		return nil, status.Error(codes.InvalidArgument, "Invalid custom ID, must be 6-128 bytes.")

	}



	userID := ctx.Value(ctxUserIDKey{})

server/runtime_nakama_module.go

+2 −2
Original line number Diff line number Diff line
@@ -854,8 +854,8 @@ func (n *NakamaModule) authenticateCustom(l *lua.LState) int { 
	} else if invalidCharsRegex.MatchString(id) {

		l.ArgError(1, "expects id to be valid, no spaces or control characters allowed")

		return 0

	} else if len(id) < 10 || len(id) > 128 {

		l.ArgError(1, "expects id to be valid, must be 10-128 bytes")

	} else if len(id) < 6 || len(id) > 128 {

		l.ArgError(1, "expects id to be valid, must be 6-128 bytes")

		return 0

	}