fix: get user_info incorrectly who issued by oidc provider

ChingCdesu · Sep 30, 2023 · a8d40a7 · a8d40a7
1 parent e2634f5
commit a8d40a7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "supernode",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0-alpha.9",
   "description": "",
   "author": "",
   "private": true,

diff --git a/src/modules/user/user.controller.ts b/src/modules/user/user.controller.ts
@@ -36,7 +36,12 @@ export class UserControllerV1 {
   @UseGuards(AuthenticatedGuard)
   @Get('me')
   async me(@Req() req: Request) {
-    return req.user;
+    if (req.user instanceof UserModel) {
+      return req.user;
+    } else if (req.user?.sub /* OIDC */) {
+      return await this._userService.getByUniqueId(req.user.sub);
+    }
+    return {};
   }
 
   @ApiOperation({ summary: '更新自己的用户信息' })

diff --git a/src/modules/user/user.service.ts b/src/modules/user/user.service.ts
@@ -54,6 +54,18 @@ export class UserService extends LoggerProvider {
     return user;
   }
 
+  public async getByUniqueId(uniqueId: string): Promise<UserModel> {
+    const user = await this._userModel.findOne({
+      where: {
+        uniqueId,
+      },
+    });
+    if (isNull(user)) {
+      throw new NotFoundException('User not found');
+    }
+    return user;
+  }
+
   public async create(createUserDto: CreateUserDto): Promise<UserModel> {
     const user = await this._userModel.create(Object.assign(createUserDto));
     const operator = this._req.user;