[MISC][DH] fix prettier issues

Author: trung hieu dao

src/corppass/corppass-helper-ndi.ts

@@ -2,12 +2,12 @@ import { AxiosInstance, AxiosProxyConfig } from "axios";
 import * as querystringUtil from "querystring";
 import { createClient } from "../client/axios-client";
 import { JweUtil } from "../util";
+import { DateUtils } from "../util/DateUtils";
 import { SingpassMyInfoError } from "../util/error/SingpassMyinfoError";
-import { logger } from "../util/Logger";
-import { AuthInfo, EntityInfo, EserviceAuthResultRow, TokenResponse, TPAccessInfo, UserInfo } from "./shared-constants";
 import { Key } from "../util/KeyUtil";
+import { logger } from "../util/Logger";
 import { createClientAssertion } from "../util/SigningUtil";
-import { DateUtils } from "../util/DateUtils";
+import { AuthInfo, EntityInfo, EserviceAuthResultRow, TokenResponse, TPAccessInfo, UserInfo } from "./shared-constants";
 
 interface AccessTokenPayload {
 	exp: number;
@@ -179,7 +179,7 @@ export class NdiOidcHelper {
 			if (error) {
 				throw error;
 			} else {
-				throw new SingpassMyInfoError('could not verify with any key');
+				throw new SingpassMyInfoError("could not verify with any key");
 			}
 		} catch (e) {
 			logger.error("Failed to get access token payload", e);
@@ -219,7 +219,7 @@ export class NdiOidcHelper {
 			if (error) {
 				throw error;
 			} else {
-				throw new SingpassMyInfoError('could not verify with any key');
+				throw new SingpassMyInfoError("could not verify with any key");
 			}
 		} catch (e) {
 			logger.error("Failed to get ID token payload", e);

src/singpass/__tests__/singpass-helper-ndi.ext.spec.ts

@@ -1,9 +1,10 @@
 import * as jwt from "jsonwebtoken";
+import { generators } from "openid-client";
 import { KeyFormat } from "../../util/KeyUtil";
 import { logger } from "../../util/Logger";
 import { NdiOidcHelper, NdiOidcHelperConstructor } from "../singpass-helper-ndi";
 import { configs } from "./test.configs";
-import { generators } from "openid-client";
+
 const expectedUinfin = ""; // FIXME: fill in with expected uinfin
 
 /**
@@ -32,7 +33,7 @@ describe.skip("Singpass NDI OIDC integration", () => {
 
 	describe("integration tester for Ndi OIDC", () => {
 		describe("construct authorization url", () => {
-		it("should successfully construct authorization url", async () => {
+			it("should successfully construct authorization url", async () => {
 				await constructAuthorizationUrlHelper();
 			});
 		});
@@ -54,7 +55,7 @@ describe.skip("Singpass NDI OIDC integration", () => {
 		});
 
 		describe("get user identity after successful redirect with auth code", () => {
-		it("should successfully extract nric and uuid", async () => {
+			it("should successfully extract nric and uuid", async () => {
 				const authCode = ""; // FIXME: fill in with authCode
 				const codeVerifier = ""; // FIXME: fill in with codeVerifier
 				const nric = await extractNricHelper(authCode, codeVerifier);
@@ -74,16 +75,16 @@ describe.skip("Singpass NDI OIDC integration", () => {
 	};
 
 	const extractNricHelper = async (authCode: string, codeVerifier?: string) => {
-			const spNdiHelper = new NdiOidcHelper(props);
+		const spNdiHelper = new NdiOidcHelper(props);
 
 		const tokens = await spNdiHelper.getTokens(authCode, codeVerifier);
-			logger.debug("tokens", tokens);
+		logger.debug("tokens", tokens);
 
-			const tokenPayload = await spNdiHelper.getIdTokenPayload(tokens);
-			logger.debug("tokenPayload", tokenPayload);
+		const tokenPayload = await spNdiHelper.getIdTokenPayload(tokens);
+		logger.debug("tokenPayload", tokenPayload);
 
-			const { nric } = await spNdiHelper.extractNricAndUuidFromPayload(tokenPayload);
-			logger.debug("nric", nric);
+		const { nric } = await spNdiHelper.extractNricAndUuidFromPayload(tokenPayload);
+		logger.debug("nric", nric);
 
 		return nric;
 	};

src/singpass/__tests__/test.configs.ts

@@ -15,11 +15,11 @@ export const configs = {
 		redirectUri: getValueFromEnv("SINGPASS_AUTH_REDIRECT_URL"),
 		jweDecryptKey: {
 			key: getValueFromEnv("SINGPASS_AUTH_JWE_DECRYPT_KEY"),
-			format: getValueFromEnv("SINGPASS_AUTH_JWE_DECRYPT_KEY_FORMAT")
+			format: getValueFromEnv("SINGPASS_AUTH_JWE_DECRYPT_KEY_FORMAT"),
 		},
 		clientAssertionSignKey: {
 			key: getValueFromEnv("SINGPASS_AUTH_CLIENT_ASSERTION_SIGN_KEY"),
 			alg: getValueFromEnv("SINGPASS_AUTH_CLIENT_ASSERTION_SIGN_KEY_ALG"),
-		}
-	}
+		},
+	},
 };

src/util/__tests__/JweUtil.spec.ts

@@ -1,8 +1,8 @@
 /* eslint-disable max-len */
 import * as jose from "node-jose";
 import { TokenResponse } from "../../singpass/shared-constants";
-import { decryptJWE, extractJwtHeader, extractKidFromIdToken } from "../JweUtil";
 import { SingpassMyInfoError } from "../error/SingpassMyinfoError";
+import { decryptJWE, extractJwtHeader, extractKidFromIdToken } from "../JweUtil";
 
 describe("extractJwtHeader", () => {
 	it("should extract JWT header", () => {
@@ -54,7 +54,7 @@ fdescribe("decryptJWE", () => {
 			d: "4yo4UhZCl7wrfi1Wi5TzHUMfDNhN_aUn-kNM4zJvsaM",
 			use: "enc",
 			kid: "MatchingKey",
-			alg: "ECDH-ES+A128KW"
+			alg: "ECDH-ES+A128KW",
 		};
 		const jwks = JSON.stringify({
 			keys: [
@@ -64,9 +64,9 @@ fdescribe("decryptJWE", () => {
 				},
 				{
 					...jwkKey,
-					kid: "NonMatchingKey"
-				}
-			]
+					kid: "NonMatchingKey",
+				},
+			],
 		});
 		const jwk = JSON.stringify({ ...jwkKey, kid: "MatchingKey" });
 		const payload = JSON.stringify({ foo: "bar" });