return email_verified with current user

Author: moshfeu

docs/cc-api-spec.json

@@ -18,6 +18,10 @@ export class UserDto {
   @ApiModelProperty()
   readonly _id: string;
 
+  // for mentorship mentor / mentee
+  @ApiModelProperty()
+  readonly id: string;
+
   @ApiModelProperty()
   @IsEmail()
   @IsString()
@@ -37,6 +41,15 @@ export class UserDto {
   @IsUrl()
   readonly avatar: string;
 
+  @ApiModelPropertyOptional()
+  @IsString()
+  @IsUrl()
+  readonly image: string;
+
+  @ApiModelPropertyOptional()
+  @IsString()
+  readonly auth0Id: string;
+
   @ApiModelPropertyOptional()
   @Length(3, 50)
   @IsString()
@@ -94,7 +107,7 @@ export class UserDto {
   @ArrayMaxSize(3)
   readonly channels: Channel[];
 
-  constructor(values) {
+  constructor(values: Partial<UserDto>) {
     Object.assign(this, values);
   }
 }

src/modules/common/dto/user.dto.ts

@@ -26,6 +26,8 @@ export interface User extends Document {
   readonly _id: ObjectID;
   readonly auth0Id: string;
   readonly email: string;
+  readonly nickname: string;
+  readonly picture: string;
   readonly email_verified: boolean;
   readonly available: boolean;
   readonly name: string;

src/modules/common/interfaces/user.interface.ts

@@ -27,7 +27,7 @@ export class UsersService {
   }
 
   async findByAuth0Id(auth0Id: string): Promise<User> {
-    return await this.userModel.findOne({ auth0Id }).exec();
+    return await this.userModel.findOne({ auth0Id }).lean().exec();
   }
 
   async findByEmail(email: string): Promise<User> {

src/modules/common/users.service.ts

@@ -117,7 +117,7 @@ describe('modules/users/UsersController', () => {
 
     beforeEach(() => {
       request = { user: { auth0Id: '123' } };
-      data = { _id: 123, name: 'Crysfel Villa' } as User;
+      data = { _id: 123, name: 'Crysfel Villa', email_verified: false } as User;
       response = { success: true, data };
     });
 
@@ -127,6 +127,21 @@ describe('modules/users/UsersController', () => {
       expect(await usersController.currentUser(request)).toEqual(response);
     });
 
+    it('should return if the user has verified email', async () => {
+      usersService.findByAuth0Id = jest.fn(() => Promise.resolve(data));
+
+      expect(
+        await usersController.currentUser({
+          ...request,
+          user: { ...request.user, email_verified: true },
+        }),
+      ).toMatchObject({
+        data: {
+          email_verified: true,
+        },
+      });
+    });
+
     it('should create a new user', async () => {
       usersService.findByAuth0Id = jest.fn(() => Promise.resolve(undefined));
       usersService.findByEmail = jest.fn(() => Promise.resolve(undefined));

src/modules/users/__tests__/users.controller.spec.ts

@@ -1,4 +1,5 @@
 import * as Sentry from '@sentry/node';
+import { Request } from 'express';
 
 import {
   Controller,
@@ -76,18 +77,18 @@ export class UsersController {
 
   @ApiOperation({ title: 'Returns the current user' })
   @Get('current')
-  async currentUser(@Req() request) {
+  async currentUser(@Req() request: Request) {
     const userId: string = request.user.auth0Id;
     const currentUser: User = await this.usersService.findByAuth0Id(userId);
     const response = {
       success: true,
-      data: currentUser,
+      data: this.enrichUserResponse(currentUser, request.user),
     };
 
     if (!currentUser) {
       try {
         const data: any = await this.auth0Service.getAdminAccessToken();
-        const user: any = await this.auth0Service.getUserProfile(
+        const user: User = await this.auth0Service.getUserProfile(
           data.access_token,
           userId,
         );
@@ -137,7 +138,7 @@ export class UsersController {
             },
           });
 
-          response.data = newUser;
+          response.data = this.enrichUserResponse(newUser, request.user);
         }
       } catch (error) {
         return {
@@ -158,6 +159,13 @@ export class UsersController {
     return response;
   }
 
+  private enrichUserResponse(user: User, auth0User: User): User {
+    return {
+      ...user,
+      email_verified: Boolean(auth0User.email_verified),
+    };
+  }
+
   private async shouldIncludeChannels(
     currentUser?: User,
     requestedUser?: User,