vona-module-a-user 5.0.22 → 5.0.23

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

@@ -115,6 +115,7 @@ declare module 'vona' {
 /** event: begin */
 export * from '../bean/event.activate.ts';
 export * from '../bean/event.createUserAnonymous.ts';
+export * from '../bean/event.register.ts';
 export * from '../bean/event.signin.ts';
 export * from '../bean/event.signout.ts';
 import 'vona';
@@ -133,6 +134,12 @@ declare module 'vona-module-a-user' {
         get $beanFullName(): 'a-user.event.createUserAnonymous';
         get $onionName(): 'a-user:createUserAnonymous';
     }
+    interface EventRegister {
+    }
+    interface EventRegister {
+        get $beanFullName(): 'a-user.event.register';
+        get $onionName(): 'a-user:register';
+    }
     interface EventSignin {
     }
     interface EventSignin {
@@ -150,11 +157,13 @@ declare module 'vona-module-a-user' {
 /** event: begin */
 import type { EventActivate } from '../bean/event.activate.ts';
 import type { EventCreateUserAnonymous } from '../bean/event.createUserAnonymous.ts';
+import type { EventRegister } from '../bean/event.register.ts';
 import type { EventSignin } from '../bean/event.signin.ts';
 import type { EventSignout } from '../bean/event.signout.ts';
 export interface IModuleEvent {
     'activate': EventActivate;
     'createUserAnonymous': EventCreateUserAnonymous;
+    'register': EventRegister;
     'signin': EventSignin;
     'signout': EventSignout;
 }
@@ -162,6 +171,7 @@ export interface IModuleEvent {
 /** event: begin */
 import type { TypeEventActivateData, TypeEventActivateResult } from '../bean/event.activate.ts';
 import type { TypeEventCreateUserAnonymousData, TypeEventCreateUserAnonymousResult } from '../bean/event.createUserAnonymous.ts';
+import type { TypeEventRegisterData, TypeEventRegisterResult } from '../bean/event.register.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';
@@ -169,6 +179,7 @@ declare module 'vona-module-a-event' {
     interface IEventRecord {
         'a-user:activate': EventOn<TypeEventActivateData, TypeEventActivateResult>;
         'a-user:createUserAnonymous': EventOn<TypeEventCreateUserAnonymousData, TypeEventCreateUserAnonymousResult>;
+        'a-user:register': EventOn<TypeEventRegisterData, TypeEventRegisterResult>;
         'a-user:signin': EventOn<TypeEventSigninData, TypeEventSigninResult>;
         'a-user:signout': EventOn<TypeEventSignoutData, TypeEventSignoutResult>;
     }

package/dist/bean/bean.userInner.d.ts

@@ -5,7 +5,7 @@ export declare class BeanUserInner extends BeanBase {
     private _userInnerAdapter;
     private get userInnerAdapter();
     activate(user: IUserBase): Promise<void>;
-    register(user: Partial<IUserBase>, autoActivate?: boolean): Promise<IUserBase>;
+    register(user: Partial<IUserBase>, confirmed?: boolean): Promise<IUserBase>;
     registerByProfile(profile: IAuthUserProfile): Promise<IUserBase>;
     createAnonymous(): Promise<IUserBase>;
     findOneByName(name: string): Promise<IUserBase | undefined>;

package/dist/bean/event.register.d.ts

@@ -0,0 +1,10 @@
+import type { IUserBase } from '../types/user.ts';
+import { BeanEventBase } from 'vona-module-a-event';
+export interface TypeEventRegisterData {
+    user: Partial<IUserBase>;
+    confirmed?: boolean;
+    autoActivate?: boolean;
+}
+export type TypeEventRegisterResult = Partial<IUserBase>;
+export declare class EventRegister extends BeanEventBase<TypeEventRegisterData, TypeEventRegisterResult> {
+}

package/dist/index.js

@@ -5,15 +5,15 @@ import { Bean, Service, Scope } from 'vona-module-a-bean';
 import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Meta } from 'vona-module-a-meta';
 
-var _dec$e, _dec2$e, _class$e;
-let GuardPassport = (_dec$e = Guard({
+var _dec$f, _dec2$f, _class$f;
+let GuardPassport = (_dec$f = Guard({
   global: true,
   public: false,
   activated: true,
   checkAuthToken: true
-}), _dec2$e = BeanInfo({
+}), _dec2$f = BeanInfo({
   module: "a-user"
-}), _dec$e(_class$e = _dec2$e(_class$e = class GuardPassport extends BeanBase {
+}), _dec$f(_class$f = _dec2$f(_class$f = class GuardPassport extends BeanBase {
   async execute(options, next) {
     // auth token
     if (!this.bean.passport.getCurrent()) {
@@ -47,7 +47,7 @@ let GuardPassport = (_dec$e = Guard({
     // next
     return next();
   }
-}) || _class$e) || _class$e);
+}) || _class$f) || _class$f);
 
 let __roleAdapter;
 function setRoleAdapter(roleAdapter) {
@@ -92,12 +92,12 @@ function $getUserIdSystem(_userName, userId) {
   return userId;
 }
 
-var _dec$d, _dec2$d, _class$d;
-let GuardRoleName = (_dec$d = Guard({
+var _dec$e, _dec2$e, _class$e;
+let GuardRoleName = (_dec$e = Guard({
   passWhenMatched: true
-}), _dec2$d = BeanInfo({
+}), _dec2$e = BeanInfo({
   module: "a-user"
-}), _dec$d(_class$d = _dec2$d(_class$d = class GuardRoleName extends BeanBase {
+}), _dec$e(_class$e = _dec2$e(_class$e = class GuardRoleName extends BeanBase {
   async execute(options, next) {
     if (!options.name) return this.app.throw(403);
     const user = this.bean.passport.getCurrentUser();
@@ -111,14 +111,14 @@ let GuardRoleName = (_dec$d = Guard({
     // next
     return next();
   }
-}) || _class$d) || _class$d);
+}) || _class$e) || _class$e);
 
-var _dec$c, _dec2$c, _class$c;
-let GuardUserName = (_dec$c = Guard({
+var _dec$d, _dec2$d, _class$d;
+let GuardUserName = (_dec$d = Guard({
   passWhenMatched: true
-}), _dec2$c = BeanInfo({
+}), _dec2$d = BeanInfo({
   module: "a-user"
-}), _dec$c(_class$c = _dec2$c(_class$c = class GuardUserName extends BeanBase {
+}), _dec$d(_class$d = _dec2$d(_class$d = class GuardUserName extends BeanBase {
   async execute(options, next) {
     if (!options.name) return this.app.throw(403);
     const user = this.bean.passport.getCurrentUser();
@@ -130,12 +130,12 @@ let GuardUserName = (_dec$c = Guard({
     // next
     return next();
   }
-}) || _class$c) || _class$c);
+}) || _class$d) || _class$d);
 
-var _dec$b, _dec2$b, _class$b;
-let BeanAuthInner = (_dec$b = Bean(), _dec2$b = BeanInfo({
+var _dec$c, _dec2$c, _class$c;
+let BeanAuthInner = (_dec$c = Bean(), _dec2$c = BeanInfo({
   module: "a-user"
-}), _dec$b(_class$b = _dec2$b(_class$b = class BeanAuthInner extends BeanBase {
+}), _dec$c(_class$c = _dec2$c(_class$c = class BeanAuthInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authInnerAdapter = void 0;
@@ -151,7 +151,7 @@ let BeanAuthInner = (_dec$b = Bean(), _dec2$b = BeanInfo({
     if (String(auth.id).charAt(0) === '-') return auth;
     return await this.authInnerAdapter.findOne(auth);
   }
-}) || _class$b) || _class$b);
+}) || _class$c) || _class$c);
 
 let __authAdapter;
 function setAuthAdapter(authAdapter) {
@@ -164,10 +164,10 @@ function $getAuthIdSystem(_authName, authId) {
   return authId;
 }
 
-var _dec$a, _dec2$a, _class$a;
-let BeanPassport = (_dec$a = Bean(), _dec2$a = BeanInfo({
+var _dec$b, _dec2$b, _class$b;
+let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
   module: "a-user"
-}), _dec$a(_class$a = _dec2$a(_class$a = class BeanPassport extends BeanBase {
+}), _dec$b(_class$b = _dec2$b(_class$b = class BeanPassport extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authTokenAdapter = void 0;
@@ -373,12 +373,12 @@ let BeanPassport = (_dec$a = Bean(), _dec2$a = BeanInfo({
       return payloadData2;
     }
   }
-}) || _class$a) || _class$a);
+}) || _class$b) || _class$b);
 
-var _dec$9, _dec2$9, _class$9;
-let BeanRoleInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
+var _dec$a, _dec2$a, _class$a;
+let BeanRoleInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
   module: "a-user"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanRoleInner extends BeanBase {
+}), _dec$a(_class$a = _dec2$a(_class$a = class BeanRoleInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._roleInnerAdapter = void 0;
@@ -399,12 +399,12 @@ let BeanRoleInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   findAllByUserId(userId) {
     return this.roleInnerAdapter.findAllByUserId(userId);
   }
-}) || _class$9) || _class$9);
+}) || _class$a) || _class$a);
 
-var _dec$8, _dec2$8, _class$8;
-let BeanUserInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
+var _dec$9, _dec2$9, _class$9;
+let BeanUserInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   module: "a-user"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = class BeanUserInner extends BeanBase {
+}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanUserInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._userInnerAdapter = void 0;
@@ -417,18 +417,26 @@ let BeanUserInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
     return this._userInnerAdapter;
   }
   async activate(user) {
-    await this.scope.event.activate.emit(user, async () => {
+    await this.scope.event.activate.emit(user, async user => {
       await this.userInnerAdapter.setActivated(user.id, true);
     });
   }
-  async register(user, autoActivate) {
-    // config.user.autoActivate > autoActivate
-    autoActivate = this.scope.config.user.autoActivate ? true : autoActivate;
-    const userNew = await this.userInnerAdapter.create(user);
-    if (autoActivate) {
-      await this.activate(userNew);
-    }
-    return userNew;
+  async register(user, confirmed) {
+    // config.user.autoActivate > confirmed
+    const autoActivate = this.scope.config.user.autoActivate ? true : confirmed;
+    const data = {
+      user,
+      confirmed,
+      autoActivate
+    };
+    return await this.scope.event.register.emit(data, async data => {
+      // user
+      const userNew = await this.userInnerAdapter.create(data.user);
+      if (data.autoActivate) {
+        await this.activate(userNew);
+      }
+      return userNew;
+    });
   }
   async registerByProfile(profile) {
     const user = await this.userInnerAdapter.userOfProfile(profile);
@@ -449,12 +457,12 @@ let BeanUserInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
   remove(user) {
     return this.userInnerAdapter.remove(user);
   }
-}) || _class$8) || _class$8);
+}) || _class$9) || _class$9);
 
-var _dec$7, _dec2$7, _class$7;
-let ServiceAuthTokenAdapter = (_dec$7 = Service(), _dec2$7 = BeanInfo({
+var _dec$8, _dec2$8, _class$8;
+let ServiceAuthTokenAdapter = (_dec$8 = Service(), _dec2$8 = BeanInfo({
   module: "a-user"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class ServiceAuthTokenAdapter extends BeanBase {
+}), _dec$8(_class$8 = _dec2$8(_class$8 = class ServiceAuthTokenAdapter extends BeanBase {
   async create(payloadData) {
     const authIdStr = this._getAuthId(payloadData)?.toString();
     const token = authIdStr === '-1' ? createHash(authIdStr) : uuidv4();
@@ -482,12 +490,12 @@ let ServiceAuthTokenAdapter = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   _getAuthId(payloadData) {
     return payloadData[this.scope.config.payloadData.fields.authId];
   }
-}) || _class$7) || _class$7);
+}) || _class$8) || _class$8);
 
-var _dec$6, _dec2$6, _class$6;
-let ServiceRedisToken = (_dec$6 = Service(), _dec2$6 = BeanInfo({
+var _dec$7, _dec2$7, _class$7;
+let ServiceRedisToken = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   module: "a-user"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class ServiceRedisToken extends BeanBase {
+}), _dec$7(_class$7 = _dec2$7(_class$7 = class ServiceRedisToken extends BeanBase {
   get redisAuth() {
     return this.bean.redis.get('auth');
   }
@@ -547,17 +555,22 @@ let ServiceRedisToken = (_dec$6 = Service(), _dec2$6 = BeanInfo({
   _getUserId(payloadData) {
     return payloadData[this.scope.config.payloadData.fields.userId];
   }
-}) || _class$6) || _class$6);
+}) || _class$7) || _class$7);
+
+var _dec$6, _dec2$6, _class$6;
+let EventActivate = (_dec$6 = Event(), _dec2$6 = BeanInfo({
+  module: "a-user"
+}), _dec$6(_class$6 = _dec2$6(_class$6 = class EventActivate extends BeanEventBase {}) || _class$6) || _class$6);
 
 var _dec$5, _dec2$5, _class$5;
-let EventActivate = (_dec$5 = Event(), _dec2$5 = BeanInfo({
+let EventCreateUserAnonymous = (_dec$5 = Event(), _dec2$5 = BeanInfo({
   module: "a-user"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventActivate extends BeanEventBase {}) || _class$5) || _class$5);
+}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventCreateUserAnonymous extends BeanEventBase {}) || _class$5) || _class$5);
 
 var _dec$4, _dec2$4, _class$4;
-let EventCreateUserAnonymous = (_dec$4 = Event(), _dec2$4 = BeanInfo({
+let EventRegister = (_dec$4 = Event(), _dec2$4 = BeanInfo({
   module: "a-user"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventCreateUserAnonymous extends BeanEventBase {}) || _class$4) || _class$4);
+}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventRegister extends BeanEventBase {}) || _class$4) || _class$4);
 
 var _dec$3, _dec2$3, _class$3;
 let EventSignin = (_dec$3 = Event(), _dec2$3 = BeanInfo({
@@ -655,4 +668,4 @@ const Passport = {
   admin: Admin
 };
 
-export { $getAuthId, $getAuthIdSystem, $getRoleId, $getRoleName, $getUserActivated, $getUserAnonymous, $getUserAvatar, $getUserEmail, $getUserId, $getUserIdSystem, $getUserLocale, $getUserMobile, $getUserName, BeanAuthInner, BeanPassport, BeanRoleInner, BeanUserInner, EventActivate, EventCreateUserAnonymous, EventSignin, EventSignout, GuardPassport, GuardRoleName, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, ServiceAuthTokenAdapter, ServiceRedisToken, config, setAuthAdapter, setRoleAdapter, setUserAdapter };
+export { $getAuthId, $getAuthIdSystem, $getRoleId, $getRoleName, $getUserActivated, $getUserAnonymous, $getUserAvatar, $getUserEmail, $getUserId, $getUserIdSystem, $getUserLocale, $getUserMobile, $getUserName, BeanAuthInner, BeanPassport, BeanRoleInner, BeanUserInner, EventActivate, EventCreateUserAnonymous, EventRegister, EventSignin, EventSignout, GuardPassport, GuardRoleName, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, ServiceAuthTokenAdapter, ServiceRedisToken, config, setAuthAdapter, setRoleAdapter, setUserAdapter };

package/dist/types/authProfile.d.ts

@@ -1,3 +1,4 @@
+import type { ILocaleInfos } from 'vona';
 export interface IAuthUserProfilePropSlice {
     value: string;
 }
@@ -15,5 +16,6 @@ export interface IAuthUserProfile {
     profileUrl?: string;
     emails?: IAuthUserProfilePropSlice[];
     photos?: IAuthUserProfilePropSlice[];
+    locale?: keyof ILocaleInfos;
     confirmed?: boolean;
 }

package/package.json

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