Merge pull request #3286 from glouvigny/glouvigny/fix/service-auth-to…

…ken-id fix: include token_id in AuthServiceCompleteFlow reply
berty · Apr 29, 2021 · b1e6996 · b1e6996
2 parents 85a448d + 390f331
commit b1e6996
Show file tree

Hide file tree

Showing 10 changed files with 426 additions and 350 deletions.
diff --git a/api/protocoltypes.proto b/api/protocoltypes.proto
@@ -1123,7 +1123,9 @@ message AuthServiceCompleteFlow {
   message Request{
     string callback_url = 1 [(gogoproto.customname) = "CallbackURL"];
   }
-  message Reply{}
+  message Reply{
+    string token_id = 1 [(gogoproto.customname) = "TokenID"];
+  }
 }
 
 message AuthServiceInitFlow {

diff --git a/docs/apis/protocoltypes.md b/docs/apis/protocoltypes.md
diff --git a/docs/apis/protocoltypes.swagger.json b/docs/apis/protocoltypes.swagger.json
diff --git a/docs/gen.sum b/docs/gen.sum
diff --git a/go/gen.sum b/go/gen.sum
diff --git a/go/pkg/bertyprotocol/api_services_auth.go b/go/pkg/bertyprotocol/api_services_auth.go
@@ -205,16 +205,20 @@ func (s *service) AuthServiceCompleteFlow(ctx context.Context, request *protocol
 		i++
 	}
 
-	if _, err := s.accountGroup.metadataStore.SendAccountServiceTokenAdded(ctx, &protocoltypes.ServiceToken{
+	svcToken := &protocoltypes.ServiceToken{
 		Token:             resMsg.AccessToken,
 		AuthenticationURL: auth.baseURL,
 		SupportedServices: services,
 		Expiration:        -1,
-	}); err != nil {
+	}
+
+	if _, err := s.accountGroup.metadataStore.SendAccountServiceTokenAdded(ctx, svcToken); err != nil {
 		return nil, err
 	}
 
-	return &protocoltypes.AuthServiceCompleteFlow_Reply{}, nil
+	return &protocoltypes.AuthServiceCompleteFlow_Reply{
+		TokenID: svcToken.TokenID(),
+	}, nil
 }
 
 func (s *service) AuthServiceInitFlow(ctx context.Context, request *protocoltypes.AuthServiceInitFlow_Request) (*protocoltypes.AuthServiceInitFlow_Reply, error) {

diff --git a/go/pkg/protocoltypes/protocoltypes.pb.go b/go/pkg/protocoltypes/protocoltypes.pb.go
diff --git a/js/gen.sum b/js/gen.sum
diff --git a/js/packages/api/root.pb.d.ts b/js/packages/api/root.pb.d.ts
diff --git a/js/packages/api/root.pb.js b/js/packages/api/root.pb.js