vona-module-a-user 5.0.19 → 5.0.20

package/dist/.metadata/index.d.ts

@@ -18,10 +18,22 @@ declare module 'vona-module-a-aspect' {
 declare module 'vona-module-a-user' {
     interface GuardPassport {
     }
+    interface GuardPassport {
+        get $beanFullName(): 'a-user.guard.passport';
+        get $onionName(): 'a-user:passport';
+    }
     interface GuardRoleName {
     }
+    interface GuardRoleName {
+        get $beanFullName(): 'a-user.guard.roleName';
+        get $onionName(): 'a-user:roleName';
+    }
     interface GuardUserName {
     }
+    interface GuardUserName {
+        get $beanFullName(): 'a-user.guard.userName';
+        get $onionName(): 'a-user:userName';
+    }
 }
 /** guard: end */
 /** bean: begin */
@@ -71,7 +83,15 @@ declare module 'vona-module-a-bean' {
 declare module 'vona-module-a-user' {
     interface ServiceAuthTokenAdapter {
     }
+    interface ServiceAuthTokenAdapter {
+        get $beanFullName(): 'a-user.service.authTokenAdapter';
+        get $onionName(): 'a-user:authTokenAdapter';
+    }
+    interface ServiceRedisToken {
+    }
     interface ServiceRedisToken {
+        get $beanFullName(): 'a-user.service.redisToken';
+        get $onionName(): 'a-user:redisToken';
     }
 }
 /** service: end */
@@ -102,10 +122,22 @@ declare module 'vona' {
 declare module 'vona-module-a-user' {
     interface EventCreateUserAnonymous {
     }
+    interface EventCreateUserAnonymous {
+        get $beanFullName(): 'a-user.event.createUserAnonymous';
+        get $onionName(): 'a-user:createUserAnonymous';
+    }
+    interface EventSignin {
+    }
     interface EventSignin {
+        get $beanFullName(): 'a-user.event.signin';
+        get $onionName(): 'a-user:signin';
     }
     interface EventSignout {
     }
+    interface EventSignout {
+        get $beanFullName(): 'a-user.event.signout';
+        get $onionName(): 'a-user:signout';
+    }
 }
 /** event: end */
 /** event: begin */
@@ -142,6 +174,10 @@ declare module 'vona' {
 declare module 'vona-module-a-user' {
     interface MetaPrintTip {
     }
+    interface MetaPrintTip {
+        get $beanFullName(): 'a-user.meta.printTip';
+        get $onionName(): 'a-user:printTip';
+    }
 }
 /** meta: end */
 /** config: begin */

package/dist/bean/bean.passport.d.ts

@@ -1,4 +1,4 @@
-import type { IJwtClientRecord, IJwtSignOptions, IJwtToken, IPayloadDataBase } from 'vona-module-a-jwt';
+import type { IJwtClientRecord, IJwtSignOptions, IJwtToken, IJwtVerifyOptions, IPayloadDataBase } from 'vona-module-a-jwt';
 import type { IAuthBase, IAuthIdRecord, ISigninOptions } from '../types/auth.ts';
 import type { IPassportBase } from '../types/passport.ts';
 import type { IRoleBase } from '../types/role.ts';
@@ -24,11 +24,12 @@ export declare class BeanPassport extends BeanBase {
     signinWithAnonymous(): Promise<void>;
     createUserAnonymous(): Promise<IUserBase>;
     kickOut(user: IUserBase): Promise<void>;
-    checkAuthToken(accessToken?: string, clientName?: keyof IJwtClientRecord): Promise<IPayloadDataBase | undefined>;
+    checkAuthToken(accessToken?: string, clientName?: keyof IJwtClientRecord, options?: IJwtVerifyOptions): Promise<IPayloadDataBase | undefined>;
     refreshAuthToken(refreshToken: string): Promise<IJwtToken>;
     createTempAuthToken(options?: IJwtSignOptions): Promise<string>;
     createOauthAuthToken(options?: IJwtSignOptions): Promise<string>;
-    createOauthCode(accessToken: string, options?: IJwtSignOptions): Promise<string>;
+    createOauthCode(options?: IJwtSignOptions): Promise<string>;
+    createOauthCodeFromOauthAuthToken(accessToken: string, options?: IJwtSignOptions): Promise<string>;
     createAuthTokenFromOauthCode(code: string): Promise<IJwtToken>;
     private _passportSerialize;
     private _handlePayloadData;

package/dist/bean/bean.roleInner.d.ts

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-database';
+import type { TableIdentity } from 'vona-module-a-orm';
 import type { IRoleBase } from '../types/role.ts';
 import { BeanBase } from 'vona';
 export declare class BeanRoleInner extends BeanBase {
@@ -6,5 +6,5 @@ export declare class BeanRoleInner extends BeanBase {
     private get roleInnerAdapter();
     findOneByName(name: string): Promise<IRoleBase | undefined>;
     findOne(role: Partial<IRoleBase>): Promise<IRoleBase | undefined>;
-    findAllByUserId(userId: TableIdentity): Promise<IRoleBase[]>;
+    findAllByUserId(userId: TableIdentity): Promise<IRoleBase[] | undefined>;
 }

package/dist/index.js

@@ -250,10 +250,10 @@ let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   async kickOut(user) {
     await this.authTokenAdapter.removeAll(user);
   }
-  async checkAuthToken(accessToken, clientName) {
+  async checkAuthToken(accessToken, clientName, options) {
     clientName = clientName ?? 'access';
     const [payloadData, err] = await catchError(() => {
-      return this.bean.jwt.get(clientName).verify(accessToken);
+      return this.bean.jwt.get(clientName).verify(accessToken, options);
     });
     if (err) {
       if (['access', 'refresh'].includes(clientName)) {
@@ -292,7 +292,7 @@ let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
       authToken: 'nochange'
     });
     // jwt token
-    return await this.bean.jwt.createTemp(payloadData, options);
+    return await this.bean.jwt.createTempAuthToken(payloadData, options);
   }
   async createOauthAuthToken(options) {
     // current
@@ -303,13 +303,24 @@ let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
       authToken: 'nochange'
     });
     // jwt token
-    return await this.bean.jwt.createOauth(payloadData, options);
+    return await this.bean.jwt.createOauthAuthToken(payloadData, options);
   }
-  async createOauthCode(accessToken, options) {
+  async createOauthCode(options) {
+    // current
+    const passport = this.getCurrent();
+    if (!passport) return this.app.throw(401);
+    // payloadData
+    const payloadData = await this._passportSerialize(passport, {
+      authToken: 'nochange'
+    });
+    // code
+    return await this.bean.jwt.createOauthCode(payloadData, options);
+  }
+  async createOauthCodeFromOauthAuthToken(accessToken, options) {
     // payloadData
     const payloadData = await this.bean.jwt.get('access').verify(accessToken);
     if (!payloadData) return this.app.throw(401);
-    // create
+    // code
     return await this.bean.jwt.createOauthCode(payloadData, options);
   }
   async createAuthTokenFromOauthCode(code) {

package/dist/lib/auth.d.ts

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-database';
+import type { TableIdentity } from 'vona-module-a-orm';
 import type { IAuthAdapter, IAuthBase, IAuthIdRecord } from '../types/auth.ts';
 export declare function setAuthAdapter(authAdapter: IAuthAdapter): void;
 export declare function $getAuthId(user: IAuthBase): TableIdentity;

package/dist/lib/role.d.ts

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-database';
+import type { TableIdentity } from 'vona-module-a-orm';
 import type { IRoleAdapter, IRoleBase } from '../types/role.ts';
 export declare function setRoleAdapter(roleAdapter: IRoleAdapter): void;
 export declare function $getRoleId(role: IRoleBase): TableIdentity;

package/dist/lib/user.d.ts

@@ -1,5 +1,5 @@
 import type { ILocaleInfos } from 'vona';
-import type { TableIdentity } from 'vona-module-a-database';
+import type { TableIdentity } from 'vona-module-a-orm';
 import type { IUserAdapter, IUserBase, IUserIdRecord } from '../types/user.ts';
 export declare function setUserAdapter(userAdapter: IUserAdapter): void;
 export declare function $getUserId(user: IUserBase): TableIdentity;

package/dist/types/auth.d.ts

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-database';
+import type { TableIdentity } from 'vona-module-a-orm';
 export interface IAuthIdRecord {
     '-1': 'dev';
     '-10000': 'mock';

package/dist/types/role.d.ts

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-database';
+import type { TableIdentity } from 'vona-module-a-orm';
 export interface IRoleNameRecord {
     admin: never;
 }
@@ -14,5 +14,5 @@ export interface IRoleAdapter {
 export interface IRoleInnerAdapter {
     findOneByName(name: string): Promise<IRoleBase | undefined>;
     findOne(role: Partial<IRoleBase>): Promise<IRoleBase | undefined>;
-    findAllByUserId(userId: TableIdentity): Promise<IRoleBase[]>;
+    findAllByUserId(userId: TableIdentity): Promise<IRoleBase[] | undefined>;
 }

package/dist/types/user.d.ts

@@ -1,5 +1,5 @@
 import type { ILocaleInfos } from 'vona';
-import type { TableIdentity } from 'vona-module-a-database';
+import type { TableIdentity } from 'vona-module-a-orm';
 import type { IAuthUserProfile } from './authProfile.ts';
 export interface IUserNameRecord {
     admin: never;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-user",
   "type": "module",
-  "version": "5.0.19",
+  "version": "5.0.20",
   "title": "a-user",
   "vonaModule": {
     "dependencies": {}