Commit 01fef2c2 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Add devconsole support for Facebook Instant Game IDs. Return FBIG IDs in user retrieval responses.

parent ee536430

apigrpc/apigrpc.pb.gw.go

+0 −3
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ import ( 
	"io"

	"net/http"



	"github.com/golang/protobuf/descriptor"

	"github.com/golang/protobuf/proto"

	"github.com/golang/protobuf/ptypes/empty"

	"github.com/grpc-ecosystem/grpc-gateway/runtime"
@@ -25,13 +24,11 @@ import ( 
	"google.golang.org/grpc/status"

)



// Suppress "imported and not used" errors

var _ codes.Code

var _ io.Reader

var _ status.Status

var _ = runtime.String

var _ = utilities.NewDoubleArray

var _ = descriptor.ForMessage



var (

	filter_Nakama_AddFriends_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}

console/a_console-packr.go

+6 −6

File changed.

Preview size limit exceeded, changes collapsed.

console/console.pb.go

+169 −129

File changed.

Preview size limit exceeded, changes collapsed.

console/console.pb.gw.go

+98 −3
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ import ( 
	"io"

	"net/http"



	"github.com/golang/protobuf/descriptor"

	"github.com/golang/protobuf/proto"

	"github.com/golang/protobuf/ptypes/empty"

	"github.com/grpc-ecosystem/grpc-gateway/runtime"
@@ -25,13 +24,11 @@ import ( 
	"google.golang.org/grpc/status"

)



// Suppress "imported and not used" errors

var _ codes.Code

var _ io.Reader

var _ status.Status

var _ = runtime.String

var _ = utilities.NewDoubleArray

var _ = descriptor.ForMessage



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

	var protoReq AuthenticateRequest
@@ -1443,6 +1440,60 @@ func local_request_Console_UnlinkFacebook_0(ctx context.Context, marshaler runti 


}



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

	var protoReq AccountId

	var metadata runtime.ServerMetadata



	var (

		val string

		ok  bool

		err error

		_   = err

	)



	val, ok = pathParams["id"]

	if !ok {

		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")

	}



	protoReq.Id, err = runtime.String(val)



	if err != nil {

		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)

	}



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

	return msg, metadata, err



}



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

	var protoReq AccountId

	var metadata runtime.ServerMetadata



	var (

		val string

		ok  bool

		err error

		_   = err

	)



	val, ok = pathParams["id"]

	if !ok {

		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")

	}



	protoReq.Id, err = runtime.String(val)



	if err != nil {

		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)

	}



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

	return msg, metadata, err



}



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

	var protoReq AccountId

	var metadata runtime.ServerMetadata
@@ -2294,6 +2345,26 @@ func RegisterConsoleHandlerServer(ctx context.Context, mux *runtime.ServeMux, se 


	})



	mux.Handle("POST", pattern_Console_UnlinkFacebookInstantGame_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.AnnotateIncomingContext(ctx, mux, req)

		if err != nil {

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

			return

		}

		resp, md, err := local_request_Console_UnlinkFacebookInstantGame_0(rctx, inboundMarshaler, server, req, pathParams)

		ctx = runtime.NewServerMetadataContext(ctx, md)

		if err != nil {

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

			return

		}



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



	})



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

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

		defer cancel()
@@ -2935,6 +3006,26 @@ func RegisterConsoleHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl 


	})



	mux.Handle("POST", pattern_Console_UnlinkFacebookInstantGame_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)

		if err != nil {

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

			return

		}

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



	})



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

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

		defer cancel()
@@ -3089,6 +3180,8 @@ var ( 


	pattern_Console_UnlinkFacebook_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 2, 5}, []string{"v2", "console", "account", "id", "unlink", "facebook"}, "", runtime.AssumeColonVerbOpt(true)))



	pattern_Console_UnlinkFacebookInstantGame_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 2, 5}, []string{"v2", "console", "account", "id", "unlink", "facebookinstantgame"}, "", runtime.AssumeColonVerbOpt(true)))



	pattern_Console_UnlinkGameCenter_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 2, 5}, []string{"v2", "console", "account", "id", "unlink", "gamecenter"}, "", runtime.AssumeColonVerbOpt(true)))



	pattern_Console_UnlinkGoogle_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 2, 5}, []string{"v2", "console", "account", "id", "unlink", "google"}, "", runtime.AssumeColonVerbOpt(true)))
@@ -3151,6 +3244,8 @@ var ( 


	forward_Console_UnlinkFacebook_0 = runtime.ForwardResponseMessage



	forward_Console_UnlinkFacebookInstantGame_0 = runtime.ForwardResponseMessage



	forward_Console_UnlinkGameCenter_0 = runtime.ForwardResponseMessage



	forward_Console_UnlinkGoogle_0 = runtime.ForwardResponseMessage

console/console.proto

+5 −0
Original line number Diff line number Diff line
@@ -203,6 +203,11 @@ service Console { 
    option (google.api.http).post = "/v2/console/account/{id}/unlink/facebook";

  }



  // Unlink the Facebook ID from a user account.

  rpc UnlinkFacebookInstantGame (AccountId) returns (google.protobuf.Empty) {

    option (google.api.http).post = "/v2/console/account/{id}/unlink/facebookinstantgame";

  }



  // Unlink the Game Center ID from a user account.

  rpc UnlinkGameCenter (AccountId) returns (google.protobuf.Empty) {

    option (google.api.http).post = "/v2/console/account/{id}/unlink/gamecenter";