vona-cli-set-api 1.0.270 → 1.0.271

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/service/passportAdapter.ts

@@ -1,26 +1,28 @@
-import type { IPassportAdapter, IPassportBase } from 'vona-module-a-user';
-import type { IPayloadData } from '../types/passport.ts';
+import type { IPassportAdapter } from 'vona-module-a-user';
+import type { IPassport, IPayloadData } from '../types/passport.ts';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
 @Service()
 export class ServicePassportAdapter extends BeanBase implements IPassportAdapter {
-  async isAdmin(passport: IPassportBase | undefined): Promise<boolean> {
-    if (!passport || !passport.roles) return false;
-    return passport.roles.some(item => item.name === 'admin');
+  async isAdmin(passport: IPassport | undefined): Promise<boolean> {
+    if (!passport) return false;
+    if (passport.user?.name === 'admin') return true;
+    if (passport.roles?.some(role => role.name === 'admin')) return true;
+    return false;
   }
 
-  async setCurrent(passport: IPassportBase | undefined): Promise<IPassportBase | undefined> {
+  async setCurrent(passport: IPassport | undefined): Promise<IPassport | undefined> {
     return passport;
   }
 
-  async serialize(passport: IPassportBase): Promise<IPayloadData> {
+  async serialize(passport: IPassport): Promise<IPayloadData> {
     const userId = passport.user!.id;
     const authId = passport.auth!.id;
     return { userId, authId };
   }
 
-  async deserialize(payloadData: IPayloadData): Promise<IPassportBase | undefined> {
+  async deserialize(payloadData: IPayloadData): Promise<IPassport | undefined> {
     const user = await this.bean.user.findOne({ id: payloadData.userId });
     if (!user) return;
     const auth = await this.bean.auth.findOne({ id: payloadData.authId });

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/types/passport.ts

@@ -1,8 +1,11 @@
 import type { TableIdentity } from 'table-identity';
 import type { IPayloadDataBase } from 'vona-module-a-jwt';
+import type { IPassportBase } from 'vona-module-a-user';
 
 export interface IPayloadData extends IPayloadDataBase {
   userId: TableIdentity;
   authId: TableIdentity;
   token?: string;
 }
+
+export interface IPassport extends IPassportBase {}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.270",
+  "version": "1.0.271",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"