vona-module-a-user 5.0.38 → 5.0.40

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

@@ -228,6 +228,9 @@ declare module 'vona-module-a-user' {
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';
 /** config: end */
+/** main: begin */
+export * from '../main.ts';
+/** main: end */
 /** scope: begin */
 import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig } from 'vona';
 export declare class ScopeModuleAUser extends BeanScopeBase {

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

@@ -14,10 +14,10 @@ export declare class BeanPassport extends BeanBase {
     get isActivated(): boolean;
     isAdmin(): Promise<boolean>;
     setCurrent(passport: IPassport | undefined): Promise<void>;
-    getCurrent(): IPassport | undefined;
-    getCurrentUser(): IUser | undefined;
-    getCurrentAuth(): IAuth | undefined;
-    getCurrentRoles(): IRole[] | undefined;
+    get current(): IPassport | undefined;
+    get currentUser(): IUser | undefined;
+    get currentAuth(): IAuth | undefined;
+    get currentRoles(): IRole[] | undefined;
     signin(passport: IPassport, options?: ISigninOptions): Promise<IJwtToken>;
     signout(): Promise<void>;
     signinSystem<K extends keyof IAuthIdRecord>(authName: IAuthIdRecord[K], authId: K, name?: string, options?: ISigninOptions): Promise<IJwtToken>;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { BeanInfo, BeanBase, beanFullNameFromOnionName, createHash, uuidv4, BeanScopeBase } from 'vona';
+import { BeanInfo, BeanBase, beanFullNameFromOnionName, createHash, uuidv4, BeanSimple, BeanScopeBase } from 'vona';
 import { catchError, isNil } from '@cabloy/utils';
 import { Guard, Aspect } from 'vona-module-a-aspect';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
@@ -17,7 +17,7 @@ let GuardPassport = (_dec$f = Guard({
 }), _dec$f(_class$f = _dec2$f(_class$f = class GuardPassport extends BeanBase {
   async execute(options, next) {
     // auth token
-    if (!this.bean.passport.getCurrent()) {
+    if (!this.bean.passport.current) {
       if (options.checkAuthToken) {
         // will return undefined if no accessToken, so not check options.public
         const [_, err] = await catchError(() => {
@@ -27,7 +27,7 @@ let GuardPassport = (_dec$f = Guard({
       }
     }
     // check current
-    if (!this.bean.passport.getCurrent()) {
+    if (!this.bean.passport.current) {
       await this.bean.passport.signinWithAnonymous();
     }
     if (!options.public && !this.bean.passport.isAuthenticated) {
@@ -69,9 +69,9 @@ let GuardRoleName = (_dec$e = Guard({
   }
   async _check(options) {
     if (!options.name) return false;
-    const user = this.bean.passport.getCurrentUser();
+    const user = this.bean.passport.currentUser;
     if (!user || user.anonymous) return false;
-    const roles = this.bean.passport.getCurrentRoles();
+    const roles = this.bean.passport.currentRoles;
     if (!roles) return false;
     const roleNames = roles?.map(item => item.name);
     const optionsName = Array.isArray(options.name) ? options.name : [options.name];
@@ -99,7 +99,7 @@ let GuardUserName = (_dec$d = Guard({
   }
   async _check(options) {
     if (!options.name) return false;
-    const user = this.bean.passport.getCurrentUser();
+    const user = this.bean.passport.currentUser;
     if (!user || user.anonymous) return false;
     const userName = user.name;
     const optionsName = Array.isArray(options.name) ? options.name : [options.name];
@@ -137,30 +137,30 @@ let BeanPassport = (_dec$c = Bean(), _dec2$c = BeanInfo({
     return this._passportAdapter;
   }
   get isAuthenticated() {
-    const user = this.getCurrentUser();
+    const user = this.currentUser;
     return !!user && !user.anonymous;
   }
   get isActivated() {
-    const user = this.getCurrentUser();
+    const user = this.currentUser;
     return !!user && !!user.activated;
   }
   async isAdmin() {
-    const passport = this.getCurrent();
+    const passport = this.current;
     return await this.passportAdapter.isAdmin(passport);
   }
   async setCurrent(passport) {
     this.ctx.state.passport = await this.passportAdapter.setCurrent(passport);
   }
-  getCurrent() {
+  get current() {
     return this.ctx.state.passport;
   }
-  getCurrentUser() {
+  get currentUser() {
     return this.ctx.state.passport?.user;
   }
-  getCurrentAuth() {
+  get currentAuth() {
     return this.ctx.state.passport?.auth;
   }
-  getCurrentRoles() {
+  get currentRoles() {
     return this.ctx.state.passport?.roles;
   }
   async signin(passport, options) {
@@ -178,7 +178,7 @@ let BeanPassport = (_dec$c = Bean(), _dec2$c = BeanInfo({
   }
   async signout() {
     // current
-    const passport = this.getCurrent();
+    const passport = this.current;
     if (!passport) return;
     // removeAuthToken
     const payloadData = await this.passportAdapter.serialize(passport);
@@ -251,7 +251,7 @@ let BeanPassport = (_dec$c = Bean(), _dec2$c = BeanInfo({
   // only created by accessToken
   async createTempAuthToken(options) {
     // current
-    const passport = this.getCurrent();
+    const passport = this.current;
     if (!passport) return this.app.throw(401);
     // payloadData
     const payloadData = await this._passportSerialize(passport, {
@@ -262,7 +262,7 @@ let BeanPassport = (_dec$c = Bean(), _dec2$c = BeanInfo({
   }
   async createOauthAuthToken(options) {
     // current
-    const passport = this.getCurrent();
+    const passport = this.current;
     if (!passport) return this.app.throw(401);
     // payloadData
     const payloadData = await this._passportSerialize(passport, {
@@ -273,7 +273,7 @@ let BeanPassport = (_dec$c = Bean(), _dec2$c = BeanInfo({
   }
   async createOauthCode(options) {
     // current
-    const passport = this.getCurrent();
+    const passport = this.current;
     if (!passport) return this.app.throw(401);
     // payloadData
     const payloadData = await this._passportSerialize(passport, {
@@ -590,6 +590,27 @@ function config(_app) {
   };
 }
 
+class Main extends BeanSimple {
+  async moduleLoading() {}
+  async moduleLoaded() {
+    // user
+    Object.defineProperty(this.app.context, 'user', {
+      enumerable: false,
+      get() {
+        return this.app.bean.passport.currentUser;
+      }
+    });
+    // passport
+    Object.defineProperty(this.app.context, 'passport', {
+      enumerable: false,
+      get() {
+        return this.app.bean.passport.current;
+      }
+    });
+  }
+  async configLoaded(_config) {}
+}
+
 var _dec, _dec2, _class;
 let ScopeModuleAUser = (_dec = Scope(), _dec2 = BeanInfo({
   module: "a-user"
@@ -632,4 +653,4 @@ function $getUserIdSystem(_userName, userId) {
   return userId;
 }
 
-export { $getAuthIdSystem, $getUserIdSystem, BeanPassport, BeanRole, BeanUser, CacheRedisAuthToken, EventActivate, EventCreateAnonymous, EventRegister, EventSignin, EventSignout, GuardPassport, GuardRoleName, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, ServiceAuthTokenAdapter, ServiceRedisToken, config };
+export { $getAuthIdSystem, $getUserIdSystem, BeanPassport, BeanRole, BeanUser, CacheRedisAuthToken, EventActivate, EventCreateAnonymous, EventRegister, EventSignin, EventSignout, GuardPassport, GuardRoleName, GuardUserName, Main, MetaPrintTip, Passport, ScopeModuleAUser, ServiceAuthTokenAdapter, ServiceRedisToken, config };

package/dist/main.d.ts

@@ -0,0 +1,7 @@
+import type { IModuleMain } from 'vona';
+import { BeanSimple } from 'vona';
+export declare class Main extends BeanSimple implements IModuleMain {
+    moduleLoading(): Promise<void>;
+    moduleLoaded(): Promise<void>;
+    configLoaded(_config: any): Promise<void>;
+}

package/dist/types/passport.d.ts

@@ -17,4 +17,8 @@ declare module 'vona' {
     interface ContextState {
         passport?: IPassport;
     }
+    interface VonaContext {
+        get user(): IUser;
+        get passport(): IPassport;
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-user",
   "type": "module",
-  "version": "5.0.38",
+  "version": "5.0.40",
   "title": "a-user",
   "vonaModule": {
     "dependencies": {}
@@ -22,8 +22,8 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "dist",
-    "static"
+    "assets",
+    "dist"
   ],
   "devDependencies": {
     "clean-package": "^2.2.0",