vona-module-a-user 5.0.15 → 5.0.17

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

@@ -1,39 +1,11 @@
-import type { BeanScopeUtil, TypeModuleConfig } from 'vona';
-import type { EventOn } from 'vona-module-a-event';
-/** bean: end */
-/** bean: begin */
-import type { BeanAuthInner } from '../bean/bean.authInner.ts';
-import type { BeanPassport } from '../bean/bean.passport.ts';
-import type { BeanRoleInner } from '../bean/bean.roleInner.ts';
-import type { BeanUserInner } from '../bean/bean.userInner.ts';
-/** event: end */
-/** event: begin */
-import type { EventCreateUserAnonymous } from '../bean/event.createUserAnonymous.ts';
-/** event: end */
-/** event: begin */
-import type { TypeEventCreateUserAnonymousData, TypeEventCreateUserAnonymousResult } from '../bean/event.createUserAnonymous.ts';
-import type { EventSignin } from '../bean/event.signin.ts';
-import type { TypeEventSigninData, TypeEventSigninResult } from '../bean/event.signin.ts';
-import type { EventSignout } from '../bean/event.signout.ts';
-import type { TypeEventSignoutData, TypeEventSignoutResult } from '../bean/event.signout.ts';
-/** guard: end */
-/** bean: begin */
+/** guard: begin */
+export * from '../bean/guard.passport.ts';
+export * from '../bean/guard.roleName.ts';
+export * from '../bean/guard.userName.ts';
 import type { IGuardOptionsPassport } from '../bean/guard.passport.ts';
 import type { IGuardOptionsRoleName } from '../bean/guard.roleName.ts';
 import type { IGuardOptionsUserName } from '../bean/guard.userName.ts';
-import type { config } from '../config/config.ts';
-/** config: end */
-/** scope: begin */
-import { BeanScopeBase } from 'vona';
-import 'vona';
-import 'vona';
-import 'vona';
-import 'vona';
 import 'vona';
