Merge pull request #79 from tugascript/mobile-external

feat(oauth2): add token endpoint

Author: tugascript

.env.example

@@ -1,4 +1,4 @@
-c# change to production before deploying
+# change to production before deploying
 NODE_ENV='development'
 PORT=5000
 APP_ID='00000000-0000-0000-0000-000000000000'

README.md

@@ -1,10 +1,10 @@
-# Nest OAuth: Adding External Providers
+# Nest OAuth: Adding Mobile Apps Support
 
 ## Intro
 
 This is the source code for the
-tutorial [Nest Authentication with OAuth2.0](https://dev.to/tugascript/nestjs-authentication-with-oauth20-adding-external-providers-2kj).
-This is the 5<sup>th</sup> and last part on a 5 part series, where we will build a production level NestJS OAuth2
+tutorial [Nest Authentication with OAuth2.0](https://dev.to/tugascript/nestjs-authentication-with-oauth20-adding-mobile-apps-support-13nl).
+This is the 6<sup>th</sup> and extra part on a 5 part series, where we will build a production level NestJS OAuth2
 service.
 
 ### Contents

package.json

@@ -46,7 +46,7 @@
     "class-transformer": "0.5.1",
     "class-validator": "0.14.1",
     "dayjs": "1.11.12",
-    "fastify": "4.28.0",
+    "fastify": "4.28.1",
     "handlebars": "4.7.8",
     "ioredis": "5.4.1",
     "joi": "17.13.3",
@@ -82,6 +82,7 @@
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-prettier": "5.2.1",
     "jest": "29.7.0",
+    "nock": "13.5.5",
     "prettier": "3.3.3",
     "source-map-support": "0.5.21",
     "supertest": "7.0.0",

src/auth/auth.controller.ts

@@ -49,6 +49,7 @@ import { Public } from './decorators/public.decorator';
 import { ChangePasswordDto } from './dtos/change-password.dto';
 import { ConfirmEmailDto } from './dtos/confirm-email.dto';
 import { EmailDto } from './dtos/email.dto';
+import { RefreshAccessDto } from './dtos/refresh-access.dto';
 import { ResetPasswordDto } from './dtos/reset-password.dto';
 import { SignInDto } from './dtos/sign-in.dto';
 import { SignUpDto } from './dtos/sign-up.dto';
@@ -136,8 +137,9 @@ export class AuthController {
   public async refreshAccess(
     @Req() req: FastifyRequest,
     @Res() res: FastifyReply,
+    @Body() refreshAccessDto?: RefreshAccessDto,
   ): Promise<void> {
-    const token = this.refreshTokenFromReq(req);
+    const token = this.refreshTokenFromReq(req, refreshAccessDto);
     const result = await this.authService.refreshTokenAccess(
       token,
       req.headers.origin,
@@ -161,8 +163,9 @@ export class AuthController {
   public async logout(
     @Req() req: FastifyRequest,
     @Res() res: FastifyReply,
+    @Body() refreshAccessDto?: RefreshAccessDto,
   ): Promise<void> {
-    const token = this.refreshTokenFromReq(req);
+    const token = this.refreshTokenFromReq(req, refreshAccessDto);
     const message = await this.authService.logout(token);
     res
       .clearCookie(this.cookieName, { path: this.cookiePath })
@@ -189,7 +192,7 @@ export class AuthController {
     @Body() confirmEmailDto: ConfirmEmailDto,
     @Res() res: FastifyReply,
   ): Promise<void> {
-    const result = await this.authService.confirmEmail(confirmEmailDto);
+    const result = await this.authService.confirmEmail(confirmEmailDto, origin);
     this.saveRefreshCookie(res, result.refreshToken)
       .status(HttpStatus.OK)
       .send(AuthResponseMapper.map(result));
@@ -279,10 +282,17 @@ export class AuthController {
     return OAuthProvidersResponseMapper.map(providers);
   }
 
-  private refreshTokenFromReq(req: FastifyRequest): string {
+  private refreshTokenFromReq(
+    req: FastifyRequest,
+    dto?: RefreshAccessDto,
+  ): string {
     const token: string | undefined = req.cookies[this.cookieName];
 
     if (isUndefined(token) || isNull(token)) {
+      if (!isUndefined(dto?.refreshToken)) {
+        return dto.refreshToken;
+      }
+
       throw new UnauthorizedException();
     }
 

src/auth/auth.service.ts

@@ -88,7 +88,12 @@ export class AuthService {
     const user = await this.usersService.confirmEmail(id, version);
     const [accessToken, refreshToken] =
       await this.jwtService.generateAuthTokens(user, domain);
-    return { user, accessToken, refreshToken };
+    return {
+      user,
+      accessToken,
+      refreshToken,
+      expiresIn: this.jwtService.accessTime,
+    };
   }
 
   public async signIn(dto: SignInDto, domain?: string): Promise<IAuthResult> {
@@ -112,7 +117,12 @@ export class AuthService {
 
     const [accessToken, refreshToken] =
       await this.jwtService.generateAuthTokens(user, domain);
-    return { user, accessToken, refreshToken };
+    return {
+      user,
+      accessToken,
+      refreshToken,
+      expiresIn: this.jwtService.accessTime,
+    };
   }
 
   public async refreshTokenAccess(
@@ -128,7 +138,12 @@ export class AuthService {
     const user = await this.usersService.findOneByCredentials(id, version);
     const [accessToken, newRefreshToken] =
       await this.jwtService.generateAuthTokens(user, domain, tokenId);
-    return { user, accessToken, refreshToken: newRefreshToken };
+    return {
+      user,
+      accessToken,
+      refreshToken: newRefreshToken,
+      expiresIn: this.jwtService.accessTime,
+    };
   }
 
   public async logout(refreshToken: string): Promise<IMessage> {
@@ -184,7 +199,12 @@ export class AuthService {
     );
     const [accessToken, refreshToken] =
       await this.jwtService.generateAuthTokens(user, domain);
-    return { user, accessToken, refreshToken };
+    return {
+      user,
+      accessToken,
+      refreshToken,
+      expiresIn: this.jwtService.accessTime,
+    };
   }
 
   private async checkLastPassword(

src/auth/dtos/refresh-access.dto.ts

@@ -0,0 +1,32 @@
+/*
+ Copyright (C) 2024 Afonso Barracha
+
+ Nest OAuth is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Nest OAuth is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with Nest OAuth.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { ApiProperty } from '@nestjs/swagger';
+import { IsJWT, IsOptional, IsString } from 'class-validator';
+
+export abstract class RefreshAccessDto {
+  @ApiProperty({
+    description: 'The JWT token sent to the user email',
+    example:
+      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c',
+    type: String,
+  })
+  @IsOptional()
+  @IsString()
+  @IsJWT()
+  public refreshToken?: string;
+}

src/auth/interfaces/auth-response.interface.ts

@@ -20,4 +20,7 @@ import { IAuthResponseUser } from './auth-response-user.interface';
 export interface IAuthResponse {
   user: IAuthResponseUser;
   accessToken: string;
+  refreshToken: string;
+  tokenType: string;
+  expiresIn: number;
 }

src/auth/interfaces/auth-result.interface.ts

@@ -21,4 +21,5 @@ export interface IAuthResult {
   user: IUser;
   accessToken: string;
   refreshToken: string;
+  expiresIn: number;
 }

src/auth/mappers/auth-response.mapper.ts

@@ -35,6 +35,28 @@ export class AuthResponseMapper implements IAuthResponse {
   })
   public readonly accessToken: string;
 
+  @ApiProperty({
+    description: 'Refresh token',
+    example:
+      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c',
+    type: String,
+  })
+  public readonly refreshToken: string;
+
+  @ApiProperty({
+    description: 'Token type',
+    example: 'Bearer',
+    type: String,
+  })
+  public readonly tokenType: string;
+
+  @ApiProperty({
+    description: 'Expiration period in seconds',
+    example: 3600,
+    type: Number,
+  })
+  public readonly expiresIn: number;
+
   constructor(values: IAuthResponse) {
     Object.assign(this, values);
   }
@@ -43,6 +65,9 @@ export class AuthResponseMapper implements IAuthResponse {
     return new AuthResponseMapper({
       user: AuthResponseUserMapper.map(result.user),
       accessToken: result.accessToken,
+      refreshToken: result.refreshToken,
+      tokenType: 'Bearer',
+      expiresIn: result.expiresIn,
     });
   }
 }

src/common/common.service.ts

@@ -24,6 +24,7 @@ import {
   Logger,
   LoggerService,
   NotFoundException,
+  UnauthorizedException,
 } from '@nestjs/common';
 import { validate } from 'class-validator';
 import slugify from 'slugify';
@@ -131,6 +132,20 @@ export class CommonService {
     }
   }
 
+  /**
+   * Throw Unauthorized
+   *
+   * Function to abstract throwing unauthorized exceptionm
+   */
+  public async throwUnauthorizedError<T>(promise: Promise<T>): Promise<T> {
+    try {
+      return await promise;
+    } catch (error) {
+      this.loggerService.error(error);
+      throw new UnauthorizedException();
+    }
+  }
+
   /**
    * Format Name
    *