vona-module-a-user 5.0.21 → 5.0.23

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

@@ -113,19 +113,33 @@ declare module 'vona' {
 }
 /** service: end */
 /** 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';
 declare module 'vona' {
 }
 declare module 'vona-module-a-user' {
+    interface EventActivate {
+    }
+    interface EventActivate {
+        get $beanFullName(): 'a-user.event.activate';
+        get $onionName(): 'a-user:activate';
+    }
     interface EventCreateUserAnonymous {
     }
     interface EventCreateUserAnonymous {
         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 {
@@ -141,23 +155,31 @@ declare module 'vona-module-a-user' {
 }
 /** event: end */
 /** 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;
 }
 /** event: end */
 /** 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';
 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.passport.d.ts

@@ -11,6 +11,7 @@ export declare class BeanPassport extends BeanBase {
     private get authTokenAdapter();
     private get passportAdapter();
     get isAuthenticated(): boolean;
+    get isActivated(): boolean;
     isAdmin(): Promise<boolean>;
     setCurrent(passport: IPassportBase | undefined): Promise<void>;
     getCurrent(): IPassportBase | undefined;

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

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
 import type { IRoleBase } from '../types/role.ts';
 import { BeanBase } from 'vona';
 export declare class BeanRoleInner extends BeanBase {

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

@@ -4,7 +4,9 @@ import { BeanBase } from 'vona';
 export declare class BeanUserInner extends BeanBase {
     private _userInnerAdapter;
     private get userInnerAdapter();
-    createByProfile(profile: IAuthUserProfile): Promise<IUserBase>;
+    activate(user: IUserBase): Promise<void>;
+    register(user: Partial<IUserBase>, confirmed?: boolean): Promise<IUserBase>;
+    registerByProfile(profile: IAuthUserProfile): Promise<IUserBase>;
     createAnonymous(): Promise<IUserBase>;
     findOneByName(name: string): Promise<IUserBase | undefined>;
     findOne(user: Partial<IUserBase>): Promise<IUserBase | undefined>;

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

@@ -0,0 +1,6 @@
+import type { IUserBase } from '../types/user.ts';
+import { BeanEventBase } from 'vona-module-a-event';
+export type TypeEventActivateData = IUserBase;
+export type TypeEventActivateResult = void;
+export declare class EventActivate extends BeanEventBase<TypeEventActivateData, TypeEventActivateResult> {
+}

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/bean/guard.passport.d.ts

@@ -3,6 +3,7 @@ import type { IDecoratorGuardOptionsGlobal, IGuardExecute } from 'vona-module-a-
 import { BeanBase } from 'vona';
 export interface IGuardOptionsPassport extends IDecoratorGuardOptionsGlobal {
     public: boolean;
+    activated?: boolean;
     checkAuthToken: boolean;
 }
 export declare class GuardPassport extends BeanBase implements IGuardExecute {

package/dist/config/config.d.ts

@@ -2,6 +2,9 @@ import type { VonaApplication } from 'vona';
 import type { IServiceRecord } from 'vona-module-a-bean';
 import type { TypeAuthToken } from '../types/auth.ts';
 export declare function config(_app: VonaApplication): {
+    user: {
+        autoActivate: boolean;
+    };
     passport: {
         refreshAuthToken: TypeAuthToken;
     };

package/dist/index.js

@@ -5,14 +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$d, _dec2$d, _class$d;
-let GuardPassport = (_dec$d = Guard({
+var _dec$f, _dec2$f, _class$f;
+let GuardPassport = (_dec$f = Guard({
   global: true,
   public: false,
+  activated: true,
   checkAuthToken: true
-}), _dec2$d = BeanInfo({
+}), _dec2$f = BeanInfo({
   module: "a-user"
-}), _dec$d(_class$d = _dec2$d(_class$d = 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()) {
@@ -30,15 +31,23 @@ let GuardPassport = (_dec$d = Guard({
     }
     if (!options.public && !this.bean.passport.isAuthenticated) {
       // return false;
-      // 401 for this guard,403 for the next guards
+      // 401 for this guard, 403 for the next guards
       return this.app.throw(401);
     }
+    if (this.bean.passport.isAuthenticated) {
+      if (options.activated === true && !this.bean.passport.isActivated) {
+        return this.app.throw(403);
+      }
+      if (options.activated === false && this.bean.passport.isActivated) {
+        return this.app.throw(403);
+      }
+    }
     // check innerAccess
     if (this.ctx.innerAccess) return true;
     // next
     return next();
   }
-}) || _class$d) || _class$d);
+}) || _class$f) || _class$f);
 
 let __roleAdapter;
 function setRoleAdapter(roleAdapter) {
@@ -64,6 +73,15 @@ function $getUserName(user) {
 function $getUserAvatar(user) {
   return __userAdapter.getUserAvatar(user);
 }
+function $getUserEmail(user) {
+  return __userAdapter.getUserEmail(user);
+}
+function $getUserMobile(user) {
+  return __userAdapter.getUserMobile(user);
+}
+function $getUserActivated(user) {
+  return __userAdapter.getUserActivated(user);
+}
 function $getUserLocale(user) {
   return __userAdapter.getUserLocale(user);
 }
@@ -74,12 +92,12 @@ function $getUserIdSystem(_userName, userId) {
   return userId;
 }
 
-var _dec$c, _dec2$c, _class$c;
-let GuardRoleName = (_dec$c = Guard({
+var _dec$e, _dec2$e, _class$e;
+let GuardRoleName = (_dec$e = Guard({
   passWhenMatched: true
-}), _dec2$c = BeanInfo({
+}), _dec2$e = BeanInfo({
   module: "a-user"
-}), _dec$c(_class$c = _dec2$c(_class$c = 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();
@@ -93,14 +111,14 @@ let GuardRoleName = (_dec$c = Guard({
     // next
     return next();
   }
-}) || _class$c) || _class$c);
+}) || _class$e) || _class$e);
 
-var _dec$b, _dec2$b, _class$b;
-let GuardUserName = (_dec$b = Guard({
+var _dec$d, _dec2$d, _class$d;
+let GuardUserName = (_dec$d = Guard({
   passWhenMatched: true
-}), _dec2$b = BeanInfo({
+}), _dec2$d = BeanInfo({
   module: "a-user"
-}), _dec$b(_class$b = _dec2$b(_class$b = 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();
@@ -112,12 +130,12 @@ let GuardUserName = (_dec$b = Guard({
     // next
     return next();
   }
-}) || _class$b) || _class$b);
+}) || _class$d) || _class$d);
 
-var _dec$a, _dec2$a, _class$a;
-let BeanAuthInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
+var _dec$c, _dec2$c, _class$c;
+let BeanAuthInner = (_dec$c = Bean(), _dec2$c = BeanInfo({
   module: "a-user"
-}), _dec$a(_class$a = _dec2$a(_class$a = class BeanAuthInner extends BeanBase {
+}), _dec$c(_class$c = _dec2$c(_class$c = class BeanAuthInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authInnerAdapter = void 0;
@@ -133,7 +151,7 @@ let BeanAuthInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
     if (String(auth.id).charAt(0) === '-') return auth;
     return await this.authInnerAdapter.findOne(auth);
   }
-}) || _class$a) || _class$a);
+}) || _class$c) || _class$c);
 
 let __authAdapter;
 function setAuthAdapter(authAdapter) {
@@ -146,10 +164,10 @@ function $getAuthIdSystem(_authName, authId) {
   return authId;
 }
 
-var _dec$9, _dec2$9, _class$9;
-let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
+var _dec$b, _dec2$b, _class$b;
+let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
   module: "a-user"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanPassport extends BeanBase {
+}), _dec$b(_class$b = _dec2$b(_class$b = class BeanPassport extends BeanBase {
   constructor(...args) {
     super(...args);
     this._authTokenAdapter = void 0;
@@ -174,6 +192,10 @@ let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
     const user = this.getCurrentUser();
     return !!user && !$getUserAnonymous(user);
   }
+  get isActivated() {
+    const user = this.getCurrentUser();
+    return !!user && $getUserActivated(user);
+  }
   async isAdmin() {
     const passport = this.getCurrent();
     return await this.passportAdapter.isAdmin(passport);
@@ -351,12 +373,12 @@ let BeanPassport = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
       return payloadData2;
     }
   }
-}) || _class$9) || _class$9);
+}) || _class$b) || _class$b);
 
-var _dec$8, _dec2$8, _class$8;
-let BeanRoleInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
+var _dec$a, _dec2$a, _class$a;
+let BeanRoleInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
   module: "a-user"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = class BeanRoleInner extends BeanBase {
+}), _dec$a(_class$a = _dec2$a(_class$a = class BeanRoleInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._roleInnerAdapter = void 0;
@@ -377,12 +399,12 @@ let BeanRoleInner = (_dec$8 = Bean(), _dec2$8 = BeanInfo({
   findAllByUserId(userId) {
     return this.roleInnerAdapter.findAllByUserId(userId);
   }
-}) || _class$8) || _class$8);
+}) || _class$a) || _class$a);
 
-var _dec$7, _dec2$7, _class$7;
-let BeanUserInner = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
+var _dec$9, _dec2$9, _class$9;
+let BeanUserInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   module: "a-user"
-}), _dec$7(_class$7 = _dec2$7(_class$7 = class BeanUserInner extends BeanBase {
+}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanUserInner extends BeanBase {
   constructor(...args) {
     super(...args);
     this._userInnerAdapter = void 0;
@@ -394,8 +416,31 @@ let BeanUserInner = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
     }
     return this._userInnerAdapter;
   }
-  createByProfile(profile) {
-    return this.userInnerAdapter.createByProfile(profile);
+  async activate(user) {
+    await this.scope.event.activate.emit(user, async user => {
+      await this.userInnerAdapter.setActivated(user.id, true);
+    });
+  }
+  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);
+    return await this.register(user, profile.confirmed);
   }
   createAnonymous() {
     return this.userInnerAdapter.createAnonymous();
@@ -412,12 +457,12 @@ let BeanUserInner = (_dec$7 = Bean(), _dec2$7 = BeanInfo({
   remove(user) {
     return this.userInnerAdapter.remove(user);
   }
-}) || _class$7) || _class$7);
+}) || _class$9) || _class$9);
 
-var _dec$6, _dec2$6, _class$6;
-let ServiceAuthTokenAdapter = (_dec$6 = Service(), _dec2$6 = BeanInfo({
+var _dec$8, _dec2$8, _class$8;
+let ServiceAuthTokenAdapter = (_dec$8 = Service(), _dec2$8 = BeanInfo({
   module: "a-user"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = 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();
@@ -445,12 +490,12 @@ let ServiceAuthTokenAdapter = (_dec$6 = Service(), _dec2$6 = BeanInfo({
   _getAuthId(payloadData) {
     return payloadData[this.scope.config.payloadData.fields.authId];
   }
-}) || _class$6) || _class$6);
+}) || _class$8) || _class$8);
 
-var _dec$5, _dec2$5, _class$5;
-let ServiceRedisToken = (_dec$5 = Service(), _dec2$5 = BeanInfo({
+var _dec$7, _dec2$7, _class$7;
+let ServiceRedisToken = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   module: "a-user"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class ServiceRedisToken extends BeanBase {
+}), _dec$7(_class$7 = _dec2$7(_class$7 = class ServiceRedisToken extends BeanBase {
   get redisAuth() {
     return this.bean.redis.get('auth');
   }
@@ -510,12 +555,22 @@ let ServiceRedisToken = (_dec$5 = Service(), _dec2$5 = BeanInfo({
   _getUserId(payloadData) {
     return payloadData[this.scope.config.payloadData.fields.userId];
   }
-}) || _class$5) || _class$5);
+}) || _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 EventCreateUserAnonymous = (_dec$5 = Event(), _dec2$5 = BeanInfo({
+  module: "a-user"
+}), _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({
@@ -549,6 +604,9 @@ let MetaPrintTip = (_dec$1 = Meta(), _dec2$1 = BeanInfo({
 
 function config(_app) {
   return {
+    user: {
+      autoActivate: false
+    },
     passport: {
       refreshAuthToken: 'recreate'
     },
@@ -579,12 +637,18 @@ let ScopeModuleAUser = (_dec = Scope(), _dec2 = BeanInfo({
 
 /** scope: end */
 
