chore: sms login and fix githubLogin related field

developerlinks · Jul 9, 2023 · 6fa0a4f · 6fa0a4f
1 parent 2085c2f
commit 6fa0a4f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/entity/profile.entity.ts b/src/entity/profile.entity.ts
@@ -36,21 +36,19 @@ export class Profile {
   @Column({ nullable: true })
   photo: string;
 
-  @Column()
+  @Column({ nullable: true })
   @Expose()
   address: string;
 
-  @Column()
+  @Column({ nullable: true })
   @Expose()
   description: string;
 
-  // github
-
-  @Column()
+  @Column({ nullable: true })
   @Expose()
   githubLogin: string;
 
-  @Column()
+  @Column({ nullable: true })
   @Expose()
   githubName: string;
 

diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts
@@ -61,8 +61,12 @@ export class AuthController {
   @ApiOperation({ summary: '邮箱&验证码 登录' })
   @Post('/signin_by_code')
   async signInByEmailAndcode(@Body() dto: SignInByEmailAndCodeDto, @Req() req: Request) {
-    const { accessToken, refreshToken } = await this.authService.signInByEmailAndCode(dto, req);
+    const { user, accessToken, refreshToken } = await this.authService.signInByEmailAndCode(
+      dto,
+      req,
+    );
     return {
+      user,
       accessToken,
       refreshToken,
     };

diff --git a/src/modules/auth/auth.service.ts b/src/modules/auth/auth.service.ts
@@ -163,6 +163,7 @@ export class AuthService {
     await this.storeAccessTokenInRedis(user.id, deviceId, accessToken);
 
     return {
+      user,
       accessToken,
       refreshToken,
     };