@vardario/cognito-client 0.2.1 → 1.0.1

package/lib/cognito-client.d.ts

@@ -134,7 +134,6 @@ export interface AuthenticationResult {
     AccessToken: string;
     ExpiresIn: number;
     IdToken: string;
-    TokenType: string;
     RefreshToken: string;
 }
 export interface AuthenticationResponse {
@@ -150,6 +149,7 @@ export interface ChallengeResponse {
         USER_ID_FOR_SRP: string;
     };
 }
+export declare function authResultToSession(authenticationResult: AuthenticationResult): Session;
 /**
  * Lightweight AWS Cogito client without any AWS SDK dependencies.
  */
@@ -161,7 +161,6 @@ export declare class CognitoClient {
     constructor({ userPoolId, userPoolClientId, endpoint, oAuth2: oAuth }: CognitoClientProps);
     static getDecodedTokenFromSession(session: Session): DecodedTokens;
     private cognitoRequest;
-    private static authResultToSession;
     /**
      *
      * Performs user authentication with username and password through ALLOW_USER_SRP_AUTH .

package/lib/cognito-client.js

@@ -33,6 +33,14 @@ export var CognitoIdentityProvider;
     CognitoIdentityProvider["Amazon"] = "LoginWithAmazon";
     CognitoIdentityProvider["Apple"] = "SignInWithApple";
 })(CognitoIdentityProvider || (CognitoIdentityProvider = {}));
+export function authResultToSession(authenticationResult) {
+    return {
+        accessToken: authenticationResult.AccessToken,
+        idToken: authenticationResult.IdToken,
+        expiresIn: new Date().getTime() + authenticationResult.ExpiresIn * 1000,
+        refreshToken: authenticationResult.RefreshToken
+    };
+}
 /**
  * Lightweight AWS Cogito client without any AWS SDK dependencies.
  */
@@ -68,14 +76,6 @@ export class CognitoClient {
         }
         return cognitoResponse.json();
     }
