Correctly console session token on all logouts. (#875) (ce8d3921) · Commits · public-projects / Nakama

console/console.pb.go

+1247 −1172

File changed.

Preview size limit exceeded, changes collapsed.

console/console.pb.gw.go

+81 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,40 @@ func local_request_Console_Authenticate_0(ctx context.Context, marshaler runtime

		}

		func request_Console_AuthenticateLogout_0(ctx context.Context, marshaler runtime.Marshaler, client ConsoleClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
		var protoReq AuthenticateLogoutRequest
		var metadata runtime.ServerMetadata

		newReader, berr := utilities.IOReaderFactory(req.Body)
		if berr != nil {
		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)
		}
		if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF {
		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
		}

		msg, err := client.AuthenticateLogout(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
		return msg, metadata, err

		}

		func local_request_Console_AuthenticateLogout_0(ctx context.Context, marshaler runtime.Marshaler, server ConsoleServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
		var protoReq AuthenticateLogoutRequest
		var metadata runtime.ServerMetadata

		newReader, berr := utilities.IOReaderFactory(req.Body)
		if berr != nil {
		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)
		}
		if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF {
		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
		}

		msg, err := server.AuthenticateLogout(ctx, &protoReq)
		return msg, metadata, err

		}

		func request_Console_AddUser_0(ctx context.Context, marshaler runtime.Marshaler, client ConsoleClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
		var protoReq AddUserRequest
		var metadata runtime.ServerMetadata
		@@ -3058,6 +3092,29 @@ func RegisterConsoleHandlerServer(ctx context.Context, mux *runtime.ServeMux, se

		})

		mux.Handle("POST", pattern_Console_AuthenticateLogout_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
		ctx, cancel := context.WithCancel(req.Context())
		defer cancel()
		var stream runtime.ServerTransportStream
		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/nakama.console.Console/AuthenticateLogout", runtime.WithHTTPPathPattern("/v2/console/authenticate/logout"))
		if err != nil {
		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
		return
		}
		resp, md, err := local_request_Console_AuthenticateLogout_0(rctx, inboundMarshaler, server, req, pathParams)
		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
		ctx = runtime.NewServerMetadataContext(ctx, md)
		if err != nil {
		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
		return
		}

		forward_Console_AuthenticateLogout_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)

		})

		mux.Handle("POST", pattern_Console_AddUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
		ctx, cancel := context.WithCancel(req.Context())
		defer cancel()
		@@ -4430,6 +4487,26 @@ func RegisterConsoleHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl

		})

		mux.Handle("POST", pattern_Console_AuthenticateLogout_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
		ctx, cancel := context.WithCancel(req.Context())
		defer cancel()
		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/nakama.console.Console/AuthenticateLogout", runtime.WithHTTPPathPattern("/v2/console/authenticate/logout"))
		if err != nil {
		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
		return
		}
		resp, md, err := request_Console_AuthenticateLogout_0(rctx, inboundMarshaler, client, req, pathParams)
		ctx = runtime.NewServerMetadataContext(ctx, md)
		if err != nil {
		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
		return
		}

		forward_Console_AuthenticateLogout_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)

		})

		mux.Handle("POST", pattern_Console_AddUser_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
		ctx, cancel := context.WithCancel(req.Context())
		defer cancel()
		@@ -5576,6 +5653,8 @@ func RegisterConsoleHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl
		var (
		pattern_Console_Authenticate_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "console", "authenticate"}, ""))

		pattern_Console_AuthenticateLogout_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"v2", "console", "authenticate", "logout"}, ""))

		pattern_Console_AddUser_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "console", "user"}, ""))

		pattern_Console_BanAccount_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"v2", "console", "account", "id", "ban"}, ""))
		@@ -5694,6 +5773,8 @@ var (
		var (
		forward_Console_Authenticate_0 = runtime.ForwardResponseMessage

		forward_Console_AuthenticateLogout_0 = runtime.ForwardResponseMessage

		forward_Console_AddUser_0 = runtime.ForwardResponseMessage

		forward_Console_BanAccount_0 = runtime.ForwardResponseMessage

console/console.proto

+14 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,14 @@ service Console {
		};
		}

		// Log out a session and invalidate the session token.
		rpc AuthenticateLogout (AuthenticateLogoutRequest) returns (google.protobuf.Empty) {
		option (google.api.http) = {
		post: "/v2/console/authenticate/logout",
		body: "*"
		};
		}

		// Add a new console user.
		rpc AddUser (AddUserRequest) returns (google.protobuf.Empty) {
		option (google.api.http) = {
		@@ -504,6 +512,12 @@ message AuthenticateRequest {
		string password = 2;
		}

		// Log out a session and invalidate a session token.
		message AuthenticateLogoutRequest {
		// Session token to log out.
		string token = 1;
		}

		// API Explorer request definition for CallApiEndpoint
		message CallApiEndpointRequest {
		string method = 1;

console/console.swagger.json

+43 −0

Original line number	Diff line number	Diff line
		@@ -1060,6 +1060,39 @@
		]
		}
		},
		"/v2/console/authenticate/logout": {
		"post": {
		"summary": "Log out a session and invalidate the session token.",
		"operationId": "Console_AuthenticateLogout",
		"responses": {
		"200": {
		"description": "A successful response.",
		"schema": {
		"properties": {}
		}
		},
		"default": {
		"description": "An unexpected error response.",
		"schema": {
		"$ref": "#/definitions/googlerpcStatus"
		}
		}
		},
		"parameters": [
		{
		"name": "body",
		"in": "body",
		"required": true,
		"schema": {
		"$ref": "#/definitions/consoleAuthenticateLogoutRequest"
		}
		}
		],
		"tags": [
		"Console"
		]
		}
		},
		"/v2/console/config": {
		"get": {
		"summary": "Get server config and configuration warnings.",
		@@ -2998,6 +3031,16 @@
		},
		"title": "API Explorer List of Endpoints"
		},
		"consoleAuthenticateLogoutRequest": {
		"type": "object",
		"properties": {
		"token": {
		"type": "string",
		"description": "Session token to log out."
		}
		},
		"description": "Log out a session and invalidate a session token."
		},
		"consoleAuthenticateRequest": {
		"type": "object",
		"properties": {

console/console_grpc.pb.go

+38 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ const _ = grpc.SupportPackageIsVersion7
		type ConsoleClient interface {
		// Authenticate a console user with username and password.
		Authenticate(ctx context.Context, in AuthenticateRequest, opts ...grpc.CallOption) (ConsoleSession, error)
		// Log out a session and invalidate the session token.
		AuthenticateLogout(ctx context.Context, in AuthenticateLogoutRequest, opts ...grpc.CallOption) (emptypb.Empty, error)
		// Add a new console user.
		AddUser(ctx context.Context, in AddUserRequest, opts ...grpc.CallOption) (emptypb.Empty, error)
		// Ban a user.
		@@ -153,6 +155,15 @@ func (c consoleClient) Authenticate(ctx context.Context, in AuthenticateReques
		return out, nil
		}

		func (c consoleClient) AuthenticateLogout(ctx context.Context, in AuthenticateLogoutRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
		out := new(emptypb.Empty)
		err := c.cc.Invoke(ctx, "/nakama.console.Console/AuthenticateLogout", in, out, opts...)
		if err != nil {
		return nil, err
		}
		return out, nil
		}

		func (c consoleClient) AddUser(ctx context.Context, in AddUserRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
		out := new(emptypb.Empty)
		err := c.cc.Invoke(ctx, "/nakama.console.Console/AddUser", in, out, opts...)
		@@ -663,6 +674,8 @@ func (c consoleClient) WriteStorageObject(ctx context.Context, in WriteStorage
		type ConsoleServer interface {
		// Authenticate a console user with username and password.
		Authenticate(context.Context, AuthenticateRequest) (ConsoleSession, error)
		// Log out a session and invalidate the session token.
		AuthenticateLogout(context.Context, AuthenticateLogoutRequest) (emptypb.Empty, error)
		// Add a new console user.
		AddUser(context.Context, AddUserRequest) (emptypb.Empty, error)
		// Ban a user.
		@@ -785,6 +798,9 @@ type UnimplementedConsoleServer struct {
		func (UnimplementedConsoleServer) Authenticate(context.Context, AuthenticateRequest) (ConsoleSession, error) {
		return nil, status.Errorf(codes.Unimplemented, "method Authenticate not implemented")
		}
		func (UnimplementedConsoleServer) AuthenticateLogout(context.Context, AuthenticateLogoutRequest) (emptypb.Empty, error) {
		return nil, status.Errorf(codes.Unimplemented, "method AuthenticateLogout not implemented")
		}
		func (UnimplementedConsoleServer) AddUser(context.Context, AddUserRequest) (emptypb.Empty, error) {
		return nil, status.Errorf(codes.Unimplemented, "method AddUser not implemented")
		}
		@@ -984,6 +1000,24 @@ func _Console_Authenticate_Handler(srv interface{}, ctx context.Context, dec fun
		return interceptor(ctx, in, info, handler)
		}

		func _Console_AuthenticateLogout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
		in := new(AuthenticateLogoutRequest)
		if err := dec(in); err != nil {
		return nil, err
		}
		if interceptor == nil {
		return srv.(ConsoleServer).AuthenticateLogout(ctx, in)
		}
		info := &grpc.UnaryServerInfo{
		Server: srv,
		FullMethod: "/nakama.console.Console/AuthenticateLogout",
		}
		handler := func(ctx context.Context, req interface{}) (interface{}, error) {
		return srv.(ConsoleServer).AuthenticateLogout(ctx, req.(*AuthenticateLogoutRequest))
		}
		return interceptor(ctx, in, info, handler)
		}

		func _Console_AddUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
		in := new(AddUserRequest)
		if err := dec(in); err != nil {
		@@ -2003,6 +2037,10 @@ var Console_ServiceDesc = grpc.ServiceDesc{
		MethodName: "Authenticate",
		Handler: _Console_Authenticate_Handler,
		},
		{
		MethodName: "AuthenticateLogout",
		Handler: _Console_AuthenticateLogout_Handler,
		},
		{
		MethodName: "AddUser",
		Handler: _Console_AddUser_Handler,