vona-module-a-user 5.0.23 → 5.0.24

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

@@ -37,36 +37,31 @@ declare module 'vona-module-a-user' {
 }
 /** 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';
+export * from '../bean/bean.role.ts';
+export * from '../bean/bean.user.ts';
 import 'vona';
 declare module 'vona' {
 }
 declare module 'vona-module-a-user' {
-    interface BeanAuthInner {
-    }
     interface BeanPassport {
     }
-    interface BeanRoleInner {
+    interface BeanRole {
     }
-    interface BeanUserInner {
+    interface BeanUser {
     }
 }
 /** 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 type { BeanRole } from '../bean/bean.role.ts';
+import type { BeanUser } from '../bean/bean.user.ts';
 import 'vona';
 declare module 'vona' {
     interface IBeanRecordGlobal {
-        'authInner': BeanAuthInner;
         'passport': BeanPassport;
-        'roleInner': BeanRoleInner;
-        'userInner': BeanUserInner;
+        'role': BeanRole;
+        'user': BeanUser;
     }
 }
 /** bean: end */

package/dist/bean/{bean.roleInner.d.ts → bean.role.d.ts}

@@ -1,9 +1,9 @@
 import type { TableIdentity } from 'table-identity';
 import type { IRoleBase } from '../types/role.ts';
 import { BeanBase } from 'vona';