-    static authResultToSession(authenticationResult) {
-        return {
-            accessToken: authenticationResult.AccessToken,
-            idToken: authenticationResult.IdToken,
-            expiresIn: new Date().getMilliseconds() / 1000 + authenticationResult.ExpiresIn,
-            refreshToken: authenticationResult.RefreshToken
-        };
-    }
     /**
      *
      * Performs user authentication with username and password through ALLOW_USER_SRP_AUTH .
@@ -115,7 +115,7 @@ export class CognitoClient {
             ClientMetadata: {}
         };
         const { AuthenticationResult } = await this.cognitoRequest(respondToAuthChallengePayload, CognitoServiceTarget.RespondToAuthChallenge);
-        return CognitoClient.authResultToSession(AuthenticationResult);
+        return authResultToSession(AuthenticationResult);
     }
     /**
      *
@@ -137,7 +137,7 @@ export class CognitoClient {
             ClientMetadata: {}
         };
         const { AuthenticationResult } = (await this.cognitoRequest(initiateAuthPayload, CognitoServiceTarget.InitiateAuth));
-        const session = CognitoClient.authResultToSession(AuthenticationResult);
+        const session = authResultToSession(AuthenticationResult);
         return session;
     }
     /**
@@ -160,7 +160,7 @@ export class CognitoClient {
         if (!AuthenticationResult.RefreshToken) {
             AuthenticationResult.RefreshToken = refreshToken;
         }
-        return CognitoClient.authResultToSession(AuthenticationResult);
+        return authResultToSession(AuthenticationResult);
     }
     /**
      *
@@ -352,16 +352,15 @@ export class CognitoClient {
             },
             body: urlParams.toString()
         });
-        const { access_token, refresh_token, id_token, expires_in, token_type, error } = await response.json();
+        const { access_token, refresh_token, id_token, expires_in, error } = await response.json();
         if (error) {
             throw new Error(error);
         }
-        const session = CognitoClient.authResultToSession({
+        const session = authResultToSession({
             AccessToken: access_token,
             RefreshToken: refresh_token,
             IdToken: id_token,
-            ExpiresIn: expires_in,
-            TokenType: token_type
+            ExpiresIn: expires_in
         });
         return session;
     }

package/lib/utils.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import { BigInteger } from 'jsbn';
+import { Buffer } from 'buffer';
 export declare function padHex(bigInt: BigInteger): string;
 export declare function hashHexString(str: string): string;
 export declare function hashBuffer(buffer: Buffer): string;
@@ -9,7 +10,7 @@ export declare function calculateU(A: BigInteger, B: BigInteger): BigInteger;
 export declare function calculateS(X: BigInteger, B: BigInteger, U: BigInteger, smallA: BigInteger): BigInteger;
 export declare function calculateHKDF(ikm: Buffer, salt: Buffer): number[];
 export declare function getPasswordAuthenticationKey(poolName: string, username: string, password: string, B: BigInteger, U: BigInteger, smallA: BigInteger, salt: BigInteger): number[];
-export declare function calculateSignature(poolName: string, userId: string, secretBlock: string, hkdf: number[]): {
+export declare function calculateSignature(poolName: string, userId: string, secretBlock: string, hkdf: number[], date?: Date): {
     signature: string;
     timeStamp: string;
 };

package/lib/utils.js

@@ -1,6 +1,12 @@
 import hashJs from 'hash.js';
 import { BigInteger } from 'jsbn';
-import rb from 'randombytes';
+import { Buffer } from 'buffer';
+import formatInTimeZone from 'date-fns-tz/formatInTimeZone';
+let crypto = globalThis.crypto;
+if (!crypto) {
+    const nodeCrypto = await import('node:crypto');
+    crypto = nodeCrypto.webcrypto;
+}
 const initN = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1' +
     '29024E088A67CC74020BBEA63B139B22514A08798E3404DD' +
     'EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245' +
@@ -86,8 +92,8 @@ export function getPasswordAuthenticationKey(poolName, username, password, B, U,
     const S = calculateS(X, B, U, smallA);
     return calculateHKDF(Buffer.from(padHex(S), 'hex'), Buffer.from(padHex(U), 'hex'));
 }
-export function calculateSignature(poolName, userId, secretBlock, hkdf) {
-    const timeStamp = formatTimestamp(new Date());
+export function calculateSignature(poolName, userId, secretBlock, hkdf, date = new Date()) {
+    const timeStamp = formatTimestamp(date);
     const concatBuffer = Buffer.concat([
         Buffer.from(poolName, 'utf8'),
         Buffer.from(userId, 'utf8'),
@@ -112,20 +118,8 @@ export function decodeJwt(jwt) {
     };
 }
 export async function randomBytes(num) {
-    return rb(num);
+    return Buffer.from(crypto.getRandomValues(new Uint8Array(num)));
 }
 export function formatTimestamp(date) {
-    return `${new Intl.DateTimeFormat('default', {
-        weekday: 'short'
-    }).format(date)} ${new Intl.DateTimeFormat('default', {
-        month: 'short'
-    }).format(date)} ${new Intl.DateTimeFormat('default', {
-        day: '2-digit'
-    }).format(date)} ${new Intl.DateTimeFormat('default', {
-        hour: '2-digit',
-        minute: '2-digit',
-        second: '2-digit'
-    }).format(date)} UTC ${new Intl.DateTimeFormat('default', {
-        year: 'numeric'
-    }).format(date)}`;
+    return formatInTimeZone(date, 'UTC', "EEE MMM d HH:mm:ss 'UTC' yyyy");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vardario/cognito-client",
-  "version": "0.2.1",
+  "version": "1.0.1",
   "description": "",
   "license": "MIT",
   "author": "Sahin Vardar",
@@ -22,30 +22,30 @@
   },
   "dependencies": {
     "buffer": "^6.0.3",
+    "date-fns-tz": "^2.0.0",
     "hash.js": "^1.1.7",
-    "jsbn": "^1.1.0",
-    "randombytes": "^2.1.0"
+    "jsbn": "^1.1.0"
   },
   "devDependencies": {
-    "@aws-sdk/client-cognito-identity-provider": "^3.209.0",
-    "@types/jsbn": "^1.2.30",
-    "@types/jsdom": "^20.0.1",
-    "@types/randombytes": "^2.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.5",
-    "@typescript-eslint/parser": "^5.59.5",
-    "eslint": "^8.40.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-unused-imports": "^2.0.0",
-    "husky": "^8.0.0",
+    "@aws-sdk/client-cognito-identity-provider": "^3.454.0",
+    "@types/jsbn": "^1.2.33",
+    "@types/jsdom": "^21.1.5",
+    "@types/randombytes": "^2.0.3",
+    "@typescript-eslint/eslint-plugin": "^6.11.0",
+    "@typescript-eslint/parser": "^6.11.0",
+    "eslint": "^8.54.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-unused-imports": "^3.0.0",
+    "husky": "^8.0.3",
     "isomorphic-fetch": "^3.0.0",
-    "jsdom": "^20.0.2",
-    "lint-staged": "^13.2.2",
-    "prettier": "^2.8.8",
+    "jsdom": "^22.1.0",
+    "lint-staged": "^15.1.0",
+    "prettier": "^3.1.0",
     "prettier-package-json": "^2.8.0",
-    "semantic-release": "^22.0.7",
-    "testcontainers": "^9.0.0",
-    "typescript": "^5.1.3",
-    "vitest": "^0.31.0"
+    "semantic-release": "^22.0.8",
+    "testcontainers": "^10.2.2",
+    "typescript": "^5.2.2",
+    "vitest": "^0.34.6"
   },
   "lint-staged": {
     "*": [
@@ -54,5 +54,5 @@
     ],
     "package.json": "prettier-package-json --write"
   },
-  "packageManager": "pnpm@8.6.0"
+  "packageManager": "pnpm@8.10.5"
 }