Fixed registrar and field expert

src/auth/auth-services/actor.auth.service.ts

@@ -63,7 +63,7 @@ export class ActorAuthService {
           res = await this.expertDbService.findOne({
             _id: new Types.ObjectId(userId),
           });
-        else res = await this.expertDbService.findOne({ email: username });
+        else res = await this.findActorByLoginIdentifier(this.expertDbService, username);
         break;
       case RoleEnum.DAMAGE_EXPERT:
         if (username == null && userId)
@@ -71,14 +71,18 @@ export class ActorAuthService {
             _id: new Types.ObjectId(userId),
           });
         else
-          res = await this.damageExpertDbService.findOne({ email: username });
+          res = await this.findActorByLoginIdentifier(
+            this.damageExpertDbService,
+            username,
+          );
         break;
       case RoleEnum.FIELD_EXPERT:
         if (username == null && userId)
           res = await this.fieldExpertDbService.findOne({
             _id: new Types.ObjectId(userId),
           });
-        else res = await this.fieldExpertDbService.findOne({ email: username });
+        else
+          res = await this.fieldExpertDbService.findByLoginIdentifier(username);
         break;
       case RoleEnum.REGISTRAR:
         if (username == null && userId)
@@ -111,13 +115,27 @@ export class ActorAuthService {
   }
 
   parseActorLoginUsername(body: Record<string, unknown>): string {
-    const username = body?.username ?? body?.email;
+    const username = body?.username ?? body?.email ?? body?.nationalCode;
     if (typeof username !== "string" || !username.trim()) {
-      throw new BadRequestException("username (email) is required");
+      throw new BadRequestException(
+        "username, email, or nationalCode is required",
+      );
     }
     return username.trim();
   }
 
+  private async findActorByLoginIdentifier(
+    dbService: { findOne: (filter: any) => Promise<any> },
+    identifier: string,
+  ) {
+    const id = identifier.trim();
+    const or: Record<string, string>[] = [{ email: id }, { username: id }];
+    if (/^\d{10}$/.test(id)) {
+      or.push({ nationalCode: id });
+    }
+    return dbService.findOne({ $or: or });
+  }
+
   issueActorTokens(actor: {
     _id: Types.ObjectId;
     username?: string;
@@ -129,12 +147,13 @@ export class ActorAuthService {
     clientKey?: Types.ObjectId | string | null;
   }) {
     const payload = {
-      username: actor.username || actor.email,
+      username:
+        actor.username || actor.email || (actor as any).nationalCode || null,
       sub: actor._id,
       fullName: `${actor.firstName || ""} ${actor.lastName || ""}`.trim(),
       role: actor.role || "User",
       userType: actor.userType || "UserType",
-      clientKey: actor.clientKey ?? null,
+      clientKey: actor.clientKey ? String(actor.clientKey) : null,
     };
 
     const access_token = this.jwtService.sign(payload, {