-function Public(options) {
-  const _public = options?.public === undefined ? true : options.public;
+function Public(_public = true) {
   return Aspect.guardGlobal('a-user:passport', {
     public: _public
   });
 }
+
+// true/false/undefined
+function Activated(activated) {
+  return Aspect.guardGlobal('a-user:passport', {
+    activated
+  });
+}
 function UserName(options) {
   return Aspect.guard('a-user:userName', options);
 }
@@ -598,9 +662,10 @@ function Admin(options) {
 }
 const Passport = {
   public: Public,
+  activated: Activated,
   userName: UserName,
   roleName: RoleName,
   admin: Admin
 };
 
-export { $getAuthId, $getAuthIdSystem, $getRoleId, $getRoleName, $getUserAnonymous, $getUserAvatar, $getUserId, $getUserIdSystem, $getUserLocale, $getUserName, BeanAuthInner, BeanPassport, BeanRoleInner, BeanUserInner, 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/lib/auth.d.ts

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
 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/passport.d.ts

@@ -1,13 +1,13 @@
-import type { TypeUseOnionOmitOptionsGlobal } from 'vona-module-a-onion';
-import type { IGuardOptionsPassport } from '../bean/guard.passport.ts';
 import type { IGuardOptionsRoleName } from '../bean/guard.roleName.ts';
 import type { IGuardOptionsUserName } from '../bean/guard.userName.ts';
-declare function Public(options?: Partial<TypeUseOnionOmitOptionsGlobal<IGuardOptionsPassport>>): ClassDecorator & MethodDecorator;
+declare function Public(_public?: boolean): ClassDecorator & MethodDecorator;
+declare function Activated(activated?: boolean): ClassDecorator & MethodDecorator;
 declare function UserName(options?: Partial<IGuardOptionsUserName>): ClassDecorator & MethodDecorator;
 declare function RoleName(options?: Partial<IGuardOptionsRoleName>): ClassDecorator & MethodDecorator;
 declare function Admin(options?: Partial<Omit<IGuardOptionsRoleName, 'name'>>): ClassDecorator & MethodDecorator;
 export interface IDecoratorGroupPassport {
     public: typeof Public;
+    activated: typeof Activated;
     userName: typeof UserName;
     roleName: typeof RoleName;
     admin: typeof Admin;

package/dist/lib/role.d.ts

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
 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,10 +1,13 @@
+import type { TableIdentity } from 'table-identity';
 import type { ILocaleInfos } from 'vona';
-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;
 export declare function $getUserName(user: IUserBase): string;
 export declare function $getUserAvatar(user: IUserBase): string | undefined;
+export declare function $getUserEmail(user: IUserBase): string | undefined;
+export declare function $getUserMobile(user: IUserBase): string | undefined;
+export declare function $getUserActivated(user: IUserBase): boolean;
 export declare function $getUserLocale(user: IUserBase): keyof ILocaleInfos | undefined;
 export declare function $getUserAnonymous(user: IUserBase): boolean;
 export declare function $getUserIdSystem<K extends keyof IUserIdRecord>(_userName: IUserIdRecord[K], userId: K): TableIdentity;

package/dist/types/auth.d.ts

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

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/dist/types/role.d.ts

@@ -1,4 +1,4 @@
-import type { TableIdentity } from 'vona-module-a-orm';
+import type { TableIdentity } from 'table-identity';
 export interface IRoleNameRecord {
     admin: never;
 }

package/dist/types/user.d.ts

@@ -1,5 +1,5 @@
+import type { TableIdentity } from 'table-identity';
 import type { ILocaleInfos } from 'vona';
-import type { TableIdentity } from 'vona-module-a-orm';
 import type { IAuthUserProfile } from './authProfile.ts';
 export interface IUserNameRecord {
     admin: never;
@@ -14,14 +14,19 @@ export interface IUserAdapter {
     getUserId(user: IUserBase): TableIdentity;
     getUserName(user: IUserBase): string;
     getUserAvatar(user: IUserBase): string | undefined;
+    getUserEmail(user: IUserBase): string | undefined;
+    getUserMobile(user: IUserBase): string | undefined;
+    getUserActivated(user: IUserBase): boolean;
     getUserLocale(user: IUserBase): keyof ILocaleInfos | undefined;
     getUserAnonymous(user: IUserBase): boolean;
 }
 export interface IUserInnerAdapter {
-    createByProfile(profile: IAuthUserProfile): Promise<IUserBase>;
+    create(user: Partial<IUserBase>): Promise<IUserBase>;
+    userOfProfile(profile: IAuthUserProfile): Promise<IUserBase>;
     createAnonymous(): Promise<IUserBase>;
     findOneByName(name: string): Promise<IUserBase | undefined>;
     findOne(user: Partial<IUserBase>): Promise<IUserBase | undefined>;
     update(user: Partial<IUserBase>): Promise<void>;
     remove(user: Partial<IUserBase>): Promise<void>;
+    setActivated(id: TableIdentity, activated: boolean): Promise<void>;
 }

package/package.json

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