fix conflict

CUSportGo · Oct 5, 2023 · 9d955ea · 9d955ea
1 parent d4a5554
commit 9d955ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 24 deletions.
diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts
@@ -1,14 +1,15 @@
 import { Controller } from '@nestjs/common';
 import { GrpcMethod } from '@nestjs/microservices';
 import {
+  ForgotPasswordRequest,
+  ForgotPasswordResponse,
   LoginRequest,
   LoginResponse,
   LogoutRequest,
   LogoutResponse,
   RegisterRequest,
   RegisterResponse,
-  ValidateGoogleRequest,
-  ValidateGoogleResponse,
+  ValidateOAuthRequest,
 } from './auth.pb';
 import { AuthService } from './auth.service';
 

diff --git a/src/auth/auth.pb.ts b/src/auth/auth.pb.ts
@@ -65,14 +65,6 @@ export interface LogoutResponse {
   isDone: boolean;
 }
 
-export interface ValidateGoogleRequest {
-  user: GoogleUser | undefined;
-}
-
-export interface ValidateGoogleResponse {
-  credential: Credential | undefined;
-}
-
 export interface ForgotPasswordRequest {
   email: string;
 }
@@ -92,10 +84,9 @@ export interface AuthServiceClient {
 
   validateOAuth(request: ValidateOAuthRequest): Observable<LoginResponse>;
 
-  validateGoogle(request: ValidateGoogleRequest): Observable<ValidateGoogleResponse>;
+  logout(request: LogoutRequest): Observable<LogoutResponse>;
 
   forgotPassword(request: ForgotPasswordRequest): Observable<ForgotPasswordResponse>;
-  logout(request: LogoutRequest): Observable<LogoutResponse>;
 }
 
 export interface AuthServiceController {
@@ -109,14 +100,11 @@ export interface AuthServiceController {
 
   validateOAuth(request: ValidateOAuthRequest): Promise<LoginResponse> | Observable<LoginResponse> | LoginResponse;
 
-  validateGoogle(
-    request: ValidateGoogleRequest,
-  ): Promise<ValidateGoogleResponse> | Observable<ValidateGoogleResponse> | ValidateGoogleResponse;
+  logout(request: LogoutRequest): Promise<LogoutResponse> | Observable<LogoutResponse> | LogoutResponse;
 
   forgotPassword(
     request: ForgotPasswordRequest,
   ): Promise<ForgotPasswordResponse> | Observable<ForgotPasswordResponse> | ForgotPasswordResponse;
-  logout(request: LogoutRequest): Promise<LogoutResponse> | Observable<LogoutResponse> | LogoutResponse;
 }
 
 export function AuthServiceControllerMethods() {

diff --git a/src/proto/auth.proto b/src/proto/auth.proto
@@ -8,7 +8,6 @@ service AuthService {
   rpc Register(RegisterRequest) returns (RegisterResponse) {}
   rpc ValidateOAuth(ValidateOAuthRequest) returns (LoginResponse) {}
   rpc Logout(LogoutRequest) returns (LogoutResponse) {}
-  rpc ValidateGoogle(ValidateGoogleRequest) returns (ValidateGoogleResponse) {}
   rpc ForgotPassword(ForgotPasswordRequest) returns (ForgotPasswordResponse) {}
 }
 
@@ -72,13 +71,6 @@ message LogoutRequest {
 message LogoutResponse {
   bool is_done = 1;
 }
-message ValidateGoogleRequest {
-  GoogleUser user = 1;
-}
-
-message ValidateGoogleResponse {
-  Credential credential = 1;
-}
 
 message ForgotPasswordRequest {
   string email = 1;