@hexabot-ai/api 3.0.0-alpha.3 → 3.1.1-alpha.0

package/src/user/dto/user.dto.ts

@@ -13,6 +13,7 @@ import {
 } from '@nestjs/swagger';
 import { Exclude, Expose, Type } from 'class-transformer';
 import {
+  ArrayNotEmpty,
   IsArray,
   IsBoolean,
   IsEmail,
@@ -23,42 +24,57 @@ import {
 } from 'class-validator';
 
 import { Attachment } from '@/attachment/dto/attachment.dto';
-import { IsUUIDv4 } from '@/utils/decorators/is-uuid.decorator';
 import {
-  BaseStub,
-  DtoActionConfig,
-  DtoTransformerConfig,
-} from '@/utils/types/dto.types';
+  Subscriber,
+  SubscriberCreateDto,
+  SubscriberFull,
+  SubscriberStub,
+} from '@/chat/dto/subscriber.dto';
+import { IsUUIDv4 } from '@/utils/decorators/is-uuid.decorator';
+import { TDto } from '@/utils/types/dto.types';
 
 import { UserProvider } from '../types/user-provider.type';
 
 import { Role } from './role.dto';
+import { UserProfileCreateDto } from './user-profile.dto';
 
 @Exclude()
-export class UserStub extends BaseStub {
+export class UserStub extends SubscriberStub {
   @Expose()
   username!: string;
 
   @Expose()
-  first_name!: string;
+  email!: string;
 
   @Expose()
-  last_name!: string;
+  sendEmail!: boolean;
 
   @Expose()
-  email!: string;
+  state!: boolean;
 
   @Expose()
-  sendEmail!: boolean;
+  resetCount!: number;
 
   @Expose()
-  state!: boolean;
+  resetToken!: string | null;
 
   @Expose()
-  language!: string;
+  provider?: UserProvider;
+}
 
+@Exclude()
+export class User extends Subscriber {
   @Expose()
-  timezone!: string;
+  username!: string;
+
+  @Expose()
+  email!: string;
+
+  @Expose()
+  sendEmail!: boolean;
+
+  @Expose()
+  state!: boolean;
 
   @Expose()
   resetCount!: number;
@@ -68,10 +84,7 @@ export class UserStub extends BaseStub {
 
   @Expose()
   provider?: UserProvider;
-}
 
-@Exclude()
-export class User extends UserStub {
   @Expose({ name: 'roleIds' })
   roles: string[];
 
@@ -80,7 +93,28 @@ export class User extends UserStub {
 }
 
 @Exclude()
-export class UserFull extends UserStub {
+export class UserFull extends SubscriberFull {
+  @Expose()
+  username!: string;
+
+  @Expose()
+  email!: string;
+
+  @Expose()
+  sendEmail!: boolean;
+
+  @Expose()
+  state!: boolean;
+
+  @Expose()
+  resetCount!: number;
+
+  @Expose()
+  resetToken!: string | null;
+
+  @Expose()
+  provider?: UserProvider;
+
   @Expose()
   @Type(() => Role)
   roles: Role[];
@@ -90,22 +124,12 @@ export class UserFull extends UserStub {
   avatar: Attachment | null;
 }
 
-export class UserCreateDto {
+export class UserCreateDto extends UserProfileCreateDto {
   @ApiProperty({ description: 'User username', type: String })
   @IsNotEmpty()
   @IsString()
   username: string;
 
-  @ApiProperty({ description: 'User first name', type: String })
-  @IsNotEmpty()
-  @IsString()
-  first_name: string;
-
-  @ApiProperty({ description: 'User last name', type: String })
-  @IsNotEmpty()
-  @IsString()
-  last_name: string;
-
   @ApiProperty({ description: 'User email', type: String })
   @IsNotEmpty()
   @IsEmail()
@@ -117,7 +141,7 @@ export class UserCreateDto {
   password: string;
 
   @ApiProperty({ description: 'User roles', type: String })
-  @IsNotEmpty()
+  @ArrayNotEmpty()
   @IsArray()
   @IsUUIDv4({ each: true, message: 'Role must be a valid UUID' })
   roles: string[];
@@ -126,7 +150,7 @@ export class UserCreateDto {
   @IsOptional()
   @IsString()
   @IsUUIDv4({ message: 'Avatar must be a valid UUID' })
-  avatar: string | null = null;
+  avatar: string | null;
 
   @ApiPropertyOptional({
     description: 'User state',
@@ -146,7 +170,7 @@ export class UserUpdateDto extends PartialType(UserCreateDto) {
   @ApiPropertyOptional({ description: 'User timezone', type: String })
   @IsOptional()
   @IsString()
-  timezone?: string;
+  timezone?: number;
 
   @ApiPropertyOptional({
     description: 'Send automated emails to the user',
@@ -217,12 +241,13 @@ export class UserResetPasswordDto extends PickType(UserCreateDto, [
 
 export class UserRequestResetDto extends PickType(UserCreateDto, ['email']) {}
 
-export type UserTransformerDto = DtoTransformerConfig<{
-  PlainCls: typeof User;
-  FullCls: typeof UserFull;
-}>;
-
-export type UserDtoConfig = DtoActionConfig<{
-  create: UserCreateDto;
-  update: UserUpdateDto;
-}>;
+export type UserDto = TDto<
+  {
+    plain: typeof User;
+    full: typeof UserFull;
+  },
+  {
+    create: UserCreateDto;
+    update: UserUpdateDto | Partial<SubscriberCreateDto>;
+  }
+>;

package/src/user/entities/credential.entity.ts

@@ -0,0 +1,50 @@
+/*
+ * Hexabot — Fair Core License (FCL-1.0-ALv2)
+ * Copyright (c) 2025 Hexastack.
+ * Full terms: see LICENSE.md.
+ */
+
+import {
+  Column,
+  Entity,
+  Index,
+  JoinColumn,
+  ManyToOne,
+  RelationId,
+} from 'typeorm';
+
+import { BaseOrmEntity } from '@/database/entities/base.entity';
+import { AsRelation } from '@/utils/decorators/relation-ref.decorator';
+
+import {
+  Credential,
+  CredentialDto,
+  CredentialFull,
+} from '../dto/credential.dto';
+
+import { UserOrmEntity } from './user.entity';
+
+@Entity({ name: 'credentials' })
+@Index(['name'], { unique: true })
+export class CredentialOrmEntity extends BaseOrmEntity<CredentialDto> {
+  plainCls = Credential;
+
+  fullCls = CredentialFull;
+
+  @Column()
+  name!: string;
+
+  @Column({ type: 'text' })
+  value!: string;
+
+  @ManyToOne(() => UserOrmEntity, {
+    nullable: false,
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'owner_id' })
+  @AsRelation()
+  owner!: UserOrmEntity;
+
+  @RelationId((credential: CredentialOrmEntity) => credential.owner)
+  private readonly ownerId!: string;
+}

package/src/user/entities/model.entity.ts

@@ -9,6 +9,7 @@ import { Column, Entity, Index, OneToMany } from 'typeorm';
 import { JsonColumn } from '@/database/decorators/json-column.decorator';
 import { BaseOrmEntity } from '@/database/entities/base.entity';
 
+import { Model, ModelDto, ModelFull } from '../dto/model.dto';
 import { TRelation } from '../types/index.type';
 
 import { PermissionOrmEntity } from './permission.entity';
@@ -16,7 +17,11 @@ import { PermissionOrmEntity } from './permission.entity';
 @Entity({ name: 'models' })
 @Index(['name'], { unique: true })
 @Index(['identity'], { unique: true })
-export class ModelOrmEntity extends BaseOrmEntity {
+export class ModelOrmEntity extends BaseOrmEntity<ModelDto> {
+  plainCls = Model;
+
+  fullCls = ModelFull;
+
   @Column()
   name!: string;
 

package/src/user/entities/permission.entity.ts

@@ -17,6 +17,11 @@ import { EnumColumn } from '@/database/decorators/enum-column.decorator';
 import { BaseOrmEntity } from '@/database/entities/base.entity';
 import { AsRelation } from '@/utils/decorators/relation-ref.decorator';
 
+import {
+  Permission,
+  PermissionDto,
+  PermissionFull,
+} from '../dto/permission.dto';
 import { Action } from '../types/action.type';
 import { TRelation } from '../types/index.type';
 
@@ -25,7 +30,11 @@ import { RoleOrmEntity } from './role.entity';
 
 @Entity({ name: 'permissions' })
 @Index(['model', 'action', 'role', 'relation'], { unique: true })
-export class PermissionOrmEntity extends BaseOrmEntity {
+export class PermissionOrmEntity extends BaseOrmEntity<PermissionDto> {
+  plainCls = Permission;
+
+  fullCls = PermissionFull;
+
   @ManyToOne(() => ModelOrmEntity, (model) => model.permissions, {
     onDelete: 'CASCADE',
   })

package/src/user/entities/role.entity.ts

@@ -8,6 +8,8 @@ import { Column, Entity, Index, ManyToMany, OneToMany } from 'typeorm';
 
 import { BaseOrmEntity } from '@/database/entities/base.entity';
 
+import { Role, RoleDto, RoleFull } from '../dto/role.dto';
+
 import { PermissionOrmEntity } from './permission.entity';
 import { UserOrmEntity } from './user.entity';
 
@@ -15,7 +17,11 @@ export type TRole = 'admin' | 'public';
 
 @Entity({ name: 'roles' })
 @Index(['name'], { unique: true })
-export class RoleOrmEntity extends BaseOrmEntity {
+export class RoleOrmEntity extends BaseOrmEntity<RoleDto> {
+  plainCls = Role;
+
+  fullCls = RoleFull;
+
   @Column()
   name!: string;
 

package/src/user/entities/user-profile.entity.ts

@@ -0,0 +1,72 @@
+/*
+ * Hexabot — Fair Core License (FCL-1.0-ALv2)
+ * Copyright (c) 2025 Hexastack.
+ * Full terms: see LICENSE.md.
+ */
+
+import {
+  Column,
+  Entity,
+  Index,
+  JoinColumn,
+  ManyToOne,
+  OneToMany,
+  RelationId,
+  TableInheritance,
+} from 'typeorm';
+
+import { AttachmentOrmEntity } from '@/attachment/entities/attachment.entity';
+import { EnumColumn } from '@/database';
+import { BaseOrmEntity } from '@/database/entities/base.entity';
+import { AsRelation, TDto } from '@/utils';
+
+import { UserProfileDto, UserProfileStub } from '../dto/user-profile.dto';
+
+export enum EUserProfileType {
+  SubscriberOrmEntity = 'SubscriberOrmEntity',
+  UserOrmEntity = 'UserOrmEntity',
+}
+
+@Entity({ name: 'users' })
+@TableInheritance({
+  column: { type: 'varchar', name: 'type' },
+})
+@Index(['firstName'])
+@Index(['lastName'])
+export class UserProfileOrmEntity<
+  Dto extends TDto = UserProfileDto,
+> extends BaseOrmEntity<Dto> {
+  plainCls = UserProfileStub;
+
+  fullCls = UserProfileStub;
+
+  @Column()
+  firstName: string;
+
+  @Column()
+  lastName: string;
+
+  @ManyToOne(() => AttachmentOrmEntity, {
+    nullable: true,
+    onDelete: 'SET NULL',
+  })
+  @JoinColumn({ name: 'avatar_id' })
+  @AsRelation()
+  avatar: AttachmentOrmEntity | null;
+
+  @RelationId((profile: UserProfileOrmEntity<UserProfileDto>) => profile.avatar)
+  private readonly avatarId?: string | null;
+
+  @Column({ length: 2, default: 'en' })
+  language: string;
+
+  @Column({ default: 0 })
+  timezone: number;
+
+  @OneToMany(() => AttachmentOrmEntity, (attachment) => attachment.createdBy)
+  @AsRelation({ allowArray: true })
+  createdAttachments?: AttachmentOrmEntity[];
+
+  @EnumColumn({ enum: EUserProfileType })
+  type: EUserProfileType;
+}

package/src/user/entities/user.entity.ts

@@ -5,40 +5,38 @@
  */
 
 import {
-  BeforeInsert,
-  BeforeUpdate,
+  ChildEntity,
   Column,
-  Entity,
   Index,
-  JoinColumn,
   JoinTable,
   ManyToMany,
-  ManyToOne,
   RelationId,
 } from 'typeorm';
 
-import { AttachmentOrmEntity } from '@/attachment/entities/attachment.entity';
+import { SubscriberOrmEntity } from '@/chat/entities/subscriber.entity';
 import { JsonColumn } from '@/database/decorators/json-column.decorator';
-import { BaseOrmEntity } from '@/database/entities/base.entity';
+import {
+  OnBeforeInsert,
+  OnBeforeUpdate,
+} from '@/database/decorators/orm-event-hooks.decorator';
 import { AsRelation } from '@/utils/decorators/relation-ref.decorator';
 
+import { User, UserDto, UserFull } from '../dto/user.dto';
 import { UserProvider } from '../types/user-provider.type';
 import { hash } from '../utilities/bcryptjs';
 
 import { RoleOrmEntity } from './role.entity';
 
-@Entity({ name: 'users' })
+@ChildEntity()
 @Index(['username'], { unique: true })
 @Index(['email'], { unique: true })
-export class UserOrmEntity extends BaseOrmEntity {
-  @Column()
-  username!: string;
+export class UserOrmEntity extends SubscriberOrmEntity<UserDto> {
+  plainCls = User;
 
-  @Column({ name: 'first_name' })
-  first_name!: string;
+  fullCls = UserFull;
 
-  @Column({ name: 'last_name' })
-  last_name!: string;
+  @Column()
+  username!: string;
 
   @Column()
   email!: string;
@@ -46,17 +44,6 @@ export class UserOrmEntity extends BaseOrmEntity {
   @Column()
   password!: string;
 
-  @ManyToOne(() => AttachmentOrmEntity, {
-    nullable: true,
-    onDelete: 'SET NULL',
-  })
-  @JoinColumn({ name: 'avatar_id' })
-  @AsRelation()
-  avatar?: AttachmentOrmEntity | null;
-
-  @RelationId((user: UserOrmEntity) => user.avatar)
-  private readonly avatarId?: string | null;
-
   @ManyToMany(() => RoleOrmEntity, (role) => role.users, {
     cascade: false,
   })
@@ -77,12 +64,6 @@ export class UserOrmEntity extends BaseOrmEntity {
   @Column({ default: true })
   state!: boolean;
 
-  @Column({ length: 2, default: 'en' })
-  language!: string;
-
-  @Column({ default: 'Europe/Berlin' })
-  timezone!: string;
-
   @Column({ name: 'reset_count', type: 'integer', default: 0 })
   resetCount!: number;
 
@@ -92,14 +73,14 @@ export class UserOrmEntity extends BaseOrmEntity {
   @JsonColumn({ nullable: true })
   provider?: UserProvider;
 
-  @BeforeInsert()
+  @OnBeforeInsert()
   ensureProvider(): void {
     if (!this.provider) {
       this.provider = { strategy: 'local' };
     }
   }
 
-  @BeforeInsert()
+  @OnBeforeInsert()
   ensurePassword(): void {
     if (!this.password) {
       throw new Error('No password provided');
@@ -111,7 +92,7 @@ export class UserOrmEntity extends BaseOrmEntity {
     }
   }
 
-  @BeforeUpdate()
+  @OnBeforeUpdate()
   hashSensitiveFields(): void {
     if (this.password) {
       this.password = this.hashIfNeeded(this.password);

package/src/user/guards/ability.guard.ts

@@ -39,7 +39,6 @@ export class Ability implements CanActivate {
     const { user, method, _parsedUrl, session } = context
       .switchToHttp()
       .getRequest<Request & { user: User; _parsedUrl: Url }>();
-
     if (!user) {
       throw new UnauthorizedException();
     }
@@ -63,7 +62,7 @@ export class Ability implements CanActivate {
           '/logout',
           '/auth/me',
           '/channel',
-          '/i18n',
+          '/action',
           // Allow to update own profile
           `/user/edit/${user.id}`,
           // Allow access to own avatar

package/src/user/index.ts

@@ -12,9 +12,9 @@ export * from './controllers/permission.controller';
 
 export * from './controllers/role.controller';
 
-export * from './controllers/user.controller';
+export * from './controllers/credential.controller';
 
-export * from './dto/invitation.dto';
+export * from './controllers/user.controller';
 
 export * from './dto/model.dto';
 
@@ -22,9 +22,9 @@ export * from './dto/permission.dto';
 
 export * from './dto/role.dto';
 
-export * from './dto/user.dto';
+export * from './dto/credential.dto';
 
-export * from './entities/invitation.entity';
+export * from './dto/user.dto';
 
 export * from './entities/model.entity';
 
@@ -34,6 +34,8 @@ export * from './entities/role.entity';
 
 export * from './entities/session.entity';
 
+export * from './entities/credential.entity';
+
 export * from './entities/user.entity';
 
 export * from './guards/ability.guard';
@@ -44,14 +46,14 @@ export * from './passport/auth-strategy/local.strategy';
 
 export * from './passport/session.serializer';
 
-export * from './repositories/invitation.repository';
-
 export * from './repositories/model.repository';
 
 export * from './repositories/permission.repository';
 
 export * from './repositories/role.repository';
 
+export * from './repositories/credential.repository';
+
 export * from './repositories/user.repository';
 
 export * from './seeds/model.seed-model';
@@ -72,8 +74,6 @@ export * from './seeds/user.seed';
 
 export * from './services/auth.service';
 
-export * from './services/invitation.service';
-
 export * from './services/model.service';
 
 export * from './services/passwordReset.service';
@@ -82,6 +82,8 @@ export * from './services/permission.service';
 
 export * from './services/role.service';
 
+export * from './services/credential.service';
+
 export * from './services/user.service';
 
 export * from './services/validate-account.service';

package/src/user/passport/auth-strategy/local.strategy.ts

@@ -20,7 +20,6 @@ export class LocalStrategy extends PassportStrategy(Strategy) {
 
   async validate(username: string, password: string): Promise<any> {
     const user = await this.authService.validateUser(username, password);
-
     if (!user) {
       throw new UnauthorizedException('Unable to login, check credentials');
     }

package/src/user/passport/session.serializer.ts

@@ -23,8 +23,8 @@ export class AuthSerializer extends PassportSerializer {
   ) {
     done(null, {
       id: user.id,
-      first_name: user.first_name,
-      last_name: user.last_name,
+      first_name: user.firstName,
+      last_name: user.lastName,
     });
   }
 

package/src/user/repositories/credential.repository.ts

@@ -0,0 +1,37 @@
+/*
+ * Hexabot — Fair Core License (FCL-1.0-ALv2)
+ * Copyright (c) 2025 Hexastack.
+ * Full terms: see LICENSE.md.
+ */
+
+/*
+ * Hexabot — Fair Core License (FCL-1.0-ALv2)
+ * Copyright (c) 2025 Hexastack.
+ * Full terms: see LICENSE.md.
+ */
+
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+
+import { BaseOrmRepository } from '@/utils/generics/base-orm.repository';
+
+import { CredentialOrmEntity } from '../entities/credential.entity';
+
+@Injectable()
+export class CredentialRepository extends BaseOrmRepository<CredentialOrmEntity> {
+  constructor(
+    @InjectRepository(CredentialOrmEntity)
+    repository: Repository<CredentialOrmEntity>,
+  ) {
+    super(repository, ['owner']);
+  }
+
+  async findOneValue(id?: string): Promise<string> {
+    const credentials = await this.repository.findOne({
+      where: { id },
+    });
+
+    return credentials?.value || '';
+  }
+}

package/src/user/repositories/model.repository.ts

@@ -10,24 +10,14 @@ import { Repository } from 'typeorm';
 
 import { BaseOrmRepository } from '@/utils/generics/base-orm.repository';
 
-import {
-  Model,
-  ModelDtoConfig,
-  ModelFull,
-  ModelTransformerDto,
-} from '../dto/model.dto';
 import { ModelOrmEntity } from '../entities/model.entity';
 
 @Injectable()
-export class ModelRepository extends BaseOrmRepository<
-  ModelOrmEntity,
-  ModelTransformerDto,
-  ModelDtoConfig
-> {
+export class ModelRepository extends BaseOrmRepository<ModelOrmEntity> {
   constructor(
     @InjectRepository(ModelOrmEntity)
     repository: Repository<ModelOrmEntity>,
   ) {
-    super(repository, ['permissions'], { PlainCls: Model, FullCls: ModelFull });
+    super(repository, ['permissions']);
   }
 }

package/src/user/repositories/permission.repository.ts

@@ -10,27 +10,14 @@ import { Repository } from 'typeorm';
 
 import { BaseOrmRepository } from '@/utils/generics/base-orm.repository';
 
-import {
-  Permission,
-  PermissionDtoConfig,
-  PermissionFull,
-  PermissionTransformerDto,
-} from '../dto/permission.dto';
 import { PermissionOrmEntity } from '../entities/permission.entity';
 
 @Injectable()
-export class PermissionRepository extends BaseOrmRepository<
-  PermissionOrmEntity,
-  PermissionTransformerDto,
-  PermissionDtoConfig
-> {
+export class PermissionRepository extends BaseOrmRepository<PermissionOrmEntity> {
   constructor(
     @InjectRepository(PermissionOrmEntity)
     repository: Repository<PermissionOrmEntity>,
   ) {
-    super(repository, ['model', 'role'], {
-      PlainCls: Permission,
-      FullCls: PermissionFull,
-    });
+    super(repository, ['model', 'role']);
   }
 }