SWAP 3206 3 - Refactor jwt endpoint to provide valid jwt

src/config/configuration.ts

@@ -80,6 +80,7 @@ const configuration = () => ({
   jwt: {
     secret: process.env.JWT_SECRET,
     expiresIn: parseInt(process.env.JWT_EXPIRES_IN ?? "3600", 10),
+    neverExpires: process.env.JWT_NEVER_EXPIRES ?? "100y",
   },
   ldap: {
     server: {

src/users/users.controller.ts

@@ -299,13 +299,17 @@ export class UsersController {
     @Param("id") id: string,
     @Body() jwtProperties: CreateCustomJwt,
   ): Promise<CreateUserJWT | null> {
-    const viewedUser = (await this.usersService.findById2JWTUser(
-      id,
-    )) as JWTUser;
+    const viewedUser = (await this.usersService.findById(id)) as Omit<
+      User,
+      "password"
+    >;
 
-    return this.usersService.createCustomJWT(
-      viewedUser,
-      jwtProperties as JwtSignOptions,
-    );
+    if (viewedUser) {
+      return this.usersService.createCustomJWT(
+        JSON.parse(JSON.stringify(viewedUser)),
+        jwtProperties as JwtSignOptions,
+      );
+    }
+    return null;
   }
 }

src/users/users.service.ts

@@ -290,27 +290,27 @@ export class UsersService implements OnModuleInit {
   }
 
   async createCustomJWT(
-    user: JWTUser,
+    user: Omit<User, "password">,
     jwtProperties: JwtSignOptions,
   ): Promise<CreateUserJWT | null> {
     const signAndVerifyOptions: JwtSignOptions = {
       ...jwtProperties,
     } as JwtSignOptions;
     if (signAndVerifyOptions.expiresIn == "never") {
-      delete signAndVerifyOptions.expiresIn;
+      signAndVerifyOptions.expiresIn =
+        this.configService.get<string>("jwt.neverExpires") || "100y";
     } else if (
       typeof signAndVerifyOptions.expiresIn === "string" &&
       signAndVerifyOptions.expiresIn &&
       !isNaN(+signAndVerifyOptions.expiresIn)
     ) {
       signAndVerifyOptions.expiresIn = parseInt(signAndVerifyOptions.expiresIn);
+    } else if (!signAndVerifyOptions.expiresIn) {
+      signAndVerifyOptions.expiresIn =
+        this.configService.get<string>("jwt.expiresIn") || "1h";
     }
     signAndVerifyOptions.secret = this.configService.get<string>("jwt.secret");
-    const payload = {
-      username: user._id,
-      groups: user.currentGroups,
-    };
-    const jwtString = this.jwtService.sign(payload, signAndVerifyOptions);
+    const jwtString = this.jwtService.sign(user, signAndVerifyOptions);
     return { jwt: jwtString };
   }
 }