Merge branch 'master' into MOL-13183

Author: ryhuz

CHANGELOG.md

@@ -2,11 +2,15 @@
 
 ## 9.0.0
 
--   Update convenience test suite to include SingPass login with PKCE
 -   **[BREAKING]** `NdiOidcHelper.constructAuthorizationUrl` now requires `nonce` (previously optional) and `userInfoScope` (new) params
 -   Deprecated `NdiOidcHelper.getIdTokenPayload` and `NdiOidcHelper.extractNricAndUuidFromPayload` as they are not needed for NDI PKCE flow
 -   Added `NdiOidcHelper.getUserInfo` to fetch myinfo data from NDI instead of MyInfo
 
+## 8.4.7
+
+-   Update convenience test suite to include SingPass login with PKCE
+-   Update axios to v1.8.3
+
 ## 8.4.6
 
 -   Add `codeVerifier` for new singpass integration

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@govtechsg/singpass-myinfo-oidc-helper",
-	"version": "8.4.6",
+	"version": "8.4.7",
 	"description": "Helper for building a Relying Party to integrate with Singpass OIDC and MyInfo person basic API",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package.json

@@ -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/corppass/corppass-helper-ndi.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
 
 /**