-export declare class BeanRoleInner extends BeanBase {
-    private _roleInnerAdapter;
-    private get roleInnerAdapter();
+export declare class BeanRole extends BeanBase {
+    private _roleAdapter;
+    private get roleAdapter();
     findOneByName(name: string): Promise<IRoleBase | undefined>;
     findOne(role: Partial<IRoleBase>): Promise<IRoleBase | undefined>;
     findAllByUserId(userId: TableIdentity): Promise<IRoleBase[] | undefined>;

package/dist/bean/{bean.userInner.d.ts → bean.user.d.ts}

@@ -1,9 +1,9 @@
 import type { IAuthUserProfile } from '../types/authProfile.ts';
 import type { IUserBase } from '../types/user.ts';
 import { BeanBase } from 'vona';
-export declare class BeanUserInner extends BeanBase {
-    private _userInnerAdapter;
-    private get userInnerAdapter();
+export declare class BeanUser extends BeanBase {
+    private _userAdapter;
+    private get userAdapter();
     activate(user: IUserBase): Promise<void>;
     register(user: Partial<IUserBase>, confirmed?: boolean): Promise<IUserBase>;
     registerByProfile(profile: IAuthUserProfile): Promise<IUserBase>;

package/dist/config/config.d.ts

@@ -11,9 +11,8 @@ export declare function config(_app: VonaApplication): {
     adapter: {
         authToken: keyof IServiceRecord;
         passport: keyof IServiceRecord;
-        userInner: keyof IServiceRecord;
-        authInner: keyof IServiceRecord;
-        roleInner: keyof IServiceRecord;
+        user: keyof IServiceRecord;
+        role: keyof IServiceRecord;
     };
     payloadData: {
         fields: {

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$f, _dec2$f, _class$f;
-let GuardPassport = (_dec$f = Guard({
+var _dec$e, _dec2$e, _class$e;
+let GuardPassport = (_dec$e = Guard({
   global: true,
   public: false,
   activated: true,
   checkAuthToken: true
-}), _dec2$f = BeanInfo({
+}), _dec2$e = BeanInfo({
   module: "a-user"
-}), _dec$f(_class$f = _dec2$f(_class$f = class GuardPassport extends BeanBase {
+}), _dec$e(_class$e = _dec2$e(_class$e = class GuardPassport extends BeanBase {
   async execute(options, next) {
     // auth token
     if (!this.bean.passport.getCurrent()) {
@@ -47,119 +47,48 @@ let GuardPassport = (_dec$f = Guard({
     // next
     return next();
   }
-}) || _class$f) || _class$f);
-
-let __roleAdapter;
-function setRoleAdapter(roleAdapter) {
-  __roleAdapter = roleAdapter;
-}
-function $getRoleId(role) {
-  return __roleAdapter.getRoleId(role);
-}
-function $getRoleName(role) {
-  return __roleAdapter.getRoleName(role);
-}
-
-let __userAdapter;
-function setUserAdapter(userAdapter) {
-  __userAdapter = userAdapter;
-}
-function $getUserId(user) {
-  return __userAdapter.getUserId(user);
-}
-function $getUserName(user) {
-  return __userAdapter.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);
-}
-function $getUserAnonymous(user) {
-  return __userAdapter.getUserAnonymous(user);
-}
-function $getUserIdSystem(_userName, userId) {
-  return userId;
-}
+}) || _class$e) || _class$e);
 
-var _dec$e, _dec2$e, _class$e;
-let GuardRoleName = (_dec$e = Guard({
+var _dec$d, _dec2$d, _class$d;
+let GuardRoleName = (_dec$d = Guard({
   passWhenMatched: true
-}), _dec2$e = BeanInfo({
+}), _dec2$d = BeanInfo({
   module: "a-user"
-}), _dec$e(_class$e = _dec2$e(_class$e = class GuardRoleName extends BeanBase {
+}), _dec$d(_class$d = _dec2$d(_class$d = 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);
+    if (!user || user.anonymous) 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 roleNames = roles?.map(item => item.name);
     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$e) || _class$e);
+}) || _class$d) || _class$d);
 
-var _dec$d, _dec2$d, _class$d;
-let GuardUserName = (_dec$d = Guard({
+var _dec$c, _dec2$c, _class$c;
+let GuardUserName = (_dec$c = Guard({
   passWhenMatched: true
-}), _dec2$d = BeanInfo({
+}), _dec2$c = BeanInfo({
   module: "a-user"
-}), _dec$d(_class$d = _dec2$d(_class$d = class GuardUserName extends BeanBase {
+}), _dec$c(_class$c = _dec2$c(_class$c = 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);
+    if (!user || user.anonymous) return this.app.throw(403);
+    const userName = user.name;
     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$d) || _class$d);
-
-var _dec$c, _dec2$c, _class$c;
-let BeanAuthInner = (_dec$c = Bean(), _dec2$c = BeanInfo({
-  module: "a-user"
-}), _dec$c(_class$c = _dec2$c(_class$c = 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$c) || _class$c);
 
-let __authAdapter;
-function setAuthAdapter(authAdapter) {
-  __authAdapter = authAdapter;
-}
-function $getAuthId(user) {
-  return __authAdapter.getAuthId(user);
-}
 function $getAuthIdSystem(_authName, authId) {
   return authId;
 }
@@ -190,11 +119,11 @@ let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
   }
   get isAuthenticated() {
     const user = this.getCurrentUser();
-    return !!user && !$getUserAnonymous(user);
+    return !!user && !user.anonymous;
   }
   get isActivated() {
     const user = this.getCurrentUser();
-    return !!user && $getUserActivated(user);
+    return !!user && !!user.activated;
   }
   async isAdmin() {
     const passport = this.getCurrent();
@@ -240,7 +169,7 @@ let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
     await this.setCurrent(undefined);
   }
   async signinSystem(authName, authId, name, options) {
-    const user = await this.bean.userInner.findOneByName(name ?? 'admin');
+    const user = await this.bean.user.findOneByName(name ?? 'admin');
     if (!user) return this.app.throw(401);
     const auth = {
       id: $getAuthIdSystem(authName, authId)
@@ -263,7 +192,7 @@ let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
     await this.setCurrent(passport);
   }
   async createUserAnonymous() {
-    const userAnonymous = await this.bean.userInner.createAnonymous();
+    const userAnonymous = await this.bean.user.createAnonymous();
     // event
     await this.scope.event.createUserAnonymous.emit(userAnonymous);
     // ok
@@ -376,49 +305,49 @@ let BeanPassport = (_dec$b = Bean(), _dec2$b = BeanInfo({
 }) || _class$b) || _class$b);
 
 var _dec$a, _dec2$a, _class$a;
-let BeanRoleInner = (_dec$a = Bean(), _dec2$a = BeanInfo({
+let BeanRole = (_dec$a = Bean(), _dec2$a = BeanInfo({
   module: "a-user"
-}), _dec$a(_class$a = _dec2$a(_class$a = class BeanRoleInner extends BeanBase {
+}), _dec$a(_class$a = _dec2$a(_class$a = class BeanRole extends BeanBase {
   constructor(...args) {
     super(...args);
-    this._roleInnerAdapter = void 0;
+    this._roleAdapter = void 0;
   }
-  get roleInnerAdapter() {
-    if (!this._roleInnerAdapter) {
-      const beanFullName = beanFullNameFromOnionName(this.scope.config.adapter.roleInner, 'service');
-      this._roleInnerAdapter = this.bean._getBean(beanFullName);
+  get roleAdapter() {
+    if (!this._roleAdapter) {
+      const beanFullName = beanFullNameFromOnionName(this.scope.config.adapter.role, 'service');
+      this._roleAdapter = this.bean._getBean(beanFullName);
     }
-    return this._roleInnerAdapter;
+    return this._roleAdapter;
   }
   findOneByName(name) {
-    return this.roleInnerAdapter.findOneByName(name);
+    return this.roleAdapter.findOneByName(name);
   }
   findOne(role) {
-    return this.roleInnerAdapter.findOne(role);
+    return this.roleAdapter.findOne(role);
   }
   findAllByUserId(userId) {
-    return this.roleInnerAdapter.findAllByUserId(userId);
+    return this.roleAdapter.findAllByUserId(userId);
   }
 }) || _class$a) || _class$a);
 
 var _dec$9, _dec2$9, _class$9;
-let BeanUserInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
+let BeanUser = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
   module: "a-user"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanUserInner extends BeanBase {
+}), _dec$9(_class$9 = _dec2$9(_class$9 = class BeanUser extends BeanBase {
   constructor(...args) {
     super(...args);
-    this._userInnerAdapter = void 0;
+    this._userAdapter = void 0;
   }
-  get userInnerAdapter() {
-    if (!this._userInnerAdapter) {
-      const beanFullName = beanFullNameFromOnionName(this.scope.config.adapter.userInner, 'service');
-      this._userInnerAdapter = this.bean._getBean(beanFullName);
+  get userAdapter() {
+    if (!this._userAdapter) {
+      const beanFullName = beanFullNameFromOnionName(this.scope.config.adapter.user, 'service');
+      this._userAdapter = this.bean._getBean(beanFullName);
     }
-    return this._userInnerAdapter;
+    return this._userAdapter;
   }
   async activate(user) {
     await this.scope.event.activate.emit(user, async user => {
-      await this.userInnerAdapter.setActivated(user.id, true);
+      await this.userAdapter.setActivated(user.id, true);
     });
   }
   async register(user, confirmed) {
@@ -431,7 +360,7 @@ let BeanUserInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
     };
     return await this.scope.event.register.emit(data, async data => {
       // user
-      const userNew = await this.userInnerAdapter.create(data.user);
+      const userNew = await this.userAdapter.create(data.user);
       if (data.autoActivate) {
         await this.activate(userNew);
       }
@@ -439,23 +368,23 @@ let BeanUserInner = (_dec$9 = Bean(), _dec2$9 = BeanInfo({
     });
   }
   async registerByProfile(profile) {
-    const user = await this.userInnerAdapter.userOfProfile(profile);
+    const user = await this.userAdapter.userOfProfile(profile);
     return await this.register(user, profile.confirmed);
   }
   createAnonymous() {
-    return this.userInnerAdapter.createAnonymous();
+    return this.userAdapter.createAnonymous();
   }
   findOneByName(name) {
-    return this.userInnerAdapter.findOneByName(name);
+    return this.userAdapter.findOneByName(name);
   }
   findOne(user) {
-    return this.userInnerAdapter.findOne(user);
+    return this.userAdapter.findOne(user);
   }
   update(user) {
-    return this.userInnerAdapter.update(user);
+    return this.userAdapter.update(user);
   }
   remove(user) {
-    return this.userInnerAdapter.remove(user);
+    return this.userAdapter.remove(user);
   }
 }) || _class$9) || _class$9);
 
@@ -613,9 +542,8 @@ function config(_app) {
     adapter: {
       authToken: 'a-user:authTokenAdapter',
       passport: 'home-user:passportAdapter',
-      userInner: 'home-user:userInnerAdapter',
-      authInner: 'home-user:authInnerAdapter',
-      roleInner: 'home-user:roleInnerAdapter'
+      user: 'home-user:userAdapter',
+      role: 'home-user:roleAdapter'
     },
     payloadData: {
       fields: {
@@ -668,4 +596,8 @@ const Passport = {
   admin: Admin
 };
 
-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 };
+function $getUserIdSystem(_userName, userId) {
+  return userId;
+}
+
+export { $getAuthIdSystem, $getUserIdSystem, BeanPassport, BeanRole, BeanUser, EventActivate, EventCreateUserAnonymous, EventRegister, EventSignin, EventSignout, GuardPassport, GuardRoleName, GuardUserName, MetaPrintTip, Passport, ScopeModuleAUser, ServiceAuthTokenAdapter, ServiceRedisToken, config };

package/dist/lib/auth.d.ts

@@ -1,5 +1,3 @@
 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;
+import type { IAuthIdRecord } from '../types/auth.ts';
 export declare function $getAuthIdSystem<K extends keyof IAuthIdRecord>(_authName: IAuthIdRecord[K], authId: K): TableIdentity;

package/dist/lib/index.d.ts

@@ -1,4 +1,3 @@
 export * from './auth.ts';
 export * from './passport.ts';
-export * from './role.ts';
 export * from './user.ts';

package/dist/lib/user.d.ts

@@ -1,13 +1,3 @@
 import type { TableIdentity } from 'table-identity';
-import type { ILocaleInfos } from 'vona';
-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;
+import type { IUserIdRecord } from '../types/user.ts';
 export declare function $getUserIdSystem<K extends keyof IUserIdRecord>(_userName: IUserIdRecord[K], userId: K): TableIdentity;

package/dist/types/auth.d.ts

@@ -1,19 +1,21 @@
 import type { TableIdentity } from 'table-identity';
+import type { IAuthProviderRecord } from 'vona-module-a-auth';
 export interface IAuthIdRecord {
     '-1': 'dev';
     '-10000': 'mock';
 }
-export interface IAuthBase {
+export interface IAuthProviderBase {
     id: TableIdentity;
+    providerName: keyof IAuthProviderRecord;
+    clientName: string;
 }
-export interface IAuthAdapter {
-    getAuthId(user: IAuthBase): TableIdentity;
+export interface IAuthBase {
+    id: TableIdentity;
+    profileId?: string;
+    authProvider?: IAuthProviderBase;
 }
 export type TypeAuthToken = 'recreate' | 'refresh' | 'nochange';
 export interface ISigninOptions {
     /** default: refresh */
     authToken?: TypeAuthToken;
 }
-export interface IAuthInnerAdapter {
-    findOne(auth: Partial<IAuthBase>): Promise<IAuthBase | undefined>;
-}

package/dist/types/role.d.ts

@@ -6,12 +6,9 @@ export interface IRoleIdRecord {
 }
 export interface IRoleBase {
     id: TableIdentity;
+    name: string;
 }
 export interface IRoleAdapter {
-    getRoleId(role: IRoleBase): TableIdentity;
-    getRoleName(role: IRoleBase): string;
-}
-export interface IRoleInnerAdapter {
     findOneByName(name: string): Promise<IRoleBase | undefined>;
     findOne(role: Partial<IRoleBase>): Promise<IRoleBase | undefined>;
     findAllByUserId(userId: TableIdentity): Promise<IRoleBase[] | undefined>;

package/dist/types/user.d.ts

@@ -9,18 +9,15 @@ export interface IUserIdRecord {
 }
 export interface IUserBase {
     id: TableIdentity;
+    name: string;
+    avatar?: string;
+    email?: string;
+    mobile?: string;
+    activated?: boolean;
+    locale?: keyof ILocaleInfos | undefined;
+    anonymous?: boolean;
 }
 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 {
     create(user: Partial<IUserBase>): Promise<IUserBase>;
     userOfProfile(profile: IAuthUserProfile): Promise<IUserBase>;
     createAnonymous(): Promise<IUserBase>;

package/package.json

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

package/dist/bean/bean.authInner.d.ts

@@ -1,7 +0,0 @@
-import type { IAuthBase } from '../types/auth.ts';
-import { BeanBase } from 'vona';
-export declare class BeanAuthInner extends BeanBase {
-    private _authInnerAdapter;
-    private get authInnerAdapter();
-    findOne(auth: Partial<IAuthBase>): Promise<IAuthBase | undefined>;
-}

package/dist/lib/role.d.ts

@@ -1,5 +0,0 @@
-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;
-export declare function $getRoleName(role: IRoleBase): string;