vona-module-a-user 5.0.33 → 5.0.35

package/dist/bean/bean.passport.d.ts

@@ -1,8 +1,8 @@
 import type { IJwtClientRecord, IJwtSignOptions, IJwtToken, IJwtVerifyOptions, IPayloadDataBase } from 'vona-module-a-jwt';
 import type { IAuthBase, IAuthIdRecord, ISigninOptions } from '../types/auth.ts';
-import type { IPassportBase } from '../types/passport.ts';
-import type { IRoleBase } from '../types/role.ts';
-import type { IUserBase, IUserNameRecord } from '../types/user.ts';
+import type { IPassport } from '../types/passport.ts';
+import type { IRole } from '../types/role.ts';
+import type { IUser, IUserNameRecord } from '../types/user.ts';
 import { BeanBase } from 'vona';
 export declare class BeanPassport extends BeanBase {
     private _authTokenAdapter;
@@ -13,17 +13,17 @@ export declare class BeanPassport extends BeanBase {
     get isAuthenticated(): boolean;
     get isActivated(): boolean;
     isAdmin(): Promise<boolean>;
-    setCurrent(passport: IPassportBase | undefined): Promise<void>;
-    getCurrent(): IPassportBase | undefined;
-    getCurrentUser(): IUserBase | undefined;
+    setCurrent(passport: IPassport | undefined): Promise<void>;
+    getCurrent(): IPassport | undefined;
+    getCurrentUser(): IUser | undefined;
     getCurrentAuth(): IAuthBase | undefined;
-    getCurrentRoles(): IRoleBase[] | undefined;
-    signin(passport: IPassportBase, options?: ISigninOptions): Promise<IJwtToken>;
+    getCurrentRoles(): IRole[] | undefined;
+    signin(passport: IPassport, options?: ISigninOptions): Promise<IJwtToken>;
     signout(): Promise<void>;
     signinSystem<K extends keyof IAuthIdRecord>(authName: IAuthIdRecord[K], authId: K, name?: string, options?: ISigninOptions): Promise<IJwtToken>;
     signinMock(name?: keyof IUserNameRecord, options?: ISigninOptions): Promise<IJwtToken>;
     signinWithAnonymous(): Promise<void>;
-    kickOut(user?: IUserBase): Promise<void>;
+    kickOut(user?: IUser): Promise<void>;
     checkAuthToken(accessToken?: string, clientName?: keyof IJwtClientRecord, options?: IJwtVerifyOptions): Promise<IPayloadDataBase | undefined>;
     refreshAuthToken(refreshToken: string): Promise<IJwtToken>;
     createTempAuthToken(options?: IJwtSignOptions): Promise<string>;

package/dist/bean/bean.role.d.ts

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

package/dist/bean/bean.user.d.ts

@@ -1,17 +1,19 @@
 import type { TableIdentity } from 'table-identity';
 import type { IAuthUserProfile } from '../types/authProfile.ts';
-import type { IUserBase } from '../types/user.ts';
+import type { IUser } from '../types/user.ts';
 import { BeanBase } from 'vona';
 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>;
-    createAnonymous(): Promise<IUserBase>;
-    findOneByName(name: string): Promise<IUserBase | undefined>;
-    findOneById(id: TableIdentity): Promise<IUserBase | undefined>;
-    findOne(user: Partial<IUserBase>): Promise<IUserBase | undefined>;
-    update(user: Partial<IUserBase>): Promise<void>;
-    remove(user: Partial<IUserBase>): Promise<void>;
+    activate(user: IUser): Promise<void>;
+    register(user: Partial<IUser>, confirmed?: boolean): Promise<IUser>;
+    registerByProfile(profile: IAuthUserProfile): Promise<IUser>;
+    createAnonymous(): Promise<IUser>;
+    findOneByName(name: string): Promise<IUser | undefined>;
+    findOneById(id: TableIdentity): Promise<IUser | undefined>;
+    findOne(user: Partial<IUser>): Promise<IUser | undefined>;
+    updateById(id: TableIdentity, user: Partial<IUser>): Promise<void>;
+    update(user: Partial<IUser>): Promise<void>;
+    removeById(id: TableIdentity): Promise<void>;
+    remove(user: Partial<IUser>): Promise<void>;
 }

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

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

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

@@ -1,6 +1,6 @@
-import type { IUserBase } from '../types/user.ts';
+import type { IUser } from '../types/user.ts';
 import { BeanEventBase } from 'vona-module-a-event';
 export type TypeEventCreateAnonymousData = undefined;
-export type TypeEventCreateAnonymousResult = Partial<IUserBase>;
+export type TypeEventCreateAnonymousResult = Partial<IUser>;
 export declare class EventCreateAnonymous extends BeanEventBase<TypeEventCreateAnonymousData, TypeEventCreateAnonymousResult> {
 }

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

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

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

@@ -1,6 +1,6 @@
-import type { IPassportBase } from '../types/passport.ts';
+import type { IPassport } from '../types/passport.ts';
 import { BeanEventBase } from 'vona-module-a-event';
-export type TypeEventSigninData = IPassportBase;
+export type TypeEventSigninData = IPassport;
 export type TypeEventSigninResult = void;
 export declare class EventSignin extends BeanEventBase<TypeEventSigninData, TypeEventSigninResult> {
 }

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

@@ -1,6 +1,6 @@
-import type { IPassportBase } from '../types/passport.ts';
+import type { IPassport } from '../types/passport.ts';
 import { BeanEventBase } from 'vona-module-a-event';
-export type TypeEventSignoutData = IPassportBase;
+export type TypeEventSignoutData = IPassport;
 export type TypeEventSignoutResult = void;
 export declare class EventSignout extends BeanEventBase<TypeEventSignoutData, TypeEventSignoutResult> {
 }

package/dist/index.js

@@ -407,9 +407,20 @@ let BeanUser = (_dec$a = Bean(), _dec2$a = BeanInfo({
   async findOne(user) {
     return this.userAdapter.findOne(user);
   }
+  async updateById(id, user) {
+    return this.userAdapter.update({
+      ...user,
+      id
+    });
+  }
   async update(user) {
     return this.userAdapter.update(user);
   }
+  async removeById(id) {
+    return this.userAdapter.remove({
+      id
+    });
+  }
   async remove(user) {
     return this.userAdapter.remove(user);
   }

package/dist/service/authTokenAdapter.d.ts

@@ -1,6 +1,6 @@
 import type { IPayloadDataBase } from 'vona-module-a-jwt';
 import type { IAuthTokenAdapter } from '../types/authToken.ts';
-import type { IUserBase } from '../types/user.ts';
+import type { IUser } from '../types/user.ts';
 import { BeanBase } from 'vona';
 export declare class ServiceAuthTokenAdapter extends BeanBase implements IAuthTokenAdapter {
     create(payloadData: IPayloadDataBase): Promise<IPayloadDataBase>;
@@ -8,6 +8,6 @@ export declare class ServiceAuthTokenAdapter extends BeanBase implements IAuthTo
     verify(payloadData: IPayloadDataBase): Promise<boolean>;
     refresh(payloadData: IPayloadDataBase): Promise<void>;
     remove(payloadData: IPayloadDataBase): Promise<void>;
-    removeAll(user: IUserBase): Promise<void>;
+    removeAll(user: IUser): Promise<void>;
     private _getAuthId;
 }

package/dist/service/redisToken.d.ts

@@ -1,5 +1,5 @@
 import type { IPayloadDataBase } from 'vona-module-a-jwt';
-import type { IUserBase } from 'vona-module-a-user';
+import type { IUser } from 'vona-module-a-user';
 import { BeanBase } from 'vona';
 export declare class ServiceRedisToken extends BeanBase {
     verify(payloadData: IPayloadDataBase): Promise<boolean>;
@@ -7,7 +7,7 @@ export declare class ServiceRedisToken extends BeanBase {
     create(payloadData: IPayloadDataBase): Promise<undefined>;
     refresh(payloadData: IPayloadDataBase): Promise<undefined>;
     remove(payloadData: IPayloadDataBase): Promise<void>;
-    removeAll(user: IUserBase): Promise<void>;
+    removeAll(user: IUser): Promise<void>;
     private _getAuthRedisKey;
     private _getAuthRedisKeyPrefix;
     private _getToken;

package/dist/types/authToken.d.ts

@@ -1,10 +1,10 @@
 import type { IPayloadDataBase } from 'vona-module-a-jwt';
-import type { IUserBase } from './user.ts';
+import type { IUser } from './user.ts';
 export interface IAuthTokenAdapter {
     create(payloadData: IPayloadDataBase): Promise<IPayloadDataBase>;
     retrieve(payloadData: IPayloadDataBase): Promise<IPayloadDataBase | undefined>;
     verify(payloadData: IPayloadDataBase): Promise<boolean>;
     refresh(payloadData: IPayloadDataBase): Promise<void>;
     remove(payloadData: IPayloadDataBase): Promise<void>;
-    removeAll(user: IUserBase): Promise<void>;
+    removeAll(user: IUser): Promise<void>;
 }

package/dist/types/passport.d.ts

@@ -1,20 +1,20 @@
 import type { IPayloadDataBase } from 'vona-module-a-jwt';
 import type { IAuthBase } from './auth.ts';
-import type { IRoleBase } from './role.ts';
-import type { IUserBase } from './user.ts';
-export interface IPassportBase {
-    user?: IUserBase;
+import type { IRole } from './role.ts';
+import type { IUser } from './user.ts';
+export interface IPassport {
+    user?: IUser;
     auth?: IAuthBase;
-    roles?: IRoleBase[];
+    roles?: IRole[];
 }
 export interface IPassportAdapter {
-    isAdmin(passport: IPassportBase | undefined): Promise<boolean>;
-    setCurrent(passport: IPassportBase | undefined): Promise<IPassportBase | undefined>;
-    serialize(passport: IPassportBase): Promise<IPayloadDataBase>;
-    deserialize(payloadData: IPayloadDataBase): Promise<IPassportBase | undefined>;
+    isAdmin(passport: IPassport | undefined): Promise<boolean>;
+    setCurrent(passport: IPassport | undefined): Promise<IPassport | undefined>;
+    serialize(passport: IPassport): Promise<IPayloadDataBase>;
+    deserialize(payloadData: IPayloadDataBase): Promise<IPassport | undefined>;
 }
 declare module 'vona' {
     interface ContextState {
-        passport?: IPassportBase;
+        passport?: IPassport;
     }
 }

package/dist/types/role.d.ts

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

package/dist/types/user.d.ts

@@ -7,7 +7,7 @@ export interface IUserNameRecord {
 export interface IUserIdRecord {
     '-1': 'anonymous';
 }
-export interface IUserBase {
+export interface IUser {
     id: TableIdentity;
     name: string;
     avatar?: string;
@@ -18,12 +18,12 @@ export interface IUserBase {
     anonymous?: boolean;
 }
 export interface IUserAdapter {
-    create(user: Partial<IUserBase>): Promise<IUserBase>;
-    userOfProfile(profile: IAuthUserProfile): Promise<Partial<IUserBase>>;
-    createAnonymous(): Promise<Partial<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>;
+    create(user: Partial<IUser>): Promise<IUser>;
+    userOfProfile(profile: IAuthUserProfile): Promise<Partial<IUser>>;
+    createAnonymous(): Promise<Partial<IUser>>;
+    findOneByName(name: string): Promise<IUser | undefined>;
+    findOne(user: Partial<IUser>): Promise<IUser | undefined>;
+    update(user: Partial<IUser>): Promise<void>;
+    remove(user: Partial<IUser>): 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.33",
+  "version": "5.0.35",
   "title": "a-user",
   "vonaModule": {
     "dependencies": {}