-import 'vona';
-export * from '../bean/bean.authInner.ts';
-export * from '../bean/bean.passport.ts';
-export * from '../bean/bean.roleInner.ts';
 declare module 'vona-module-a-aspect' {
     interface IGuardRecordGlobal {
         'a-user:passport': IGuardOptionsPassport;
@@ -51,12 +23,13 @@ declare module 'vona-module-a-user' {
     interface GuardUserName {
     }
 }
+/** guard: end */
+/** bean: begin */
+export * from '../bean/bean.authInner.ts';
+export * from '../bean/bean.passport.ts';
+export * from '../bean/bean.roleInner.ts';
 export * from '../bean/bean.userInner.ts';
-/** bean: end */
-/** event: begin */
-export * from '../bean/event.createUserAnonymous.ts';
-export * from '../bean/event.signin.ts';
-export * from '../bean/event.signout.ts';
+import 'vona';
 declare module 'vona' {
 }
 declare module 'vona-module-a-user' {
@@ -69,18 +42,27 @@ declare module 'vona-module-a-user' {
     interface BeanUserInner {
     }
 }
+/** bean: end */
+/** bean: begin */
+import type { BeanAuthInner } from '../bean/bean.authInner.ts';
+import type { BeanPassport } from '../bean/bean.passport.ts';
+import type { BeanRoleInner } from '../bean/bean.roleInner.ts';
+import type { BeanUserInner } from '../bean/bean.userInner.ts';
+import 'vona';
 declare module 'vona' {
     interface IBeanRecordGlobal {
-        authInner: BeanAuthInner;
-        passport: BeanPassport;
-        roleInner: BeanRoleInner;
-        userInner: BeanUserInner;
+        'authInner': BeanAuthInner;
+        'passport': BeanPassport;
+        'roleInner': BeanRoleInner;
+        'userInner': BeanUserInner;
     }
 }
-/** guard: begin */
-export * from '../bean/guard.passport.ts';
-export * from '../bean/guard.roleName.ts';
-export * from '../bean/guard.userName.ts';
+/** bean: end */
+/** event: begin */
+export * from '../bean/event.createUserAnonymous.ts';
+export * from '../bean/event.signin.ts';
+export * from '../bean/event.signout.ts';
+import 'vona';
 declare module 'vona' {
 }
 declare module 'vona-module-a-user' {
@@ -91,11 +73,22 @@ declare module 'vona-module-a-user' {
     interface EventSignout {
     }
 }
+/** event: end */
+/** event: begin */
+import type { EventCreateUserAnonymous } from '../bean/event.createUserAnonymous.ts';
+import type { EventSignin } from '../bean/event.signin.ts';
+import type { EventSignout } from '../bean/event.signout.ts';
 export interface IModuleEvent {
-    createUserAnonymous: EventCreateUserAnonymous;
-    signin: EventSignin;
-    signout: EventSignout;
+    'createUserAnonymous': EventCreateUserAnonymous;
+    'signin': EventSignin;
+    'signout': EventSignout;
 }
+/** event: end */
+/** event: begin */
+import type { TypeEventCreateUserAnonymousData, TypeEventCreateUserAnonymousResult } from '../bean/event.createUserAnonymous.ts';
+import type { TypeEventSigninData, TypeEventSigninResult } from '../bean/event.signin.ts';
+import type { TypeEventSignoutData, TypeEventSignoutResult } from '../bean/event.signout.ts';
+import type { EventOn } from 'vona-module-a-event';
 declare module 'vona-module-a-event' {
     interface IEventRecord {
         'a-user:createUserAnonymous': EventOn<TypeEventCreateUserAnonymousData, TypeEventCreateUserAnonymousResult>;
@@ -106,6 +99,7 @@ declare module 'vona-module-a-event' {
 /** event: end */
 /** meta: begin */
 export * from '../bean/meta.printTip.ts';
+import 'vona';
 declare module 'vona' {
     interface IMetaRecord {
         'a-user:printTip': never;
@@ -118,6 +112,10 @@ declare module 'vona-module-a-user' {
 /** meta: end */
 /** config: begin */
 export * from '../config/config.ts';
+import type { config } from '../config/config.ts';
+/** config: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig } from 'vona';
 export declare class ScopeModuleAUser extends BeanScopeBase {
 }
 export interface ScopeModuleAUser {
@@ -125,6 +123,7 @@ export interface ScopeModuleAUser {
     config: TypeModuleConfig<typeof config>;
     event: IModuleEvent;
 }
+import 'vona';
 declare module 'vona' {
     interface IBeanScopeRecord {
         'a-user': ScopeModuleAUser;

package/dist/config/config.d.ts

@@ -1,5 +1,5 @@
 import type { VonaApplication } from 'vona';
-import type { IServiceRecord } from 'vona-module-a-web';
+import type { IServiceRecord } from 'vona-module-a-bean';
 import type { TypeAuthToken } from '../types/auth.ts';
 export declare function config(_app: VonaApplication): {
     passport: {

package/dist/index.js

@@ -1,40 +1,54 @@
 import { BeanInfo, BeanBase, beanFullNameFromOnionName, BeanScopeBase } from 'vona';
-import { Bean, Scope } from 'vona-module-a-bean';
 import { catchError } from '@cabloy/utils';
-import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Guard, Aspect } from 'vona-module-a-aspect';
+import { Bean, Scope } from 'vona-module-a-bean';
+import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Meta } from 'vona-module-a-meta';
 
 var _dec$b, _dec2$b, _class$b;
-let BeanAuthInner = (_dec$b = Bean(), _dec2$b = BeanInfo({
+let GuardPassport = (_dec$b = Guard({
+  global: true,
+  public: false,
+  checkAuthToken: true
+}), _dec2$b = BeanInfo({
   module: "a-user"
-}), _dec$b(_class$b = _dec2$b(_class$b = class BeanAuthInner extends BeanBase {
-  constructor(...args) {
-    super(...args);
-    this._authInnerAdapter = void 0;
-  }
-  get authInnerAdapter() {
-    if (!this._authInnerAdapter) {
-      const beanFullName = beanFullNameFromOnionName(this.scope.config.adapter.authInner, 'service');
-      this._authInnerAdapter = this.bean._getBean(beanFullName);
+}), _dec$b(_class$b = _dec2$b(_class$b = class GuardPassport extends BeanBase {
+  async execute(options, next) {
+    // auth token
+    if (!this.bean.passport.getCurrent()) {
+      if (options.checkAuthToken) {
+        // will return undefined if no accessToken, so not check options.public
+        const [_, err] = await catchError(() => {
+          return this.bean.passport.checkAuthToken();
+        });
+        if (err && !options.public) throw err;
+      }
     }
-    return this._authInnerAdapter;
-  }
-  async findOne(auth) {
-    if (String(auth.id).charAt(0) === '-') return auth;
-    return await this.authInnerAdapter.findOne(auth);
+    // check current
+    if (!this.bean.passport.getCurrent()) {
+      await this.bean.passport.signinWithAnonymous();
+    }
+    if (!options.public && !this.bean.passport.isAuthenticated) {
+      // return false;
+      // 401 for this guard,403 for the next guards
+      return this.app.throw(401);
+    }
+    // check innerAccess
+    if (this.ctx.innerAccess) return true;
+    // next
+    return next();
   }
 }) || _class$b) || _class$b);
 
-let __authAdapter;
-function setAuthAdapter(authAdapter) {
-  __authAdapter = authAdapter;
+let __roleAdapter;
+function setRoleAdapter(roleAdapter) {
+  __roleAdapter = roleAdapter;
 }
-function $getAuthId(user) {
-  return __authAdapter.getAuthId(user);
+function $getRoleId(role) {
+  return __roleAdapter.getRoleId(role);
 }
-function $getAuthIdSystem(_authName, authId) {
-  return authId;
+function $getRoleName(role) {
+  return __roleAdapter.getRoleName(role);
 }
 
 let __userAdapter;
@@ -61,9 +75,81 @@ function $getUserIdSystem(_userName, userId) {
 }
 
 var _dec$a, _dec2$a, _class$a;
-let BeanPassport = (_dec$a = Bean(), _dec2$a = BeanInfo({
+let GuardRoleName = (_dec$a = Guard({
+  passWhenMatched: true
+}), _dec2$a = BeanInfo({
+  module: "a-user"
+}), _dec$a(_class$a = _dec2$a(_class$a = class GuardRoleName extends BeanBase {
+  async execute(options, next) {
+    if (!options.name) return this.app.throw(403);
+    const user = this.bean.passport.getCurrentUser();
+    if (!user || $getUserAnonymous(user)) return this.app.throw(403);
+    const roles = this.bean.passport.getCurrentRoles();
+    if (!roles) return this.app.throw(403);
+    const roleNames = roles?.map(item => $getRoleName(item));
+    const optionsName = Array.isArray(options.name) ? options.name : [options.name];
+    if (!roleNames.some(roleName => optionsName.includes(roleName))) return this.app.throw(403);
+    if (options.passWhenMatched) return true;
+    // next
+    return next();
+  }
+}) || _class$a) || _class$a);
+
+var _dec$9, _dec2$9, _class$9;
+let GuardUserName = (_dec$9 = Guard({
+  passWhenMatched: true
+}), _dec2$9 = BeanInfo({
+  module: "a-user"
+}), _dec$9(_class$9 = _dec2$9(_class$9 = class GuardUserName extends BeanBase {
+  async execute(options, next) {
+    if (!options.name) return this.app.throw(403);
+    const user = this.bean.passport.getCurrentUser();
+    if (!user || $getUserAnonymous(user)) return this.app.throw(403);
+    const userName = $getUserName(user);
+    const optionsName = Array.isArray(options.name) ? options.name : [options.name];
+    if (!optionsName.includes(userName)) return this.app.throw(403);
+    if (options.passWhenMatched) return true;
+    // next
+    return next();
+  }
+}) || _class$9) || _class$9);
+
+var _dec$8, _dec2$8, _class$8;
+let BeanAuthInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
+  module: "a-user"
+}), _dec$8(_class$8 = _dec2$8(_class$8 = class BeanAuthInner extends BeanBase {
+  constructor(...args) {
+    super(...args);
+    this._authInnerAdapter = void 0;
+  }
+  get authInnerAdapter() {
+    if (!this._authInnerAdapter) {
+      const beanFullName = beanFullNameFromOnionName(this.scope.config.adapter.authInner, 'service');
+      this._authInnerAdapter = this.bean._getBean(beanFullName);
+    }
+    return this._authInnerAdapter;
+  }
+  async findOne(auth) {
+    if (String(auth.id).charAt(0) === '-') return auth;
+    return await this.authInnerAdapter.findOne(auth);
+  }
+}) || _class$8) || _class$8);
+
+let __authAdapter;
+function setAuthAdapter(authAdapter) {
+  __authAdapter = authAdapter;
+}
+function $getAuthId(user) {
+  return __authAdapter.getAuthId(user);
+}
+function $getAuthIdSystem(_authName, authId) {
+  return authId;
+}
+
+var _dec$7, _dec2$7, _class$7;
+let BeanPassport = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
   module: "a-user"
-}), _dec$a(_class$a = _dec2$a(_class$a = class BeanPassport extends BeanBase {
+}), _dec$7(_class$7 = _dec2$7(_class$7 = class BeanPassport extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authTokenAdapter = void 0;
@@ -254,12 +340,12 @@ let BeanPassport = (_dec$a = Bean(), _dec2$a = BeanInfo({
       return payloadData2;
     }
   }
-}) || _class$a) || _class$a);
+}) || _class$7) || _class$7);
 
-var _dec$9, _dec2$9, _class$9;
-let BeanRoleInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
+var _dec$6, _dec2$6, _class$6;
+let BeanRoleInner = (_dec$6 = Bean(), _dec2$6 = BeanInfo({
   module: "a-user"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanRoleInner extends BeanBase {
+}), _dec$6(_class$6 = _dec2$6(_class$6 = class BeanRoleInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._roleInnerAdapter = void 0;
@@ -280,12 +366,12 @@ let BeanRoleInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   findAllByUserId(userId) {
     return this.roleInnerAdapter.findAllByUserId(userId);
   }
-}) || _class$9) || _class$9);
+}) || _class$6) || _class$6);
 
-var _dec$8, _dec2$8, _class$8;
-let BeanUserInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
+var _dec$5, _dec2$5, _class$5;
+let BeanUserInner = (_dec$5 = Bean(), _dec2$5 = BeanInfo({
   module: "a-user"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = class BeanUserInner extends BeanBase {
+}), _dec$5(_class$5 = _dec2$5(_class$5 = class BeanUserInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._userInnerAdapter = void 0;
@@ -315,108 +401,22 @@ let BeanUserInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
   remove(user) {
     return this.userInnerAdapter.remove(user);
   }
-}) || _class$8) || _class$8);
-
-var _dec$7, _dec2$7, _class$7;
-let EventCreateUserAnonymous = (_dec$7 = Event(), _dec2$7 = BeanInfo({
-  module: "a-user"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class EventCreateUserAnonymous extends BeanEventBase {}) || _class$7) || _class$7);
-
-var _dec$6, _dec2$6, _class$6;
-let EventSignin = (_dec$6 = Event(), _dec2$6 = BeanInfo({
-  module: "a-user"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class EventSignin extends BeanEventBase {}) || _class$6) || _class$6);
-
-var _dec$5, _dec2$5, _class$5;
-let EventSignout = (_dec$5 = Event(), _dec2$5 = BeanInfo({
-  module: "a-user"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventSignout extends BeanEventBase {}) || _class$5) || _class$5);
+}) || _class$5) || _class$5);
 
 var _dec$4, _dec2$4, _class$4;
-let GuardPassport = (_dec$4 = Guard({
-  global: true,
-  public: false,
-  checkAuthToken: true
-}), _dec2$4 = BeanInfo({
+let EventCreateUserAnonymous = (_dec$4 = Event(), _dec2$4 = BeanInfo({
   module: "a-user"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class GuardPassport extends BeanBase {
-  async execute(options, next) {
-    // auth token
-    if (!this.bean.passport.getCurrent()) {
-      if (options.checkAuthToken) {
-        // will return undefined if no accessToken, so not check options.public
-        const [_, err] = await catchError(() => {
-          return this.bean.passport.checkAuthToken();
-        });
-        if (err && !options.public) throw err;
-      }
-    }
-    // check current
-    if (!this.bean.passport.getCurrent()) {
-      await this.bean.passport.signinWithAnonymous();
-    }
-    if (!options.public && !this.bean.passport.isAuthenticated) {
-      // return false;
-      // 401 for this guard,403 for the next guards
-      return this.app.throw(401);
-    }
-    // check innerAccess
-    if (this.ctx.innerAccess) return true;
-    // next
-    return next();
-  }
-}) || _class$4) || _class$4);
-
-let __roleAdapter;
-function setRoleAdapter(roleAdapter) {
-  __roleAdapter = roleAdapter;
-}
-function $getRoleId(role) {
-  return __roleAdapter.getRoleId(role);
-}
-function $getRoleName(role) {
-  return __roleAdapter.getRoleName(role);
-}
+}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventCreateUserAnonymous extends BeanEventBase {}) || _class$4) || _class$4);
 
 var _dec$3, _dec2$3, _class$3;
-let GuardRoleName = (_dec$3 = Guard({
-  passWhenMatched: true
-}), _dec2$3 = BeanInfo({
+let EventSignin = (_dec$3 = Event(), _dec2$3 = BeanInfo({
   module: "a-user"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class GuardRoleName extends BeanBase {
-  async execute(options, next) {
-    if (!options.name) return this.app.throw(403);
-    const user = this.bean.passport.getCurrentUser();
-    if (!user || $getUserAnonymous(user)) return this.app.throw(403);
-    const roles = this.bean.passport.getCurrentRoles();
-    if (!roles) return this.app.throw(403);
-    const roleNames = roles?.map(item => $getRoleName(item));
-    const optionsName = Array.isArray(options.name) ? options.name : [options.name];
-    if (!roleNames.some(roleName => optionsName.includes(roleName))) return this.app.throw(403);
-    if (options.passWhenMatched) return true;
-    // next
-    return next();
-  }
-}) || _class$3) || _class$3);
+}), _dec$3(_class$3 = _dec2$3(_class$3 = class EventSignin extends BeanEventBase {}) || _class$3) || _class$3);
 
 var _dec$2, _dec2$2, _class$2;
-let GuardUserName = (_dec$2 = Guard({
-  passWhenMatched: true
-}), _dec2$2 = BeanInfo({
+let EventSignout = (_dec$2 = Event(), _dec2$2 = BeanInfo({
   module: "a-user"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class GuardUserName extends BeanBase {
-  async execute(options, next) {
-    if (!options.name) return this.app.throw(403);
-    const user = this.bean.passport.getCurrentUser();
-    if (!user || $getUserAnonymous(user)) return this.app.throw(403);
-    const userName = $getUserName(user);
-    const optionsName = Array.isArray(options.name) ? options.name : [options.name];
-    if (!optionsName.includes(userName)) return this.app.throw(403);
-    if (options.passWhenMatched) return true;
-    // next
-    return next();
-  }
-}) || _class$2) || _class$2);
+}), _dec$2(_class$2 = _dec2$2(_class$2 = class EventSignout extends BeanEventBase {}) || _class$2) || _class$2);
 
 var _dec$1, _dec2$1, _class$1;
 let MetaPrintTip = (_dec$1 = Meta(), _dec2$1 = BeanInfo({

package/package.json

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