vona-module-a-user 5.0.47 → 5.0.49

package/dist/index.js

@@ -1,4 +1,5 @@
-import { BeanInfo, BeanBase, beanFullNameFromOnionName, createHash, uuidv4, BeanSimple, BeanScopeBase } from 'vona';
+import { Global, BeanInfo, BeanBase, beanFullNameFromOnionName, createHash, uuidv4, BeanSimple, BeanScopeBase } from 'vona';
+import { __decorate } from 'tslib';
 import { catchError, isNil } from '@cabloy/utils';
 import { Guard, Aspect } from 'vona-module-a-aspect';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
@@ -6,15 +7,7 @@ import { CacheRedis, BeanCacheRedisBase } from 'vona-module-a-cache';
 import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Meta } from 'vona-module-a-meta';
 
-var _dec$g, _dec2$g, _class$g;
-let GuardPassport = (_dec$g = Guard({
-  global: true,
-  public: false,
-  activated: true,
-  checkAuthToken: true
-}), _dec2$g = BeanInfo({
-  module: "a-user"
-}), _dec$g(_class$g = _dec2$g(_class$g = class GuardPassport extends BeanBase {
+let GuardPassport = class GuardPassport extends BeanBase {
   async execute(options, next) {
     // auth token
     if (!this.bean.passport.current) {
@@ -48,15 +41,16 @@ let GuardPassport = (_dec$g = Guard({
     // next
     return next();
   }
-}) || _class$g) || _class$g);
-
-var _dec$f, _dec2$f, _class$f;
-let GuardRoleName = (_dec$f = Guard({
-  passWhenMatched: true,
-  rejectWhenDismatched: true
-}), _dec2$f = BeanInfo({
+};
+GuardPassport = __decorate([Guard({
+  public: false,
+  activated: true,
+  checkAuthToken: true
+}), Global(), BeanInfo({
   module: "a-user"
-}), _dec$f(_class$f = _dec2$f(_class$f = class GuardRoleName extends BeanBase {
+})], GuardPassport);
+
+let GuardRoleName = class GuardRoleName extends BeanBase {
   async execute(options, next) {
     const result = await this._check(options);
     if (!result) {
@@ -78,15 +72,15 @@ let GuardRoleName = (_dec$f = Guard({
     if (!roleNames.some(roleName => optionsName.includes(roleName))) return false;
     return true;
   }
-}) || _class$f) || _class$f);
-
-var _dec$e, _dec2$e, _class$e;
-let GuardUserName = (_dec$e = Guard({
+};
+GuardRoleName = __decorate([Guard({
   passWhenMatched: true,
   rejectWhenDismatched: true
-}), _dec2$e = BeanInfo({
+}), BeanInfo({
   module: "a-user"
-}), _dec$e(_class$e = _dec2$e(_class$e = class GuardUserName extends BeanBase {
+})], GuardRoleName);
+
+let GuardUserName = class GuardUserName extends BeanBase {
   async execute(options, next) {
     const result = await this._check(options);
     if (!result) {
@@ -106,16 +100,19 @@ let GuardUserName = (_dec$e = Guard({
     if (!optionsName.includes(userName)) return false;
     return true;
   }
-}) || _class$e) || _class$e);
+};
+GuardUserName = __decorate([Guard({
+  passWhenMatched: true,
+  rejectWhenDismatched: true
+}), BeanInfo({
+  module: "a-user"
+})], GuardUserName);
 
 function $getAuthIdSystem(_authName, authId) {
   return authId;
 }
 
-var _dec$d, _dec2$d, _class$d;
-let BeanPassport = (_dec$d = Bean(), _dec2$d = BeanInfo({
-  module: "a-user"
-}), _dec$d(_class$d = _dec2$d(_class$d = class BeanPassport extends BeanBase {
+let BeanPassport = class BeanPassport extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authTokenAdapter = void 0;
@@ -195,9 +192,11 @@ let BeanPassport = (_dec$d = Bean(), _dec2$d = BeanInfo({
     const auth = {
       id: $getAuthIdSystem(authName, authId)
     };
+    const roles = await this.bean.role.findAllByUserId(user.id);
     const passport = {
       user,
-      auth
+      auth,
+      roles
     };
     return await this.signin(passport, options);
   }
@@ -247,7 +246,6 @@ let BeanPassport = (_dec$d = Bean(), _dec2$d = BeanInfo({
     // jwt token
     return await this.bean.jwt.create(payloadData);
   }
-
   // only created by accessToken
   async createTempAuthToken(options) {
     // current
@@ -317,12 +315,12 @@ let BeanPassport = (_dec$d = Bean(), _dec2$d = BeanInfo({
       return payloadData2;
     }
   }
-}) || _class$d) || _class$d);
-
-var _dec$c, _dec2$c, _class$c;
-let BeanRole = (_dec$c = Bean(), _dec2$c = BeanInfo({
+};
+BeanPassport = __decorate([Bean(), BeanInfo({
   module: "a-user"
-}), _dec$c(_class$c = _dec2$c(_class$c = class BeanRole extends BeanBase {
+})], BeanPassport);
+
+let BeanRole = class BeanRole extends BeanBase {
   constructor(...args) {
     super(...args);
     this._roleAdapter = void 0;
@@ -348,12 +346,12 @@ let BeanRole = (_dec$c = Bean(), _dec2$c = BeanInfo({
   findAllByUserId(userId) {
     return this.roleAdapter.findAllByUserId(userId);
   }
-}) || _class$c) || _class$c);
-
-var _dec$b, _dec2$b, _class$b;
-let BeanUser = (_dec$b = Bean(), _dec2$b = BeanInfo({
+};
+BeanRole = __decorate([Bean(), BeanInfo({
   module: "a-user"
-}), _dec$b(_class$b = _dec2$b(_class$b = class BeanUser extends BeanBase {
+})], BeanRole);
+
+let BeanUser = class BeanUser extends BeanBase {
   constructor(...args) {
     super(...args);
     this._userAdapter = void 0;
@@ -424,12 +422,12 @@ let BeanUser = (_dec$b = Bean(), _dec2$b = BeanInfo({
   async remove(user) {
     return this.userAdapter.remove(user);
   }
-}) || _class$b) || _class$b);
-
-var _dec$a, _dec2$a, _class$a;
-let ServiceAuthTokenAdapter = (_dec$a = Service(), _dec2$a = BeanInfo({
+};
+BeanUser = __decorate([Bean(), BeanInfo({
   module: "a-user"
-}), _dec$a(_class$a = _dec2$a(_class$a = class ServiceAuthTokenAdapter extends BeanBase {
+})], BeanUser);
+
+let ServiceAuthTokenAdapter = class ServiceAuthTokenAdapter extends BeanBase {
   async create(payloadData) {
     const authIdStr = this._getAuthId(payloadData)?.toString();
     const token = authIdStr === '-1' ? createHash(authIdStr) : uuidv4();
@@ -457,12 +455,12 @@ let ServiceAuthTokenAdapter = (_dec$a = Service(), _dec2$a = BeanInfo({
   _getAuthId(payloadData) {
     return payloadData[this.scope.config.payloadData.fields.authId];
   }
-}) || _class$a) || _class$a);
-
-var _dec$9, _dec2$9, _class$9;
-let ServiceRedisToken = (_dec$9 = Service(), _dec2$9 = BeanInfo({
+};
+ServiceAuthTokenAdapter = __decorate([Service(), BeanInfo({
   module: "a-user"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class ServiceRedisToken extends BeanBase {
+})], ServiceAuthTokenAdapter);
+
+let ServiceRedisToken = class ServiceRedisToken extends BeanBase {
   async verify(payloadData) {
     const payloadData2 = await this.retrieve(payloadData);
     if (!payloadData2) return false;
@@ -515,45 +513,45 @@ let ServiceRedisToken = (_dec$9 = Service(), _dec2$9 = BeanInfo({
   _getUserId(payloadData) {
     return payloadData[this.scope.config.payloadData.fields.userId];
   }
-}) || _class$9) || _class$9);
+};
+ServiceRedisToken = __decorate([Service(), BeanInfo({
+  module: "a-user"
+})], ServiceRedisToken);
 
-var _dec$8, _dec2$8, _class$8;
-let CacheRedisAuthToken = (_dec$8 = CacheRedis({
+let CacheRedisAuthToken = class CacheRedisAuthToken extends BeanCacheRedisBase {};
+CacheRedisAuthToken = __decorate([CacheRedis({
   ttl: 30 * 24 * 60 * 60 * 1000,
   disableTransactionCompensate: true
-}), _dec2$8 = BeanInfo({
+}), BeanInfo({
   module: "a-user"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = class CacheRedisAuthToken extends BeanCacheRedisBase {}) || _class$8) || _class$8);
+})], CacheRedisAuthToken);
 
-var _dec$7, _dec2$7, _class$7;
-let EventActivate = (_dec$7 = Event(), _dec2$7 = BeanInfo({
+let EventActivate = class EventActivate extends BeanEventBase {};
+EventActivate = __decorate([Event(), BeanInfo({
   module: "a-user"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class EventActivate extends BeanEventBase {}) || _class$7) || _class$7);
+})], EventActivate);
 
-var _dec$6, _dec2$6, _class$6;
-let EventCreateAnonymous = (_dec$6 = Event(), _dec2$6 = BeanInfo({
+let EventCreateAnonymous = class EventCreateAnonymous extends BeanEventBase {};
+EventCreateAnonymous = __decorate([Event(), BeanInfo({
   module: "a-user"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class EventCreateAnonymous extends BeanEventBase {}) || _class$6) || _class$6);
+})], EventCreateAnonymous);
 
-var _dec$5, _dec2$5, _class$5;
-let EventRegister = (_dec$5 = Event(), _dec2$5 = BeanInfo({
+let EventRegister = class EventRegister extends BeanEventBase {};
+EventRegister = __decorate([Event(), BeanInfo({
   module: "a-user"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventRegister extends BeanEventBase {}) || _class$5) || _class$5);
+})], EventRegister);
 
-var _dec$4, _dec2$4, _class$4;
-let EventSignin = (_dec$4 = Event(), _dec2$4 = BeanInfo({
+let EventSignin = class EventSignin extends BeanEventBase {};
+EventSignin = __decorate([Event(), BeanInfo({
   module: "a-user"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventSignin extends BeanEventBase {}) || _class$4) || _class$4);
+})], EventSignin);
 
-var _dec$3, _dec2$3, _class$3;
-let EventSignout = (_dec$3 = Event(), _dec2$3 = BeanInfo({
+let EventSignout = class EventSignout extends BeanEventBase {};
+EventSignout = __decorate([Event(), BeanInfo({
   module: "a-user"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class EventSignout extends BeanEventBase {}) || _class$3) || _class$3);
+})], EventSignout);
 
-var _dec$2, _dec2$2, _class$2;
-let MetaPrintTip = (_dec$2 = Meta(), _dec2$2 = BeanInfo({
-  module: "a-user"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class MetaPrintTip extends BeanBase {
+let MetaPrintTip = class MetaPrintTip extends BeanBase {
   async execute() {
     if (!this.app.meta.isDev) return;
     // signin
@@ -564,12 +562,12 @@ let MetaPrintTip = (_dec$2 = Meta(), _dec2$2 = BeanInfo({
       message: `Bearer ${accessToken}`
     };
   }
-}) || _class$2) || _class$2);
-
-var _dec$1, _dec2$1, _class$1;
-let MetaRuntime = (_dec$1 = Meta(), _dec2$1 = BeanInfo({
+};
+MetaPrintTip = __decorate([Meta(), BeanInfo({
   module: "a-user"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class MetaRuntime extends BeanBase {
+})], MetaPrintTip);
+
+let MetaRuntime = class MetaRuntime extends BeanBase {
   async execute() {
     if (this.app.meta.isProd) return;
     // signin
@@ -579,7 +577,10 @@ let MetaRuntime = (_dec$1 = Meta(), _dec2$1 = BeanInfo({
       accessToken
     };
   }
-}) || _class$1) || _class$1);
+};
+MetaRuntime = __decorate([Meta(), BeanInfo({
+  module: "a-user"
+})], MetaRuntime);
 
 function config(_app) {
   return {
@@ -626,11 +627,10 @@ class Main extends BeanSimple {
   async configLoaded(_config) {}
 }
 
-var _dec, _dec2, _class;
-let ScopeModuleAUser = (_dec = Scope(), _dec2 = BeanInfo({
+let ScopeModuleAUser = class ScopeModuleAUser extends BeanScopeBase {};
+ScopeModuleAUser = __decorate([Scope(), BeanInfo({
   module: "a-user"
-}), _dec(_class = _dec2(_class = class ScopeModuleAUser extends BeanScopeBase {}) || _class) || _class);
-
+})], ScopeModuleAUser);
 /** scope: end */
 
 function Public(_public = true) {
@@ -638,7 +638,6 @@ function Public(_public = true) {
     public: _public
   });
 }
-
 // true/false/undefined
 function Activated(activated) {
   return Aspect.guardGlobal('a-user:passport', {

package/package.json

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