Merge pull request #404 from SciCatProject/fix-token-expiry-date

fix: fix token expiry date
SciCatProject · Mar 28, 2023 · 4145dba · 4145dba
2 parents 7b8c49b + 1144ca5
commit 4145dba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -35,8 +35,8 @@ export class AuthService {
   }
 
   async login(user: Omit<User, "password">): Promise<Record<string, unknown>> {
-    const accessToken = this.jwtService.sign(user);
     const expiresIn = this.configService.get<number>("jwt.expiresIn");
+    const accessToken = this.jwtService.sign(user, { expiresIn });
     return {
       access_token: accessToken,
       id: accessToken,

diff --git a/src/policies/policies.service.ts b/src/policies/policies.service.ts
@@ -113,10 +113,15 @@ export class PoliciesService implements OnModuleInit {
   }
 
   async create(createPolicyDto: CreatePolicyDto): Promise<Policy> {
-    const username = (this.request.user as JWTUser).username;
+    const username = (this.request.user as JWTUser)?.username;
+    if (!username) {
+      throw new UnauthorizedException("User not present in the request");
+    }
+
     const createdPolicy = new this.policyModel(
       addCreatedByFields(createPolicyDto, username),
     );
+
     return createdPolicy.save();
   }
 

diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts
@@ -10,6 +10,7 @@ import {
   UseInterceptors,
   Put,
   UnauthorizedException,
+  Body,
 } from "@nestjs/common";
 import { ApiBearerAuth, ApiBody, ApiTags } from "@nestjs/swagger";
 import { Action } from "src/casl/action.enum";
@@ -105,7 +106,7 @@ export class UsersController {
   @Put("/:id/settings")
   async updateSettings(
     @Param("id") userId: string,
-    updateUserSettingsDto: UpdateUserSettingsDto,
+    @Body() updateUserSettingsDto: UpdateUserSettingsDto,
   ): Promise<UserSettings | null> {
     return this.usersService.findOneAndUpdateUserSettings(
       userId,