refactor

package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "@apihub24/token-authentication",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@apihub24/token-authentication",
-      "version": "1.0.0",
+      "version": "1.0.1",
       "license": "MIT",
       "dependencies": {
-        "@apihub24/repository": "^1.0.1",
+        "@apihub24/repository": "^1.0.2",
         "@nestjs/common": "^11.1.6",
         "@nestjs/config": "^4.0.2",
         "@nestjs/core": "^11.1.6",
@@ -20,9 +20,9 @@
       }
     },
     "node_modules/@apihub24/repository": {
-      "version": "1.0.1",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@apihub24/repository/-/repository-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@apihub24/repository/-/repository-1.0.2.tgz",
-      "integrity": "sha512-ex3Z+lxsHtVKDTolJQqLHswq9SKfXzM/hWv17zsrhKqJwuGxO7CeBFM60aiuApZX9NqBhGAkPGGj9jt+F/Y9HQ==",
+      "integrity": "sha512-brZkSENCpC1/MJYBSHHeO+8odrKdq/q4U2z7HN5mrAvPl8GNjq0egOCZ22axQKynWuP9yimIIwJxExwp12YBzQ==",
       "license": "MIT"
     },
     "node_modules/@borewit/text-codec": {

package.json

@@ -11,7 +11,7 @@
     "@nestjs/common": "^11.1.6",
     "@nestjs/config": "^4.0.2",
     "@nestjs/core": "^11.1.6",
-    "@apihub24/repository": "^1.0.1",
+    "@apihub24/repository": "^1.0.2",
     "class-validator": "^0.14.2"
   },
   "devDependencies": {

src/contracts/index.ts

@@ -1,12 +0,0 @@
-export * from "./models/account";
-export * from "./models/group";
-export * from "./models/organization";
-export * from "./models/registration";
-export * from "./models/right";
-export * from "./models/session";
-export * from "./models/sign.in";
-
-export * from "./services/mail.verification.service";
-export * from "./services/password.service";
-export * from "./services/session.service";
-export * from "./services/token.service";

src/contracts/models/account.ts

@@ -1,28 +1,11 @@
-import { Group } from './group';
+import { IGroup } from "./group";
-import {
-  IsEmail,
-  IsNotEmpty,
-  MinLength,
-  ValidateNested,
-} from 'class-validator';
 
-export class Account {
+export interface IAccount {
   id: string;
-
-  @MinLength(3)
   accountName: string;
-
-  @MinLength(3)
   passwordHash: string;
-
-  @IsEmail()
   email: string;
-
   emailVerified: boolean;
-
   active: boolean;
-
+  groups: IGroup[];
-  @IsNotEmpty({ each: true })
-  @ValidateNested({ each: true })
-  groups: Group[];
 }

src/contracts/models/group.ts

@@ -1,18 +1,9 @@
-import { Organization } from './organization';
+import { IOrganization } from "./organization";
-import { Right } from './right';
+import { IRight } from "./right";
-import { IsNotEmpty, MinLength, ValidateNested } from 'class-validator';
 
-export class Group {
+export interface IGroup {
   id: string;
-
-  @MinLength(3)
   name: string;
-
+  organization: IOrganization;
-  @IsNotEmpty()
+  rights: IRight[];
-  @ValidateNested()
-  organization: Organization;
-
-  @IsNotEmpty({ each: true })
-  @ValidateNested({ each: true })
-  rights: Right[];
 }

src/contracts/models/organization.ts

@@ -1,9 +1,4 @@
-import { IsNotEmpty, MinLength } from 'class-validator';
+export interface IOrganization {
-
-export class Organization {
   id: string;
-
-  @IsNotEmpty()
-  @MinLength(3)
   name: string;
 }

src/contracts/models/registration.ts

@@ -1,22 +1,7 @@
-import { IsEmail, IsNotEmpty, MinLength } from 'class-validator';
+export interface IRegistration {
-
-export class Registration {
-  // @IsNotEmpty()
-  @MinLength(3)
   accountName: string;
-
-  // @IsNotEmpty()
-  @MinLength(3)
   password: string;
-
-  // @IsNotEmpty()
-  @MinLength(3)
   passwordComparer: string;
-
-  // @IsNotEmpty()
-  @IsEmail()
   email: string;
-
-  @IsNotEmpty({ each: true })
   groupIds: string[];
 }

src/contracts/models/right.ts

@@ -1,8 +1,4 @@
-import { MinLength } from 'class-validator';
+export interface IRight {
-
-export class Right {
   id: string;
-
-  @MinLength(3)
   name: string;
 }

src/contracts/models/session.ts

@@ -1,12 +1,7 @@
-import { IsNotEmpty, ValidateNested } from "class-validator";
+import { IAccount } from "./account";
-import { Account } from "./account";
 
-export class Session {
+export interface ISession {
   id: string;
-
+  account: IAccount;
-  @IsNotEmpty()
-  @ValidateNested()
-  account: Account;
-
   metaData: Record<string, any>;
 }

src/contracts/models/sign.in.ts

@@ -1,8 +1,4 @@
-import { MinLength } from 'class-validator';
+export interface ISignIn {
-
-export class SignIn {
-  @MinLength(3)
   accountName: string;
-  @MinLength(3)
   password: string;
 }

src/contracts/services/mail.verification.service.ts

@@ -1,6 +1,6 @@
-import { Account } from "../models/account";
+import { IAccount } from "../models/account";
 
-export interface MailVerificationService {
+export interface IMailVerificationService {
-  sendVerificationMail(account: Account): Promise<void>;
+  sendVerificationMail(account: IAccount): Promise<void>;
   verify(email: string, code: string): Promise<boolean>;
 }

src/contracts/services/password.service.ts

@@ -1,4 +1,4 @@
-export interface PasswordService {
+export interface IPasswordService {
   hash(plainTextPassword: string): Promise<string>;
   verify(plainTextPassword: string, passwordHash: string): Promise<boolean>;
 }

src/contracts/services/session.service.ts

@@ -1,9 +1,9 @@
-import { Account } from "../models/account";
+import { IAccount } from "../models/account";
-import { Session } from "../models/session";
+import { ISession } from "../models/session";
 
-export interface SessionService {
+export interface ISessionService {
-  create(account: Account): Promise<Session>;
+  create(account: IAccount): Promise<ISession>;
-  getBy(filter: (account: Account) => boolean): Promise<Session[]>;
+  getBy(filter: (account: IAccount) => boolean): Promise<ISession[]>;
-  getById(sessionId: string): Promise<Session | null>;
+  getById(sessionId: string): Promise<ISession | null>;
   remove(sessionId: string): Promise<void>;
 }

src/contracts/services/token.service.ts

@@ -1,8 +1,8 @@
-import { Account } from "../models/account";
+import { IAccount } from "../models/account";
-import { Session } from "../models/session";
+import { ISession } from "../models/session";
 
-export interface TokenService {
+export interface ITokenService {
-  generate(session: Session): Promise<string>;
+  generate(session: ISession): Promise<string>;
   validate(token: string): Promise<boolean>;
-  getAccount(token: string): Promise<Account | null>;
+  getAccount(token: string): Promise<IAccount | null>;
 }

src/guards/index.ts

@@ -1,4 +0,0 @@
-export * from "./organization.decorator";
-export * from "./rights.decorator";
-export * from "./roles.decorator";
-export * from "./token.guard";

src/guards/organization.decorator.ts

@@ -1,5 +1,5 @@
-import { SetMetadata } from '@nestjs/common';
+import { SetMetadata } from "@nestjs/common";
 
-export const ORGANIZATIONS_KEY = 'organizations';
+export const ORGANIZATIONS_KEY = "organizations";
 export const Organizations = (...organizations: string[]) =>
   SetMetadata(ORGANIZATIONS_KEY, organizations);

src/guards/rights.decorator.ts

@@ -1,4 +1,4 @@
-import { SetMetadata } from '@nestjs/common';
+import { SetMetadata } from "@nestjs/common";
 
-export const RIGHTS_KEY = 'rights';
+export const RIGHTS_KEY = "rights";
 export const Rights = (...rights: string[]) => SetMetadata(RIGHTS_KEY, rights);

src/guards/roles.decorator.ts

@@ -1,4 +1,4 @@
-import { SetMetadata } from '@nestjs/common';
+import { SetMetadata } from "@nestjs/common";
 
-export const ROLES_KEY = 'roles';
+export const ROLES_KEY = "roles";
 export const Roles = (...roles: string[]) => SetMetadata(ROLES_KEY, roles);

src/guards/token.guard.ts

@@ -3,33 +3,33 @@ import {
   ExecutionContext,
   Inject,
   Injectable,
-} from '@nestjs/common';
+} from "@nestjs/common";
-import { Reflector } from '@nestjs/core';
+import { Reflector } from "@nestjs/core";
-import { RIGHTS_KEY } from './rights.decorator';
+import { RIGHTS_KEY } from "./rights.decorator";
-import { ROLES_KEY } from './roles.decorator';
+import { ROLES_KEY } from "./roles.decorator";
-import * as tokenService from '../contracts/services/token.service';
+import * as tokenService from "../contracts/services/token.service";
-import { ORGANIZATIONS_KEY } from './organization.decorator';
+import { ORGANIZATIONS_KEY } from "./organization.decorator";
 
 @Injectable()
 export class TokenGuard implements CanActivate {
   constructor(
     private reflector: Reflector,
-    @Inject('@apihub24/token_service')
+    @Inject("@apihub24/token_service")
-    private readonly tokenService: tokenService.TokenService,
+    private readonly tokenService: tokenService.ITokenService
   ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const requiredRights = this.reflector.getAllAndOverride<string[]>(
       RIGHTS_KEY,
-      [context.getHandler(), context.getClass()],
+      [context.getHandler(), context.getClass()]
     );
     const requiredRoles = this.reflector.getAllAndOverride<string[]>(
       ROLES_KEY,
-      [context.getHandler(), context.getClass()],
+      [context.getHandler(), context.getClass()]
     );
     const requiredOrganizations = this.reflector.getAllAndOverride<string[]>(
       ORGANIZATIONS_KEY,
-      [context.getHandler(), context.getClass()],
+      [context.getHandler(), context.getClass()]
     );
     if (!requiredRights && !requiredRoles && !requiredOrganizations) {
       return true;
@@ -40,8 +40,8 @@ export class TokenGuard implements CanActivate {
     } = context.switchToHttp().getRequest();
     if (
       !authorization ||
-      typeof authorization !== 'string' ||
+      typeof authorization !== "string" ||
-      !authorization.includes('Bearer ')
+      !authorization.includes("Bearer ")
     ) {
       return false;
     }

src/index.ts

@@ -1,5 +1,3 @@
-export * from "./token-authentication.module";
-
 export * from "./contracts/models/account";
 export * from "./contracts/models/group";
 export * from "./contracts/models/organization";
@@ -28,3 +26,5 @@ export * from "./services/organization.service";
 export * from "./services/registration.service";
 export * from "./services/right.factory.service";
 export * from "./services/right.service";
+
+export * from "./token-authentication.module";

src/models/account.ts

@@ -0,0 +1,29 @@
+import { IAccount } from "../contracts/models/account";
+import { Group } from "./group";
+import {
+  IsEmail,
+  IsNotEmpty,
+  MinLength,
+  ValidateNested,
+} from "class-validator";
+
+export class Account implements IAccount {
+  id: string;
+
+  @MinLength(3)
+  accountName: string;
+
+  @MinLength(3)
+  passwordHash: string;
+
+  @IsEmail()
+  email: string;
+
+  emailVerified: boolean;
+
+  active: boolean;
+
+  @IsNotEmpty({ each: true })
+  @ValidateNested({ each: true })
+  groups: Group[];
+}

src/models/group.ts

@@ -0,0 +1,19 @@
+import { IGroup } from "../contracts/models/group";
+import { Organization } from "./organization";
+import { Right } from "./right";
+import { IsNotEmpty, MinLength, ValidateNested } from "class-validator";
+
+export class Group implements IGroup {
+  id: string;
+
+  @MinLength(3)
+  name: string;
+
+  @IsNotEmpty()
+  @ValidateNested()
+  organization: Organization;
+
+  @IsNotEmpty({ each: true })
+  @ValidateNested({ each: true })
+  rights: Right[];
+}

src/models/organization.ts

@@ -0,0 +1,10 @@
+import { IsNotEmpty, MinLength } from "class-validator";
+import { IOrganization } from "../contracts/models/organization";
+
+export class Organization implements IOrganization {
+  id: string;
+
+  @IsNotEmpty()
+  @MinLength(3)
+  name: string;
+}

src/models/registration.ts

@@ -0,0 +1,19 @@
+import { IsEmail, IsNotEmpty, MinLength } from "class-validator";
+import { IRegistration } from "../contracts/models/registration";
+
+export class Registration implements IRegistration {
+  @MinLength(3)
+  accountName: string;
+
+  @MinLength(3)
+  password: string;
+
+  @MinLength(3)
+  passwordComparer: string;
+
+  @IsEmail()
+  email: string;
+
+  @IsNotEmpty({ each: true })
+  groupIds: string[];
+}

src/models/right.ts

@@ -0,0 +1,9 @@
+import { MinLength } from "class-validator";
+import { IRight } from "../contracts/models/right";
+
+export class Right implements IRight {
+  id: string;
+
+  @MinLength(3)
+  name: string;
+}

src/models/session.ts

@@ -0,0 +1,13 @@
+import { IsNotEmpty, ValidateNested } from "class-validator";
+import { Account } from "./account";
+import { ISession } from "../contracts/models/session";
+
+export class Session implements ISession {
+  id: string;
+
+  @IsNotEmpty()
+  @ValidateNested()
+  account: Account;
+
+  metaData: Record<string, any>;
+}

src/models/sign.in.ts

@@ -0,0 +1,10 @@
+import { MinLength } from "class-validator";
+import { ISignIn } from "../contracts/models/sign.in";
+
+export class SignIn implements ISignIn {
+  @MinLength(3)
+  accountName: string;
+
+  @MinLength(3)
+  password: string;
+}

src/services/account.factory.service.ts

@@ -1,20 +1,21 @@
 import { Inject, Injectable } from "@nestjs/common";
 import { validate } from "class-validator";
 import { GroupService } from "./group.service";
-import * as contracts from "../contracts";
+import * as passwordService from "../contracts/services/password.service";
+import { IRegistration } from "../contracts/models/registration";
+import { IAccount } from "../contracts/models/account";
+import { Account } from "../models/account";
 
 @Injectable()
 export class AccountFactoryService {
   constructor(
     @Inject("@apihub24/password_service")
-    private readonly passwordService: contracts.PasswordService,
+    private readonly passwordService: passwordService.IPasswordService,
     @Inject(GroupService)
     private readonly groupService: GroupService
   ) {}
 
-  async createFromRegistration(
+  async createFromRegistration(registration: IRegistration): Promise<IAccount> {
-    registration: contracts.Registration
-  ): Promise<contracts.Account> {
     let validationErrors = await validate(registration);
     if (validationErrors?.length) {
       throw new Error(validationErrors[0].toString());
@@ -22,7 +23,7 @@ export class AccountFactoryService {
     const groups = await this.groupService.getBy((x) =>
       registration.groupIds.includes(x.id)
     );
-    const account = new contracts.Account();
+    const account = new Account();
     account.accountName = registration.accountName;
     account.email = registration.email;
     account.emailVerified = false;

src/services/account.service.ts

@@ -1,34 +1,34 @@
-import { Account } from "../contracts/models/account";
-import { Inject, Injectable } from "@nestjs/common";
 import * as repository from "@apihub24/repository";
-import { Group } from "../contracts";
+import { Inject, Injectable } from "@nestjs/common";
+import { IAccount } from "../contracts/models/account";
+import { IGroup } from "../contracts/models/group";
 
 @Injectable()
 export class AccountService {
   constructor(
     @Inject("@apihub24/account_repository")
-    private readonly accountRepository: repository.Repository<Account>,
+    private readonly accountRepository: repository.IRepository<IAccount>,
     @Inject("@apihub24/group_repository")
-    private readonly groupRepository: repository.Repository<Group>
+    private readonly groupRepository: repository.IRepository<IGroup>
   ) {}
 
-  async getBy(filter: (account: Account) => boolean): Promise<Account[]> {
+  async getBy(filter: (account: IAccount) => boolean): Promise<IAccount[]> {
     return await this.accountRepository.getBy(filter);
   }
 
-  async save(account: Account): Promise<Account | null> {
+  async save(account: IAccount): Promise<IAccount | null> {
     const accounts = await this.accountRepository.save([account]);
     return accounts?.length ? accounts[0] : null;
   }
 
-  async delete(filter: (account: Account) => boolean): Promise<boolean> {
+  async delete(filter: (account: IAccount) => boolean): Promise<boolean> {
     return await this.accountRepository.deleteBy(filter);
   }
 
   async addAccountToGroup(
     accountId: string,
     groupId: string
-  ): Promise<Account> {
+  ): Promise<IAccount> {
     const [account, group] = await this.getAccountAndGroup(accountId, groupId);
     account.groups = account.groups.filter((x) => x.id !== groupId);
     account.groups.push(group);
@@ -42,7 +42,7 @@ export class AccountService {
   async removeAccountFromGroup(
     accountId: string,
     groupId: string
-  ): Promise<Account> {
+  ): Promise<IAccount> {
     const [account] = await this.getAccountAndGroup(accountId, groupId);
     account.groups = account.groups.filter((x) => x.id !== groupId);
     const accountsSaved = await this.accountRepository.save([account]);
@@ -55,7 +55,7 @@ export class AccountService {
   private async getAccountAndGroup(
     accountId: string,
     groupId: string
-  ): Promise<[Account, Group]> {
+  ): Promise<[IAccount, IGroup]> {
     const accounts = await this.accountRepository.getBy(
       (x) => x.id === accountId
     );

src/services/group.factory.service.ts

@@ -2,7 +2,8 @@ import { Inject, Injectable } from "@nestjs/common";
 import { validate } from "class-validator";
 import { OrganizationService } from "./organization.service";
 import { RightService } from "./right.service";
-import { Group } from "../contracts";
+import { IGroup } from "../contracts/models/group";
+import { Group } from "../models/group";
 
 @Injectable()
 export class GroupFactoryService {
@@ -17,7 +18,7 @@ export class GroupFactoryService {
     name: string,
     organizationId: string,
     rightIds: string[]
-  ): Promise<Group> {
+  ): Promise<IGroup> {
     const rights = await this.rightService.getBy((x) =>
       rightIds.includes(x.id)
     );

src/services/group.service.ts

@@ -1,27 +1,27 @@
 import { Inject, Injectable } from "@nestjs/common";
-import { Group } from "../contracts/models/group";
 import * as repository from "@apihub24/repository";
-import { Right } from "../contracts";
+import { IGroup } from "../contracts/models/group";
+import { IRight } from "../contracts/models/right";
 
 @Injectable()
 export class GroupService {
   constructor(
     @Inject("@apihub24/group_repository")
-    private readonly groupRepository: repository.Repository<Group>,
+    private readonly groupRepository: repository.IRepository<IGroup>,
     @Inject("@apihub24/right_repository")
-    private readonly rightRepository: repository.Repository<Right>
+    private readonly rightRepository: repository.IRepository<IRight>
   ) {}
 
-  async getBy(filter: (group: Group) => boolean): Promise<Group[]> {
+  async getBy(filter: (group: IGroup) => boolean): Promise<IGroup[]> {
     return await this.groupRepository.getBy(filter);
   }
 
-  async save(group: Group): Promise<Group | null> {
+  async save(group: IGroup): Promise<IGroup | null> {
     const groups = await this.groupRepository.save([group]);
     return groups?.length ? groups[0] : null;
   }
 
-  async delete(filter: (group: Group) => boolean): Promise<boolean> {
+  async delete(filter: (group: IGroup) => boolean): Promise<boolean> {
     return this.groupRepository.deleteBy(filter);
   }
 
@@ -49,7 +49,7 @@ export class GroupService {
   private async getGroupAndRight(
     groupId: string,
     rightId: string
-  ): Promise<[Group, Right]> {
+  ): Promise<[IGroup, IRight]> {
     const groups = await this.groupRepository.getBy((x) => x.id === groupId);
     if (!groups.length) {
       throw new Error(`group with id ${groupId} not found`);

src/services/index.ts

@@ -1,10 +0,0 @@
-export * from "./account.factory.service";
-export * from "./account.service";
-export * from "./group.factory.service";
-export * from "./group.service";
-export * from "./login.service";
-export * from "./organization.factory.service";
-export * from "./organization.service";
-export * from "./registration.service";
-export * from "./right.factory.service";
-export * from "./right.service";

src/services/login.service.ts

@@ -1,21 +1,24 @@
 import { Inject, Injectable } from "@nestjs/common";
-import * as contracts from "../contracts";
 import { AccountService } from "./account.service";
+import * as tokenService from "../contracts/services/token.service";
+import * as passwordService from "../contracts/services/password.service";
+import * as sessionService from "../contracts/services/session.service";
+import { ISignIn } from "../contracts/models/sign.in";
 
 @Injectable()
 export class LoginService {
   constructor(
     @Inject("@apihub24/token_service")
-    private readonly tokenService: contracts.TokenService,
+    private readonly tokenService: tokenService.ITokenService,
     @Inject("@apihub24/password_service")
-    private readonly passwordService: contracts.PasswordService,
+    private readonly passwordService: passwordService.IPasswordService,
     @Inject("@apihub24/session_service")
-    private readonly sessionService: contracts.SessionService,
+    private readonly sessionService: sessionService.ISessionService,
     @Inject(AccountService)
     private readonly accountService: AccountService
   ) {}
 
-  async signIn(signIn: contracts.SignIn): Promise<string> {
+  async signIn(signIn: ISignIn): Promise<string> {
     const accounts = await this.accountService.getBy(
       (x) =>
         x.accountName === signIn.accountName &&

src/services/organization.factory.service.ts

@@ -1,9 +1,10 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable } from "@nestjs/common";
-import { Organization } from '../contracts/models/organization';
+import { IOrganization } from "../contracts/models/organization";
+import { Organization } from "../models/organization";
 
 @Injectable()
 export class OrganizationFactoryService {
-  createFromName(name: string): Organization {
+  createFromName(name: string): IOrganization {
     const organization = new Organization();
     organization.name = name;
     return organization;

src/services/organization.service.ts

@@ -1,21 +1,21 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { Inject, Injectable } from "@nestjs/common";
-import * as repository from '@apihub24/repository';
+import * as repository from "@apihub24/repository";
-import { Organization } from '../contracts/models/organization';
+import { IOrganization } from "src/contracts/models/organization";
 
 @Injectable()
 export class OrganizationService {
   constructor(
-    @Inject('@apihub24/organization_repository')
+    @Inject("@apihub24/organization_repository")
-    private readonly organizationRepository: repository.Repository<Organization>,
+    private readonly organizationRepository: repository.IRepository<IOrganization>
   ) {}
 
   async getBy(
-    filter: (organization: Organization) => boolean,
+    filter: (organization: IOrganization) => boolean
-  ): Promise<Organization[]> {
+  ): Promise<IOrganization[]> {
     return await this.organizationRepository.getBy(filter);
   }
 
-  async save(organization: Organization): Promise<Organization> {
+  async save(organization: IOrganization): Promise<IOrganization> {
     const savedOrganizations = await this.organizationRepository.save([
       organization,
     ]);
@@ -26,7 +26,7 @@ export class OrganizationService {
   }
 
   async deleteBy(
-    filter: (organization: Organization) => boolean,
+    filter: (organization: IOrganization) => boolean
   ): Promise<boolean> {
     return await this.organizationRepository.deleteBy(filter);
   }

src/services/registration.service.ts

@@ -1,9 +1,9 @@
 import { Inject, Injectable } from "@nestjs/common";
-import { Account } from "../contracts/models/account";
-import { Registration } from "../contracts/models/registration";
 import * as mailVerificationService from "../contracts/services/mail.verification.service";
 import { AccountService } from "./account.service";
 import { AccountFactoryService } from "./account.factory.service";
+import { IRegistration } from "../contracts/models/registration";
+import { IAccount } from "../contracts/models/account";
 
 @Injectable()
 export class RegistrationService {
@@ -13,10 +13,10 @@ export class RegistrationService {
     @Inject(AccountFactoryService)
     private readonly accountFactory: AccountFactoryService,
     @Inject("@apihub24/mail_verification_service")
-    private readonly mailVerificationService: mailVerificationService.MailVerificationService
+    private readonly mailVerificationService: mailVerificationService.IMailVerificationService
   ) {}
 
-  async registerAccount(registration: Registration): Promise<Account | null> {
+  async registerAccount(registration: IRegistration): Promise<IAccount | null> {
     const newAccount = await this.accountFactory.createFromRegistration(
       registration
     );

src/services/right.factory.service.ts

@@ -1,10 +1,11 @@
 import { Injectable } from "@nestjs/common";
-import { Right } from "../contracts/models/right";
 import { validate } from "class-validator";
+import { IRight } from "../contracts/models/right";
+import { Right } from "../models/right";
 
 @Injectable()
 export class RightFactoryService {
-  async createRight(name: string): Promise<Right> {
+  async createRight(name: string): Promise<IRight> {
     const right = new Right();
     right.name = name;
     const validationErrors = await validate(right);

src/services/right.service.ts

@@ -1,22 +1,22 @@
-import { Right } from '../contracts/models/right';
+import { Inject, Injectable } from "@nestjs/common";
-import { Inject, Injectable } from '@nestjs/common';
+import * as repository from "@apihub24/repository";
-import * as repository from '@apihub24/repository';
+import { IRight } from "../contracts/models/right";
 
 @Injectable()
 export class RightService {
   constructor(
-    @Inject('@apihub24/right_repository')
+    @Inject("@apihub24/right_repository")
-    private readonly rightRepository: repository.Repository<Right>,
+    private readonly rightRepository: repository.IRepository<IRight>
   ) {}
 
-  async getBy(filter: (right: Right) => boolean): Promise<Right[]> {
+  async getBy(filter: (right: IRight) => boolean): Promise<IRight[]> {
     return await this.rightRepository.getBy(filter);
   }
-  async save(right: Right): Promise<Right | null> {
+  async save(right: IRight): Promise<IRight | null> {
     const rights = await this.rightRepository.save([right]);
     return rights?.length ? rights[0] : null;
   }
-  async delete(filter: (right: Right) => boolean): Promise<boolean> {
+  async delete(filter: (right: IRight) => boolean): Promise<boolean> {
     return await this.rightRepository.deleteBy(filter);
   }
 }