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

Add steam friends import (#544)

parent 3d88a1ed

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

- New Steam friends import.



### Changed

- Improve output of `nakama migrate status` command when database contains unknown migrations.

- Socket status flag is now case-insensitive.

apigrpc/apigrpc.pb.go

+514 −503

File changed.

Preview size limit exceeded, changes collapsed.

apigrpc/apigrpc.pb.gw.go

+101 −2
Original line number Diff line number Diff line
@@ -1149,6 +1149,58 @@ func local_request_Nakama_ImportFacebookFriends_0(ctx context.Context, marshaler 


}



var (

	filter_Nakama_ImportSteamFriends_0 = &utilities.DoubleArray{Encoding: map[string]int{"account": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}

)



func request_Nakama_ImportSteamFriends_0(ctx context.Context, marshaler runtime.Marshaler, client NakamaClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {

	var protoReq api.ImportSteamFriendsRequest

	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.Account); err != nil && err != io.EOF {

		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)

	}



	if err := req.ParseForm(); err != nil {

		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)

	}

	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Nakama_ImportSteamFriends_0); err != nil {

		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)

	}



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

	return msg, metadata, err



}



func local_request_Nakama_ImportSteamFriends_0(ctx context.Context, marshaler runtime.Marshaler, server NakamaServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {

	var protoReq api.ImportSteamFriendsRequest

	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.Account); err != nil && err != io.EOF {

		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)

	}



	if err := req.ParseForm(); err != nil {

		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)

	}

	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Nakama_ImportSteamFriends_0); err != nil {

		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)

	}



	msg, err := server.ImportSteamFriends(ctx, &protoReq)

	return msg, metadata, err



}



func request_Nakama_JoinGroup_0(ctx context.Context, marshaler runtime.Marshaler, client NakamaClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {

	var protoReq api.JoinGroupRequest

	var metadata runtime.ServerMetadata
@@ -1666,7 +1718,7 @@ func local_request_Nakama_LinkGoogle_0(ctx context.Context, marshaler runtime.Ma 
}



func request_Nakama_LinkSteam_0(ctx context.Context, marshaler runtime.Marshaler, client NakamaClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {

	var protoReq api.AccountSteam

	var protoReq api.LinkSteamRequest

	var metadata runtime.ServerMetadata



	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -1683,7 +1735,7 @@ func request_Nakama_LinkSteam_0(ctx context.Context, marshaler runtime.Marshaler 
}



func local_request_Nakama_LinkSteam_0(ctx context.Context, marshaler runtime.Marshaler, server NakamaServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {

	var protoReq api.AccountSteam

	var protoReq api.LinkSteamRequest

	var metadata runtime.ServerMetadata



	newReader, berr := utilities.IOReaderFactory(req.Body)
@@ -4058,6 +4110,29 @@ func RegisterNakamaHandlerServer(ctx context.Context, mux *runtime.ServeMux, ser 


	})



	mux.Handle("POST", pattern_Nakama_ImportSteamFriends_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.api.Nakama/ImportSteamFriends")

		if err != nil {

			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)

			return

		}

		resp, md, err := local_request_Nakama_ImportSteamFriends_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_Nakama_ImportSteamFriends_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)



	})



	mux.Handle("POST", pattern_Nakama_JoinGroup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {

		ctx, cancel := context.WithCancel(req.Context())

		defer cancel()
@@ -5657,6 +5732,26 @@ func RegisterNakamaHandlerClient(ctx context.Context, mux *runtime.ServeMux, cli 


	})



	mux.Handle("POST", pattern_Nakama_ImportSteamFriends_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.api.Nakama/ImportSteamFriends")

		if err != nil {

			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)

			return

		}

		resp, md, err := request_Nakama_ImportSteamFriends_0(rctx, inboundMarshaler, client, req, pathParams)

		ctx = runtime.NewServerMetadataContext(ctx, md)

		if err != nil {

			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)

			return

		}



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



	})



	mux.Handle("POST", pattern_Nakama_JoinGroup_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {

		ctx, cancel := context.WithCancel(req.Context())

		defer cancel()
@@ -6631,6 +6726,8 @@ var ( 


	pattern_Nakama_ImportFacebookFriends_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "friend", "facebook"}, ""))



	pattern_Nakama_ImportSteamFriends_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"v2", "friend", "steam"}, ""))



	pattern_Nakama_JoinGroup_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3}, []string{"v2", "group", "group_id", "join"}, ""))



	pattern_Nakama_JoinTournament_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3}, []string{"v2", "tournament", "tournament_id", "join"}, ""))
