@platfformx/proto-contracts 1.0.4 → 1.0.5

package/gen/ts/auth-service/auth.ts

@@ -10,36 +10,45 @@ import { Observable } from "rxjs";
 
 export const protobufPackage = "auth_service.v1";
 
+/** Shared */
+export enum OAuthProvider {
+  OAUTH_PROVIDER_UNSPECIFIED = 0,
+  OAUTH_PROVIDER_GOOGLE = 1,
+  OAUTH_PROVIDER_GITHUB = 2,
+  OAUTH_PROVIDER_TELEGRAM = 3,
+  UNRECOGNIZED = -1,
+}
+
+/** Create account */
 export interface CreateAccountRequest {
-  credentials?: UserCredentials | undefined;
-  oauthToken?: string | undefined;
+  credentials: UserCredentials | undefined;
 }
 
 export interface CreateAccountResponse {
-  userId: string;
-  accessToken: string;
-  refreshToken: string;
+  result: AuthResult | undefined;
 }
 
+/** Authenticate credentials */
 export interface AuthenticationRequest {
-  credentials?: UserCredentials | undefined;
-  oauthToken?: string | undefined;
+  credentials: UserCredentials | undefined;
 }
 
 export interface AuthenticationResponse {
-  accessToken: string;
-  refreshToken: string;
-  user: UserInfo | undefined;
+  result: AuthResult | undefined;
 }
 
-export interface UserCredentials {
-  email?: string | undefined;
-  phone?: string | undefined;
-  username?: string | undefined;
-  password: string;
+/** AuthenticateWithOAuth */
+export interface OAuthSessionRequest {
+  provider: OAuthProvider;
+  token: string;
 }
 
-/** Токены */
+export interface OAuthSessionResponse {
+  result: AuthResult | undefined;
+  isNewUser: boolean;
+}
+
+/** Tokens */
 export interface TokenRefreshRequest {
   refreshToken: string;
 }
@@ -49,14 +58,27 @@ export interface TokenRefreshResponse {
   refreshToken: string;
 }
 
-export interface UserInfo {
-  userId: string;
+export interface UserCredentials {
+  email?: string | undefined;
+  phone?: string | undefined;
+  username?: string | undefined;
+  password: string;
+}
+
+export interface UserProfile {
   email?: string | undefined;
   phone?: string | undefined;
   username?: string | undefined;
   displayName?: string | undefined;
 }
 
+export interface AuthResult {
+  userId: string;
+  accessToken: string;
+  refreshToken: string;
+  user: UserProfile | undefined;
+}
+
 export const AUTH_SERVICE_V1_PACKAGE_NAME = "auth_service.v1";
 
 export interface AuthServiceClient {
@@ -64,6 +86,8 @@ export interface AuthServiceClient {
 
   authenticate(request: AuthenticationRequest): Observable<AuthenticationResponse>;
 
+  authenticateWithOAuth(request: OAuthSessionRequest): Observable<OAuthSessionResponse>;
+
   refreshTokens(request: TokenRefreshRequest): Observable<TokenRefreshResponse>;
 }
 
@@ -76,6 +100,10 @@ export interface AuthServiceController {
     request: AuthenticationRequest,
   ): Promise<AuthenticationResponse> | Observable<AuthenticationResponse> | AuthenticationResponse;
 
+  authenticateWithOAuth(
+    request: OAuthSessionRequest,
+  ): Promise<OAuthSessionResponse> | Observable<OAuthSessionResponse> | OAuthSessionResponse;
+
   refreshTokens(
     request: TokenRefreshRequest,
   ): Promise<TokenRefreshResponse> | Observable<TokenRefreshResponse> | TokenRefreshResponse;
@@ -83,7 +111,7 @@ export interface AuthServiceController {
 
 export function AuthServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = ["createAccount", "authenticate", "refreshTokens"];
+    const grpcMethods: string[] = ["createAccount", "authenticate", "authenticateWithOAuth", "refreshTokens"];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("AuthService", method)(constructor.prototype[method], method, descriptor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platfformx/proto-contracts",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "",
   "main": "index.js",
   "publishConfig": {

package/proto/auth-service/auth.proto

@@ -5,45 +5,38 @@ package auth_service.v1;
 service AuthService {
   rpc CreateAccount (CreateAccountRequest) returns (CreateAccountResponse);
   rpc Authenticate  (AuthenticationRequest) returns (AuthenticationResponse);
+  rpc AuthenticateWithOAuth (OAuthSessionRequest) returns (OAuthSessionResponse);
   rpc RefreshTokens (TokenRefreshRequest) returns (TokenRefreshResponse);
 }
 
-
+// Create account 
 message CreateAccountRequest {
-  oneof register_method {
-    UserCredentials credentials = 1;
-    string oauth_token = 2;
-  }
+  UserCredentials credentials = 1;
 }
 
 message CreateAccountResponse {
-  string user_id = 1;
-  string access_token = 2;
-  string refresh_token = 3;
+   AuthResult result = 1;
 }
 
+// Authenticate credentials 
 message AuthenticationRequest {
-  oneof auth_method {
-    UserCredentials credentials = 1;
-    string oauth_token = 2;
-  }
+  UserCredentials credentials = 1;
 }
 
 message AuthenticationResponse {
-  string access_token = 1;
-  string refresh_token = 2;
-  UserInfo user = 3;
+   AuthResult result = 1;
 }
 
-
-message UserCredentials {
-  optional  string email = 1;
-  optional string phone = 2;
-  optional string username = 3;
-  string password = 4;
+//  AuthenticateWithOAuth
+message OAuthSessionRequest  {
+  OAuthProvider provider = 1;
+  string token = 2;
 }
-
-//Токены
+message OAuthSessionResponse  {
+  AuthResult result = 1;
+  bool is_new_user  = 2;
+}
+// Tokens
 message TokenRefreshRequest {
   string refresh_token = 1;
 }
@@ -53,10 +46,31 @@ message TokenRefreshResponse {
   string refresh_token = 2;
 }
 
-message UserInfo {
+// Shared 
+enum OAuthProvider {
+  OAUTH_PROVIDER_UNSPECIFIED = 0;
+  OAUTH_PROVIDER_GOOGLE = 1;
+  OAUTH_PROVIDER_GITHUB = 2;
+  OAUTH_PROVIDER_TELEGRAM = 3;
+}
+message UserCredentials {
+ oneof identifier {
+   string email = 1;
+   string phone = 2;
+   string username = 3;
+  }
+  string password = 4;
+}
+message UserProfile {
+  optional string email = 1;
+  optional string phone = 2;
+  optional string username = 3;
+  optional string display_name = 4;
+}
+
+message AuthResult {
   string user_id = 1;
-  optional string email = 2;
-  optional string phone = 3;
-  optional string username = 4;
-  optional string display_name = 5;
+  string access_token = 2;
+  string refresh_token = 3;
+  UserProfile user = 4;
 }