Circular dependency detected is fixed

Selecro · Sep 21, 2023 · d7dae81 · d7dae81
1 parent 1e01144
commit d7dae81
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 79 deletions.
diff --git a/src/controllers/user-instruction.controller.ts b/src/controllers/user-instruction.controller.ts
@@ -41,7 +41,7 @@ export class UserInstructionController {
     @repository(StepRepository) public stepRepository: StepRepository,
     @repository(UserRepository)
     protected progressRepository: ProgressRepository,
-  ) {}
+  ) { }
 
   @authenticate('jwt')
   @post('/users/{id}/instructions/{instructionId}', {
@@ -466,6 +466,68 @@ export class UserInstructionController {
     return true;
   }
 
+  @authenticate('jwt')
+  @patch('/authorizate-for-premium-instruction/{instructionId}/{userId}', {
+    responses: {
+      '200': {
+        description: 'Authorize user for premium instructions',
+        content: {
+          'application/json': {
+            schema: {
+              type: 'boolean',
+            },
+          },
+        },
+      },
+    },
+  })
+  async authorizeUserToPremiumInstruction(
+    @requestBody({
+      content: {
+        'application/json': {
+          schema: {
+            type: 'object',
+            properties: {
+              key: {type: 'string'},
+            },
+            required: ['key'],
+          },
+        },
+      },
+    })
+    request: {
+      key: string;
+    },
+    @param.query.number('instructionId') instructionId: number,
+    @param.query.number('userId') userId: number,
+  ): Promise<boolean> {
+    const user = await this.userRepository.findById(this.user.id);
+    if (!user) {
+      throw new HttpErrors.NotFound('User not found');
+    }
+    const instructionKey =
+      process.env.INSTRUCTION_KEY_PREMIUM_PERMISSIONS ?? '';
+    const keyMatch = await this.hasher.comparePassword(
+      request.key,
+      instructionKey,
+    );
+    if (!keyMatch) {
+      throw new HttpErrors.Unauthorized('Invalid password');
+    }
+    const instruction =
+      await this.instructionRepository.findById(instructionId);
+    instruction.premiumUserIds = instruction.premiumUserIds ?? [];
+    if (instruction.premiumUserIds.includes(userId)) {
+      instruction.premiumUserIds = instruction.premiumUserIds.filter(
+        id => id !== userId,
+      );
+    } else {
+      instruction.premiumUserIds.push(userId);
+    }
+    await this.instructionRepository.updateById(instructionId, instruction);
+    return true;
+  }
+
   @get('/public-instructions', {
     responses: {
       '200': {
@@ -630,63 +692,6 @@ export class UserInstructionController {
     return data;
   }
 
-  @patch('/authorizate-for-premium-instruction/{instructionId}/{userId}', {
-    responses: {
-      '200': {
-        description: 'Authorize user for premium instructions',
-        content: {
-          'application/json': {
-            schema: {
-              type: 'boolean',
-            },
-          },
-        },
-      },
-    },
-  })
-  async authorizeUserToPremiumInstruction(
-    @requestBody({
-      content: {
-        'application/json': {
-          schema: {
-            type: 'object',
-            properties: {
-              key: {type: 'string'},
-            },
-            required: ['key'],
-          },
-        },
-      },
-    })
-    request: {
-      key: string;
-    },
-    @param.query.number('instructionId') instructionId: number,
-    @param.query.number('userId') userId: number,
-  ): Promise<boolean> {
-    const instructionKey =
-      process.env.INSTRUCTION_KEY_PREMIUM_PERMISSIONS ?? '';
-    const keyMatch = await this.hasher.comparePassword(
-      request.key,
-      instructionKey,
-    );
-    if (!keyMatch) {
-      throw new HttpErrors.Unauthorized('Invalid password');
-    }
-    const instruction =
-      await this.instructionRepository.findById(instructionId);
-    instruction.premiumUserIds = instruction.premiumUserIds ?? [];
-    if (instruction.premiumUserIds.includes(userId)) {
-      instruction.premiumUserIds = instruction.premiumUserIds.filter(
-        id => id !== userId,
-      );
-    } else {
-      instruction.premiumUserIds.push(userId);
-    }
-    await this.instructionRepository.updateById(instructionId, instruction);
-    return true;
-  }
-
   private validateInstructionOwnership(instruction: Instruction): void {
     if (Number(instruction.userId) !== Number(this.user.id)) {
       throw new HttpErrors.Forbidden(

diff --git a/src/controllers/user-link.controller.ts b/src/controllers/user-link.controller.ts
@@ -16,10 +16,23 @@ export class UserLinkController {
     @repository(UserRepository) public userRepository: UserRepository,
     @repository(UserLinkRepository)
     public userLinkRepository: UserLinkRepository,
-  ) {}
+  ) { }
 
   @authenticate('jwt')
-  @post('/users/{id}/follow/{followeeId}')
+  @post('/users/{id}/follow/{followeeId}', {
+    responses: {
+      '200': {
+        description: 'Follow User',
+        content: {
+          'application/json': {
+            schema: {
+              type: 'boolean',
+            },
+          },
+        },
+      },
+    },
+  })
   async followUser(
     @param.path.number('followeeId') followeeId: number,
   ): Promise<boolean> {
@@ -39,7 +52,20 @@ export class UserLinkController {
   }
 
   @authenticate('jwt')
-  @del('/users/{id}/unfollow/{followeeId}')
+  @del('/users/{id}/unfollow/{followeeId}', {
+    responses: {
+      '200': {
+        description: 'Unfollow User',
+        content: {
+          'application/json': {
+            schema: {
+              type: 'boolean',
+            },
+          },
+        },
+      },
+    },
+  })
   async unfollowUser(
     @param.path.number('followeeId') followeeId: number,
   ): Promise<boolean> {
@@ -63,12 +89,30 @@ export class UserLinkController {
     return true;
   }
 
-  @get('/users/{id}/followers')
+  @get('/users/{userId}/followers', {
+    responses: {
+      '200': {
+        description: 'Get followers',
+        content: {
+          'application/json': {
+            schema: {
+              type: 'object',
+              properties: {
+                id: {type: 'number'},
+                username: {type: 'string'},
+                link: {type: 'string'},
+              },
+            },
+          },
+        },
+      },
+    },
+  })
   async getFollowers(
-    @param.path.number('id') userId: number,
+    @param.path.number('userId') userId: number,
     @param.query.number('limit') limit: number = 10,
     @param.query.number('offset') offset: number = 0,
-  ): Promise<User[]> {
+  ): Promise<Partial<User[]>> {
     const userLinks = await this.userLinkRepository.find({
       where: {
         followeeId: userId,
@@ -81,16 +125,49 @@ export class UserLinkController {
       where: {
         id: {inq: followerIds},
       },
+      fields: {
+        email: false,
+        passwordHash: false,
+        wrappedDEK: false,
+        initializationVector: false,
+        kekSalt: false,
+        language: false,
+        darkmode: false,
+        emailVerified: false,
+        date: false,
+        nick: false,
+        bio: false,
+        deleteHash: false,
+        favorites: false,
+      },
     });
     return followers;
   }
 
-  @get('/users/{id}/following')
-  async getFollowing(
-    @param.path.number('id') userId: number,
+  @get('/users/{userId}/followees', {
+    responses: {
+      '200': {
+        description: 'Get followees',
+        content: {
+          'application/json': {
+            schema: {
+              type: 'object',
+              properties: {
+                id: {type: 'number'},
+                username: {type: 'string'},
+                link: {type: 'string'},
+              },
+            },
+          },
+        },
+      },
+    },
+  })
+  async getFollowees(
+    @param.path.number('userId') userId: number,
     @param.query.number('limit') limit: number = 10,
     @param.query.number('offset') offset: number = 0,
-  ): Promise<User[]> {
+  ): Promise<Partial<User[]>> {
     const userLinks = await this.userLinkRepository.find({
       where: {
         followerId: userId,
@@ -103,6 +180,21 @@ export class UserLinkController {
       where: {
         id: {inq: followeeIds},
       },
+      fields: {
+        email: false,
+        passwordHash: false,
+        wrappedDEK: false,
+        initializationVector: false,
+        kekSalt: false,
+        language: false,
+        darkmode: false,
+        emailVerified: false,
+        date: false,
+        nick: false,
+        bio: false,
+        deleteHash: false,
+        favorites: false,
+      },
     });
     return following;
   }

diff --git a/src/controllers/user-progress.controller.ts b/src/controllers/user-progress.controller.ts
@@ -1,5 +1,8 @@
 import {authenticate} from '@loopback/authentication';
-import {inject} from '@loopback/core';
+import {
+  JWTService
+} from '@loopback/authentication-jwt';
+import {inject} from '@loopback/context';
 import {repository} from '@loopback/repository';
 import {
   HttpErrors,
@@ -8,16 +11,15 @@ import {
   param,
   patch,
   post,
-  requestBody,
+  requestBody
 } from '@loopback/rest';
 import {SecurityBindings, UserProfile} from '@loopback/security';
 import {Progress, ProgressRelations} from '../models';
 import {
   InstructionRepository,
   ProgressRepository,
-  UserRepository,
+  UserRepository
 } from '../repositories';
-import {JWTService} from '../services';
 
 export class UserProgressController {
   constructor(
@@ -176,7 +178,7 @@ export class UserProgressController {
   }
 
   @authenticate('jwt')
-  @get('/users/{id}/progress/{instructionId}', {
+  @get('/users/{id}/progresses/{instructionId}', {
     responses: {
       '200': {
         description: 'Progress model instance',

diff --git a/src/controllers/user.controller.ts b/src/controllers/user.controller.ts
@@ -853,7 +853,7 @@ export class UserController {
     return usernamesAndLinks;
   }
 
-  @get('/user-detail/{id}', {
+  @get('/user-detail/{userId}', {
     responses: {
       '200': {
         description: 'Get user detail',
@@ -910,7 +910,7 @@ export class UserController {
       },
     },
   })
-  async getUserDetail(@param.query.number('id') userId: number): Promise<{
+  async getUserDetail(@param.query.number('userId') userId: number): Promise<{
     user: Omit<
       User,
       | 'email'

diff --git a/src/services/jwt-service.ts b/src/services/jwt-service.ts
@@ -8,7 +8,7 @@ import {TokenObject} from '@loopback/authentication-jwt';
 import {inject} from '@loopback/core';
 import {repository} from '@loopback/repository';
 import {HttpErrors} from '@loopback/rest';
-import {securityId, UserProfile} from '@loopback/security';
+import {UserProfile, securityId} from '@loopback/security';
 import {promisify} from 'util';
 import {
   UserRepository
@@ -27,8 +27,6 @@ export class JWTService implements TokenService {
     private jwtExpiresIn: string,
     @inject('services.user.service')
     public userService: MyUserService,
-    @inject('services.jwt.service')
-    public jwtService: JWTService,
     @repository(UserRepository) protected userRepository: UserRepository,
   ) { }
 
@@ -96,7 +94,7 @@ export class JWTService implements TokenService {
       const userProfile: UserProfile =
         this.userService.convertToUserProfile(user);
       // create a JSON Web Token based on the user profile
-      const token = await this.jwtService.generateToken(userProfile);
+      const token = await this.generateToken(userProfile);
       return {
         accessToken: token,
       };