sign in moved from auth to employee

hmbanan666 · hmbanan666 · commit 7e7f8b6285a5 · 2024-01-10T19:30:05.000+02:00
diff --git a/sdk/core.ts b/sdk/core.ts
@@ -1,12 +1,12 @@
 import type { AvatarParams } from './types/objects';
-import { SignInByEmailRequest, SignInByEmailResponse } from './endpoints';
 import { NextFetchRequestConfig } from './types/next';
 import { JWTEmployeeAccessTokenPayload } from './types/jwt';
 import { ErrorBase } from './errors';
 import {
   ChannelEntity,
   CheckoutEntity,
   ClientEntity,
+  EmployeeEntity,
   MediaEntity,
   MenuCategoryEntity,
   MenuEntity,
@@ -29,6 +29,7 @@ export class MainAPI {
   public readonly checkout: CheckoutEntity;
   public readonly product: ProductEntity;
   public readonly productVariant: ProductVariantEntity;
+  public readonly employee: EmployeeEntity;
 
   constructor(apiUrl: string, apiToken: string) {
     this.apiUrl = apiUrl;
@@ -43,6 +44,7 @@ export class MainAPI {
     this.checkout = new CheckoutEntity(apiUrl, apiToken);
     this.product = new ProductEntity(apiUrl, apiToken);
     this.productVariant = new ProductVariantEntity(apiUrl, apiToken);
+    this.employee = new EmployeeEntity(apiUrl, apiToken);
   }
 
   public async getApiVersion(externalConfig?: NextFetchRequestConfig) {
@@ -54,18 +56,6 @@ export class MainAPI {
     );
   }
 
-  public async signInEmployeeByEmail(
-    data: SignInByEmailRequest,
-    externalConfig?: NextFetchRequestConfig,
-  ) {
-    return this.request<SignInByEmailResponse>(
-      'auth/employee/email',
-      'POST',
-      data,
-      externalConfig,
-    );
-  }
-
   public async verifyToken(
     token: string,
     externalConfig?: NextFetchRequestConfig,
diff --git a/sdk/endpoints/auth.ts b/sdk/endpoints/auth.ts
diff --git a/sdk/endpoints/employee.ts b/sdk/endpoints/employee.ts
@@ -29,6 +29,7 @@ export type EmployeeCreateResponse = {
   result: Employee;
 };
 
+// ---------------------------------------------------- //
 export const EmployeeContactCreateRequestSchema = z.object({
   employeeId: z.string(),
   type: z.string(),
@@ -44,6 +45,7 @@ export type EmployeeContactCreateResponse = {
   result: EmployeeContact;
 };
 
+// ---------------------------------------------------- //
 export const EmployeePasswordCreateRequestSchema = z.object({
   employeeId: z.string(),
   password: z.string(),
@@ -56,6 +58,7 @@ export type EmployeePasswordCreateResponse = {
   ok: boolean;
 };
 
+// ---------------------------------------------------- //
 export const EmployeePermissionCreateRequestSchema = z.object({
   employeeId: z.string(),
   type: z.enum(employeePermissionTypes as [string, ...string[]]),
@@ -68,3 +71,17 @@ export type EmployeePermissionCreateResponse = {
   ok: boolean;
   result: EmployeePermission;
 };
+
+// ---------------------------------------------------- //
+export const SignInByEmailRequestSchema = z.object({
+  email: z.string().email(),
+  password: z.string().min(6),
+});
+
+export type SignInByEmailRequest = z.infer<typeof SignInByEmailRequestSchema>;
+export type SignInByEmailResponse = {
+  ok: boolean;
+  result: {
+    access_token: string;
+  };
+};
diff --git a/sdk/endpoints/index.ts b/sdk/endpoints/index.ts
@@ -1,5 +1,4 @@
 export * from './product';
-export * from './auth';
 export * from './media';
 export * from './checkout';
 export * from './shop';
diff --git a/sdk/entities/EmployeeEntity.ts b/sdk/entities/EmployeeEntity.ts
@@ -0,0 +1,46 @@
+import { SignInByEmailRequest, SignInByEmailResponse } from '../endpoints';
+import { NextFetchRequestConfig } from '../types/next';
+import { ErrorBase } from '../errors';
+import { fetchAPI } from '../fetchAPI';
+
+export class EmployeeEntity {
+  private readonly apiUrl: string;
+  private readonly apiToken: string;
+
+  constructor(apiUrl: string, apiToken: string) {
+    this.apiUrl = apiUrl;
+    this.apiToken = apiToken;
+  }
+
+  private async request<T, E = ErrorBase>(
+    endpoint: string,
+    method: 'POST' | 'GET' | 'PATCH' = 'POST',
+    data?: unknown,
+    externalConfig?: NextFetchRequestConfig,
+  ): Promise<T | E> {
+    return fetchAPI<T, E>(
+      {
+        token: this.apiToken,
+        url: this.apiUrl,
+      },
+      endpoint,
+      {
+        body: JSON.stringify(data),
+        method,
+      },
+      externalConfig,
+    );
+  }
+
+  public async signInByEmail(
+    data: SignInByEmailRequest,
+    externalConfig?: NextFetchRequestConfig,
+  ) {
+    return this.request<SignInByEmailResponse>(
+      'employee/email',
+      'POST',
+      data,
+      externalConfig,
+    );
+  }
+}
diff --git a/sdk/entities/index.ts b/sdk/entities/index.ts
@@ -7,3 +7,4 @@ export { MenuCategoryEntity } from './MenuCategoryEntity';
 export { CheckoutEntity } from './CheckoutEntity';
 export { ProductEntity } from './ProductEntity';
 export { ProductVariantEntity } from './ProductVariantEntity';
+export { EmployeeEntity } from './EmployeeEntity';
diff --git a/sdk/package.json b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next-orders/api-sdk",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "TS Lib: Easy ability to make requests to Main API via NPM package. 100% typed.",
   "scripts": {
     "build": "tsup",
diff --git a/src/core/auth/auth.controller.ts b/src/core/auth/auth.controller.ts
@@ -1,17 +1,5 @@
-import {
-  BadRequestException,
-  Body,
-  Controller,
-  Get,
-  HttpCode,
-  HttpStatus,
-  Param,
-  Post,
-  UnauthorizedException,
-} from '@nestjs/common';
+import { BadRequestException, Controller, Get, Param } from '@nestjs/common';
 import { AuthService } from '@/core/auth/auth.service';
-import { SignInByEmailDto } from '@/core/auth/dto/signin-by-email.dto';
-import { SignInByEmailResponse } from '../../../sdk/endpoints';
 import { Public } from '@/core/auth/auth.decorator';
 import { ConfigService } from '@nestjs/config';
 
@@ -33,20 +21,6 @@ export class AuthController {
     return payload;
   }
 
-  @Public()
-  @HttpCode(HttpStatus.OK)
-  @Post('employee/email')
-  async signInByEmail(
-    @Body() dto: SignInByEmailDto,
-  ): Promise<SignInByEmailResponse> {
-    const jwt = await this.service.signInByEmail(dto);
-    if (!jwt) {
-      throw new UnauthorizedException();
-    }
-
-    return jwt;
-  }
-
   @Public()
   @Get('employee/demo')
   async getDemoSignIn() {
diff --git a/src/core/auth/auth.module.ts b/src/core/auth/auth.module.ts
@@ -1,12 +1,11 @@
 import { Module } from '@nestjs/common';
-import { PrismaService } from '@/db/prisma.service';
 import { AuthController } from '@/core/auth/auth.controller';
 import { AuthService } from '@/core/auth/auth.service';
-import { EmployeeService } from '@/core/employee/employee.service';
 import { JwtService } from '@nestjs/jwt';
 
 @Module({
   controllers: [AuthController],
-  providers: [AuthService, EmployeeService, PrismaService, JwtService],
+  providers: [AuthService, JwtService],
+  exports: [AuthService],
 })
 export class AuthModule {}
diff --git a/src/core/auth/auth.service.ts b/src/core/auth/auth.service.ts
@@ -7,17 +7,12 @@ import type {
   JWTEmployeeAccessTokenPayload,
   JWTEmployeeData,
 } from '@api-sdk';
-import { PrismaService } from '@/db/prisma.service';
-import { EmployeeService } from '@/core/employee/employee.service';
-import { SignInByEmailDto } from '@/core/auth/dto/signin-by-email.dto';
 
 @Injectable()
 export class AuthService {
   constructor(
     private readonly config: ConfigService,
-    private readonly employee: EmployeeService,
     private readonly jwt: JwtService,
-    private readonly prisma: PrismaService,
   ) {}
 
   async verifyToken(token: string) {
@@ -38,32 +33,13 @@ export class AuthService {
     }
   }
 
-  async signInByEmail(dto: SignInByEmailDto) {
-    const employee = await this.employee.findEmployeeByContact(
-      dto.email,
-      'EMAIL',
-    );
-    if (!employee) {
-      return null;
-    }
-
-    const isPasswordValid = await this.employee.checkPassword(
-      employee.id,
-      dto.password,
-    );
-    if (!isPasswordValid) {
-      return null;
-    }
-
-    // Get all Permissions
-    const permissions = employee.permissions.map(
-      (p: { type: EmployeePermissionType }) => p.type,
-    );
-
-    // Generate a JWT
+  async createToken(
+    userId: string,
+    permissions: EmployeePermissionType[],
+  ): Promise<string> {
     const sub = createId();
     const user: JWTEmployeeData = {
-      id: employee.id,
+      id: userId,
       permissions,
     };
 
@@ -72,15 +48,8 @@ export class AuthService {
       user,
     };
 
-    const access_token = await this.jwt.signAsync(payload, {
+    return this.jwt.signAsync(payload, {
       secret: this.config.getOrThrow('JWT_SECRET'),
     });
-
-    return {
-      ok: true,
-      result: {
-        access_token,
-      },
-    };
   }
 }
diff --git a/src/core/channel/channel.mapper.ts b/src/core/channel/channel.mapper.ts
@@ -3,7 +3,7 @@ import { ChannelEntity } from '@/core/channel/channel.entity';
 import { CountryCode, CurrencyCode, LanguageCode } from '@api-sdk';
 import { PrismaModels } from '@/db/prisma.service';
 
-type ModelChannel = PrismaModels['Channel'];
+export type ModelChannel = PrismaModels['Channel'];
 
 @Injectable()
 export class ChannelMapper {
diff --git a/src/core/channel/channel.service.spec.ts b/src/core/channel/channel.service.spec.ts
@@ -3,13 +3,13 @@ import { Provider } from '@nestjs/common';
 import { ChannelService } from '@/core/channel/channel.service';
 import { ChannelRepository } from '@/core/channel/channel.repository';
 import { CreateChannelDto } from '@/core/channel/dto/create-channel.dto';
-import { ChannelMapper } from '@/core/channel/channel.mapper';
+import { ChannelMapper, ModelChannel } from '@/core/channel/channel.mapper';
 
 describe('ChannelService', () => {
   let service: ChannelService;
   let repo: jest.Mocked<ChannelRepository>;
 
-  const testChannelInDB = {
+  const testChannelInDB: ModelChannel = {
     id: '1',
     name: 'Channel1',
     slug: 'test',
@@ -34,7 +34,7 @@ describe('ChannelService', () => {
     name: 'Test Channel',
     description: 'This is a test channel',
     currencyCode: 'USD',
-    languageCode: 'en',
+    languageCode: 'EN',
     countryCode: 'US',
   };
 
@@ -56,44 +56,44 @@ describe('ChannelService', () => {
     repo = moduleRef.get(ChannelRepository);
   });
 
-  it('should be defined', () => {
+  it('Should be defined', () => {
     expect(service).toBeDefined();
   });
 
-  describe('findAllChannels', () => {
-    it('should return all channels', async () => {
+  describe('#findAllChannels', () => {
+    it('Should return all channels', async () => {
       repo.findAll.mockResolvedValue(testChannelEntities);
 
       const result = await service.findAllChannels();
       expect(result).toEqual(testChannelEntities);
     });
 
-    it('should return empty array if no channels are found', async () => {
+    it('Should return empty array if no channels are found', async () => {
       repo.findAll.mockResolvedValue([]);
 
       const result = await service.findAllChannels();
       expect(result).toEqual([]);
     });
   });
 
-  describe('findChannelById', () => {
-    it('should return null if no Channel is found', async () => {
+  describe('#findChannelById', () => {
+    it('Should return null if no Channel is found', async () => {
       repo.findById.mockResolvedValue(null);
 
       const result = await service.findChannelById('test-id');
       expect(result).toBeNull();
     });
 
-    it('should return a Channel if found', async () => {
+    it('Should return a Channel if found', async () => {
       repo.findById.mockResolvedValue(testChannelEntity);
 
       const result = await service.findChannelById('test-id');
       expect(result).toEqual(testChannelEntity);
     });
   });
 
-  describe('createChannel', () => {
-    it('should create a new channel', async () => {
+  describe('#createChannel', () => {
+    it('Should create a new channel', async () => {
       repo.create.mockResolvedValueOnce(testChannelEntity);
 
       const result = await service.createChannel(testCreateChannelDto);
diff --git a/src/core/employee/dto/index.ts b/src/core/employee/dto/index.ts
@@ -2,3 +2,4 @@ export { CreateEmployeeDto } from './create-employee.dto';
 export { CreateEmployeeContactDto } from './create-employee-contact.dto';
 export { CreateEmployeePasswordDto } from './create-employee-password.dto';
 export { CreateEmployeePermissionDto } from './create-employee-permission.dto';
+export { SignInByEmailDto } from './signin-by-email.dto';
diff --git a/src/core/employee/dto/signin-by-email.dto.ts b/src/core/employee/dto/signin-by-email.dto.ts
diff --git a/src/core/employee/employee.controller.ts b/src/core/employee/employee.controller.ts
diff --git a/src/core/employee/employee.module.ts b/src/core/employee/employee.module.ts
diff --git a/src/core/employee/employee.service.ts b/src/core/employee/employee.service.ts
diff --git a/test/channel.e2e-spec.ts b/test/channel.e2e-spec.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`export * from './product';`
`2`		`-export * from './auth';`
`3`	`2`	`export * from './media';`
`4`	`3`	`export * from './checkout';`
`5`	`4`	`export * from './shop';`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next-orders/api-sdk",`
`3`		`- "version": "0.3.4",`
	`3`	`+ "version": "0.3.5",`
`4`	`4`	`"description": "TS Lib: Easy ability to make requests to Main API via NPM package. 100% typed.",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "tsup",`