Merge branch 'main' of github.com:waterbustech/waterbus-server-api

Author: lambiengcode

Diff for: package.json

@@ -38,12 +38,13 @@
     "@nestjs/swagger": "^7.3.1",
     "@nestjs/typeorm": "^10.0.2",
     "aws-sdk": "^2.1603.0",
+    "axios": "^1.7.2",
     "bcryptjs": "^2.4.3",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "google-protobuf": "^3.21.2",
     "ms": "^2.1.3",
-    "nanoid": "3.0.0",
+    "nanoid": "3.1.31",
     "nestjs-grpc-reflection": "^0.2.2",
     "nestjs-proto-gen-ts": "^1.0.21",
     "passport": "^0.7.0",

Diff for: src/core/config/environment/environments.ts

@@ -52,4 +52,8 @@ export class EnvironmentConfigService {
   getMeetingGrpcUrl(): string {
     return this.configService.get<string>('MEETING_GRPC_URL');
   }
+
+  getOauthSecret(): string {
+    return this.configService.get<string>('CLIENT_SECRET');
+  }
 }

Diff for: src/core/dtos/auth/index.ts

@@ -1 +1,2 @@
 export { LoginSocialDto } from './login.dto';
+export { OauthDto } from './oauth.dto'

Diff for: src/core/dtos/auth/oauth.dto.ts

@@ -0,0 +1,19 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsNotEmpty, IsOptional } from 'class-validator';
+
+export class OauthDto {
+  @ApiProperty({ example: 'code' })
+  @IsString()
+  @IsNotEmpty()
+  code: string;
+
+  @ApiProperty({ example: 'client-id' })
+  @IsString()
+  @IsNotEmpty()
+  clientId: string;
+
+  @ApiProperty({ example: 'redirect_uri' })
+  @IsString()
+  @IsNotEmpty()
+  redirectUri: string;
+}

Diff for: src/features/auth/auth.controller.ts

@@ -9,8 +9,10 @@ import {
   Request,
   SerializeOptions,
   Delete,
+  InternalServerErrorException,
+  NotFoundException,
 } from '@nestjs/common';
-import { LoginSocialDto } from 'src/core/dtos/auth';
+import { LoginSocialDto, OauthDto } from 'src/core/dtos/auth';
 import { UserFactoryService } from '../user/user-factory.service';
 import { AuthUseCases } from 'src/features/auth/auth.usecase';
 import { AuthGuard } from '@nestjs/passport';
@@ -23,6 +25,8 @@ import {
 import { LoginResponseType } from 'src/features/auth/types/login-response.type';
 import { AwsS3Service } from '../image/aws-s3/aws-s3.service';
 import { ApiKeyGuard } from 'src/utils/strategies/api-key.strategy';
+import axios from 'axios';
+import { EnvironmentConfigService } from 'src/core/config/environment/environments';
 
 @ApiTags('auth')
 @ApiSecurity('api-key', ['api-key'])
@@ -33,11 +37,36 @@ import { ApiKeyGuard } from 'src/utils/strategies/api-key.strategy';
 })
 export class AuthController {
   constructor(
+    private readonly environment: EnvironmentConfigService,
     private authUseCases: AuthUseCases,
     private userFactoryService: UserFactoryService,
     private awsS3Service: AwsS3Service,
   ) {}
 
+  @ApiOperation({ summary: 'Get Oauth Token', description: 'Get Oauth token from code' })
+  @Post('token')
+  async getOauthToken(@Body() oauth: OauthDto) {
+    try {
+      const res = await axios.post("https://oauth2.googleapis.com/token", null, {
+        params: {
+          client_id: oauth.clientId,
+          client_secret: this.environment.getOauthSecret(),
+          code: oauth.code,
+          grant_type: 'authorization_code',
+          redirect_uri: oauth.redirectUri,
+        }
+      });
+
+      if (res.status == 200) {
+        return res.data;
+      }
+
+      throw new NotFoundException()
+    } catch (error) {
+      throw new InternalServerErrorException();
+    }
+  }
+
   @ApiOperation({ summary: 'Login', description: 'Login with Social Media' })
   @Post()
   loginWithSocial(@Body() loginWithSocial: LoginSocialDto) {

Diff for: yarn.lock

@@ -1933,6 +1933,15 @@ axios@^1.6.0:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
+axios@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
+  integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
+  dependencies:
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 babel-jest@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
@@ -4612,10 +4621,10 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nanoid@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.0.0.tgz#760f6d7e076935d086aa3c790e0272cab41abbcb"
-  integrity sha512-5lU+F2QpTW1JLwlXxnu2/jkpTipIuYZL3Za6TQzM16HYDzZQqlthbXYSW0H2KzZu1UQPGHDPbCl1TS3xOKfqEQ==
+nanoid@3.1.31:
+  version "3.1.31"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.31.tgz#f5b58a1ce1b7604da5f0605757840598d8974dc6"
+  integrity sha512-ZivnJm0o9bb13p2Ot5CpgC2rQdzB9Uxm/mFZweqm5eMViqOJe3PV6LU2E30SiLgheesmcPrjquqraoolONSA0A==
 
 natural-compare@^1.4.0:
   version "1.4.0"