feat: adaptive username

cnpm · Jun 28, 2023 · 893626c · 893626c
1 parent a4a0f2d
commit 893626c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/app/core/service/UserService.ts b/app/core/service/UserService.ts
@@ -12,6 +12,7 @@ import { WebauthnCredential as WebauthnCredentialEntity } from '../entity/Webaut
 import { LoginResultCode } from '../../common/enum/User';
 import { integrity, checkIntegrity, randomToken, sha512 } from '../../common/UserUtil';
 import { AbstractService } from '../../common/AbstractService';
+import { RegistryManagerService } from './RegistryManagerService';
 
 type Optional<T, K extends keyof T> = Omit < T, K > & Partial<T> ;
 
@@ -59,12 +60,33 @@ type CreateWebauthnCredentialOptions = {
 export class UserService extends AbstractService {
   @Inject()
   private readonly userRepository: UserRepository;
+  @Inject()
+  private readonly registryManagerService: RegistryManagerService;
 
   checkPassword(user: UserEntity, password: string): boolean {
     const plain = `${user.passwordSalt}${password}`;
     return checkIntegrity(plain, user.passwordIntegrity);
   }
 
+  async findUserByNameOrDisplayName(name: string) {
+    const hasPrefix = name.includes(':');
+    if (hasPrefix) {
+      return await this.findUserByName(name);
+    }
+
+    const selfRegistry = await this.registryManagerService.ensureSelfRegistry();
+    const defaultRegistry = await this.registryManagerService.ensureDefaultRegistry();
+
+    const selfUser = await this.findUserByName(`${selfRegistry.name}:${name}`);
+    const defaultUser = await this.findUserByName(`${defaultRegistry.name}:${name}`);
+
+    if (selfUser && defaultUser) {
+      throw new ForbiddenError(`${name} is ambiguous, please use ${selfUser.name} or ${defaultUser.name}}`);
+    }
+
+    return selfUser || defaultUser;
+  }
+
   async findUserByName(name: string): Promise<UserEntity | null> {
     return await this.userRepository.findUserByName(name);
   }

diff --git a/app/port/controller/UserController.ts b/app/port/controller/UserController.ts
@@ -90,7 +90,7 @@ export class UserController extends AbstractController {
       ctx.status = 201;
       return {
         ok: true,
-        id: `org.couchdb.user:${result.user?.name}`,
+        id: `org.couchdb.user:${result.user?.displayName}`,
         rev: result.user?.userId,
         token: result.token?.token,
       };
@@ -113,7 +113,7 @@ export class UserController extends AbstractController {
     ctx.status = 201;
     return {
       ok: true,
-      id: `org.couchdb.user:${userEntity.name}`,
+      id: `org.couchdb.user:${userEntity.displayName}`,
       rev: userEntity.userId,
       token: token.token,
     };
@@ -140,14 +140,14 @@ export class UserController extends AbstractController {
     method: HTTPMethodEnum.GET,
   })
   async showUser(@Context() ctx: EggContext, @HTTPParam() username: string) {
-    const user = await this.userRepository.findUserByName(username);
+    const user = await this.userService.findUserByNameOrDisplayName(username);
     if (!user) {
       throw new NotFoundError(`User "${username}" not found`);
     }
     const authorized = await this.userRoleManager.getAuthorizedUserAndToken(ctx);
     return {
-      _id: `org.couchdb.user:${user.name}`,
-      name: user.name,
+      _id: `org.couchdb.user:${user.displayName}`,
+      name: user.displayName,
       email: authorized ? user.email : undefined,
     };
   }
@@ -209,7 +209,7 @@ export class UserController extends AbstractController {
       //   "pending": false,
       //   "mode": "auth-only"
       // },
-      name: authorizedUser.name,
+      name: authorizedUser.displayName,
       email: authorizedUser.email,
       email_verified: false,
       created: authorizedUser.createdAt,