@@ -6775,6 +6872,8 @@ var ( 


	forward_Nakama_ImportFacebookFriends_0 = runtime.ForwardResponseMessage



	forward_Nakama_ImportSteamFriends_0 = runtime.ForwardResponseMessage



	forward_Nakama_JoinGroup_0 = runtime.ForwardResponseMessage



	forward_Nakama_JoinTournament_0 = runtime.ForwardResponseMessage

apigrpc/apigrpc.proto

+9 −1
Original line number Diff line number Diff line
@@ -335,6 +335,14 @@ service Nakama { 
    };

  }



  // Import Steam friends and add them to a user's account.

  rpc ImportSteamFriends (api.ImportSteamFriendsRequest) returns (google.protobuf.Empty) {

    option (google.api.http) = {

      post: "/v2/friend/steam",

      body: "account"

    };

  }



  // Immediately join an open group, or request to join a closed one.

  rpc JoinGroup (api.JoinGroupRequest) returns (google.protobuf.Empty) {

    option (google.api.http).post = "/v2/group/{group_id}/join";
@@ -420,7 +428,7 @@ service Nakama { 
  }



  // Add Steam to the social profiles on the current user's account.

  rpc LinkSteam (api.AccountSteam) returns (google.protobuf.Empty) {

  rpc LinkSteam (api.LinkSteamRequest) returns (google.protobuf.Empty) {

    option (google.api.http) = {

      post: "/v2/account/link/steam",

      body: "*"

apigrpc/apigrpc.swagger.json

+63 −1
Original line number Diff line number Diff line
@@ -569,6 +569,13 @@ 
            "in": "query",

            "required": false,

            "type": "string"

          },

          {

            "name": "sync",

            "description": "Import Steam friends for the user.",

            "in": "query",

            "required": false,

            "type": "boolean"

          }

        ],

        "tags": [
@@ -877,7 +884,7 @@ 
            "in": "body",

            "required": true,

            "schema": {

              "$ref": "#/definitions/apiAccountSteam"

              "$ref": "#/definitions/apiLinkSteamRequest"

            }

          }

        ],
@@ -1530,6 +1537,47 @@ 
        ]

      }

    },

    "/v2/friend/steam": {

      "post": {

        "summary": "Import Steam friends and add them to a user's account.",

        "operationId": "Nakama_ImportSteamFriends",

        "responses": {

          "200": {

            "description": "A successful response.",

            "schema": {

              "properties": {}

            }

          },

          "default": {

            "description": "An unexpected error response.",

            "schema": {

              "$ref": "#/definitions/rpcStatus"

            }

          }

        },

        "parameters": [

          {

            "name": "body",

            "description": "The Facebook account details.",

            "in": "body",

            "required": true,

            "schema": {

              "$ref": "#/definitions/apiAccountSteam"

            }

          },

          {

            "name": "reset",

            "description": "Reset the current user's friends list.",

            "in": "query",

            "required": false,

            "type": "boolean"

          }

        ],

        "tags": [

          "Nakama"

        ]

      }

    },

    "/v2/group": {

      "get": {

        "summary": "List groups based on given filters.",
@@ -3709,6 +3757,20 @@ 
      },

      "description": "A set of leaderboard records, may be part of a leaderboard records page or a batch of individual records."

    },

    "apiLinkSteamRequest": {

      "type": "object",

      "properties": {

        "account": {

          "$ref": "#/definitions/apiAccountSteam",

          "description": "The Facebook account details."

        },

        "sync": {

          "type": "boolean",

          "description": "Import Steam friends for the user."

        }

      },

      "description": "Link Steam to the current user's account."

    },

    "apiMatch": {

      "type": "object",

      "properties": {