@vardario/cognito-client 1.0.1 → 2.1.0

package/README.md

@@ -1,3 +1,4 @@
 # Cognito Client
 
 A lightweight cognito client implementation which support SRP authentication.
+Works in node and the browser.

package/lib/cognito-client.d.ts

@@ -1,7 +1,158 @@
+export interface CognitoBaseRequest {
+    ClientId: string;
+    ClientMetadata?: Record<string, string>;
+    AnalyticsMetadata?: {
+        AnalyticsEndpointId: string;
+    };
+    UserContextData?: {
+        EncodedData?: string;
+        IpAddress?: string;
+    };
+}
+export interface AuthIntiUserSrpRequest extends CognitoBaseRequest {
+    AuthFlow: 'USER_SRP_AUTH';
+    AuthParameters: {
+        USERNAME: string;
+        SRP_A: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface AuthIntiUserPasswordRequest extends CognitoBaseRequest {
+    AuthFlow: 'USER_PASSWORD_AUTH';
+    AuthParameters: {
+        USERNAME: string;
+        PASSWORD: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface AuthIntiRefreshTokenRequest extends CognitoBaseRequest {
+    AuthFlow: 'REFRESH_TOKEN_AUTH';
+    AuthParameters: {
+        REFRESH_TOKEN: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface AuthIntiCustomAuthRequest extends CognitoBaseRequest {
+    AuthFlow: 'CUSTOM_AUTH';
+    AuthParameters: {
+        USERNAME: string;
+        SECRET_HASH?: string;
+    };
+}
+export type AuthIntiRequest = AuthIntiUserSrpRequest | AuthIntiRefreshTokenRequest | AuthIntiCustomAuthRequest | AuthIntiUserPasswordRequest;
+export interface RespondToAuthChallengeBaseRequest extends CognitoBaseRequest {
+    Session?: string;
+}
+export interface RespondToAuthChallengePasswordVerifierRequest extends RespondToAuthChallengeBaseRequest {
+    ChallengeName: 'PASSWORD_VERIFIER';
+    ChallengeResponses: {
+        USERNAME: string;
+        PASSWORD_CLAIM_SECRET_BLOCK: string;
+        PASSWORD_CLAIM_SIGNATURE: string;
+        TIMESTAMP: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface RespondToAuthChallengeSmsMfaRequest extends RespondToAuthChallengeBaseRequest {
+    ChallengeName: 'SMS_MFA';
+    ChallengeResponses: {
+        USERNAME: string;
+        SMS_MFA_CODE: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface RespondToAuthChallengeCustomChallengeNameRequest extends RespondToAuthChallengeBaseRequest {
+    ChallengeName: 'CUSTOM_CHALLENGE';
+    ChallengeResponses: {
+        USERNAME: string;
+        ANSWER: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface RespondToAuthChallengeNewPasswordRequiredRequest extends RespondToAuthChallengeBaseRequest {
+    ChallengeName: 'NEW_PASSWORD_REQUIRED';
+    ChallengeResponses: {
+        USERNAME: string;
+        NEW_PASSWORD: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface RespondToAuthChallengeSoftwareTokenMfaRequest extends RespondToAuthChallengeBaseRequest {
+    ChallengeName: 'SOFTWARE_TOKEN_MFA';
+    ChallengeResponses: {
+        USERNAME: string;
+        SOFTWARE_TOKEN_MFA_CODE: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface RespondToAuthChallengeDeviceSrpAuthRequest extends RespondToAuthChallengeBaseRequest {
+    ChallengeName: 'DEVICE_SRP_AUTH';
+    ChallengeResponses: {
+        USERNAME: string;
+        SRP_A: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface RespondToAuthChallengeDevicePasswordVerifierRequest extends RespondToAuthChallengeBaseRequest {
+    ChallengeName: 'DEVICE_PASSWORD_VERIFIER';
+    ChallengeResponses: {
+        USERNAME: string;
+        PASSWORD_CLAIM_SECRET_BLOCK: string;
+        PASSWORD_CLAIM_SIGNATURE: string;
+        TIMESTAMP: string;
+        DEVICE_KEY: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface RespondToAuthChallengeMfaSetupRequest extends RespondToAuthChallengeBaseRequest {
+    ChallengeName: 'MFA_SETUP';
+    ChallengeResponses: {
+        USERNAME: string;
+        SMS_MFA_CODE?: string;
+        SOFTWARE_TOKEN_MFA_CODE?: string;
+        SECRET_HASH?: string;
+    };
+}
+export interface RespondToAuthChallengeSelectMfaTypeRequest extends RespondToAuthChallengeBaseRequest {
+    ChallengeName: 'SELECT_MFA_TYPE';
+    ChallengeResponses: {
+        USERNAME: string;
+        SOFTWARE_TOKEN_MFA_CODE?: string;
+        SECRET_HASH?: string;
+    };
+}
+export type RespondToAuthChallengeRequest = RespondToAuthChallengePasswordVerifierRequest | RespondToAuthChallengeSmsMfaRequest | RespondToAuthChallengeCustomChallengeNameRequest | RespondToAuthChallengeNewPasswordRequiredRequest | RespondToAuthChallengeSoftwareTokenMfaRequest | RespondToAuthChallengeDeviceSrpAuthRequest | RespondToAuthChallengeDevicePasswordVerifierRequest | RespondToAuthChallengeMfaSetupRequest | RespondToAuthChallengeSelectMfaTypeRequest;
 export interface UserAttribute {
     Name: string;
     Value: string;
 }
+export interface ConfirmForgotPasswordRequest extends CognitoBaseRequest {
+    ConfirmationCode: string;
+    Password: string;
+    Username: string;
+    SecretHash?: string;
+}
+export interface ConfirmSignUpRequest extends CognitoBaseRequest {
+    ConfirmationCode: string;
+    Username: string;
+    SecretHash?: string;
+    ForceAliasCreation?: boolean;
+}
+export interface ForgotPasswordRequest extends CognitoBaseRequest {
+    Username: string;
+    SecretHash?: string;
+}
+export interface SignUpRequest extends CognitoBaseRequest {
+    Username: string;
+    Password: string;
+    SecretHash?: string;
+    UserAttributes?: UserAttribute[];
+    ValidationData?: UserAttribute[];
+}
+export interface ResendConfirmationCodeRequest extends CognitoBaseRequest {
+    Username: string;
+    SecretHash?: string;
+}
 /**
  * Cognito related OAuth props.
  */
@@ -43,6 +194,10 @@ export interface CognitoClientProps {
      * Cognito OAuth related options. See @see OAuthProps .
      */
     oAuth2?: OAuth2Props;
+    /**
+     * Optional Cognito User Pool Client Secret.
+     */
+    clientSecret?: string;
 }
 /**
  * Cognito User Session
@@ -150,6 +305,7 @@ export interface ChallengeResponse {
     };
 }
 export declare function authResultToSession(authenticationResult: AuthenticationResult): Session;
+export declare function cognitoRequest(body: object, serviceTarget: CognitoServiceTarget, cognitoEndpoint: string): Promise<any>;
 /**
  * Lightweight AWS Cogito client without any AWS SDK dependencies.
  */
@@ -158,9 +314,9 @@ export declare class CognitoClient {
     private readonly cognitoPoolName;
     private readonly userPoolClientId;
     private readonly oAuth?;
-    constructor({ userPoolId, userPoolClientId, endpoint, oAuth2: oAuth }: CognitoClientProps);
+    private readonly clientSecret?;
+    constructor({ userPoolId, userPoolClientId, endpoint, oAuth2: oAuth, clientSecret }: CognitoClientProps);
     static getDecodedTokenFromSession(session: Session): DecodedTokens;
-    private cognitoRequest;
     /**
      *
      * Performs user authentication with username and password through ALLOW_USER_SRP_AUTH .
@@ -168,7 +324,8 @@ export declare class CognitoClient {
      *
      * @param username Username
      * @param password Password
-     * @throws {CognitoException}
+     *
+     * @throws {InitiateAuthException}
      */
     authenticateUserSrp(username: string, password: string): Promise<Session>;
     /**
@@ -178,23 +335,24 @@ export declare class CognitoClient {
      *
      * @param username Username
      * @param password Password
-     * @throws {CognitoException}
+     * @throws {InitiateAuthException}
      */
     authenticateUser(username: string, password: string): Promise<Session>;
     /**
      * Returns a new session based on the given refresh token.
      *
      * @param refreshToken
+     * @param username
      * @returns @see Session
-     * @throws {CognitoError}
+     * @throws {InitiateAuthException}
      */
-    refreshSession(refreshToken: string): Promise<Session>;
+    refreshSession(refreshToken: string, username?: string): Promise<Session>;
     /**
      *
      * @param username Username
      * @param password Password
      *
-     * @throws {CognitoException}
+     * @throws {SignUpException}
      */
     signUp(username: string, password: string, userAttributes?: UserAttribute[]): Promise<{
         id: string;
@@ -206,7 +364,7 @@ export declare class CognitoClient {
      * @param username Username
      * @param code Confirmation code the user gets through the registration E-Mail
      *
-     * @throws {CognitoException}
+     * @throws {ConfirmSignUpException}
      */
     confirmSignUp(username: string, code: string): Promise<void>;
     /**
@@ -214,22 +372,39 @@ export declare class CognitoClient {
      * @param currentPassword Current user password.
      * @param newPassword  New user password.
      *
-     * @throws {CognitoException}
+     * @throws {ChangePasswordException}
      */
     changePassword(currentPassword: string, newPassword: string, accessToken: string): Promise<void>;
+    /**
+     * Updates the user attributes.
+     *
+     * @param userAttributes List of user attributes to update.
+     * @param accessToken Access token of the current user.
+     *
+     * @throws {UpdateUserAttributesException}
+     */
     updateUserAttributes(userAttributes: UserAttribute[], accessToken: string): Promise<void>;
+    /**
+     * Verifies a given user attribute
+     *
+     * @param attributeName Name of the attribute to verify
+     * @param code  Verification code
+     * @param accessToken Access token of the current user.
+     *
+     * @throws {VerifyUserAttributeException}
+     */
     verifyUserAttribute(attributeName: string, code: string, accessToken: string): Promise<void>;
     /**
      * Sign out the user and remove the current user session.
      *
-     * @throws {CognitoException}
+     * @throws {RevokeTokenException}
      */
     signOut(refreshToken: string): Promise<void>;
     /**
      * Request forgot password.
      * @param username Username
      *
-     * @throws {CognitoException}
+     * @throws {ForgotPasswordException}
      */
     forgotPassword(username: string): Promise<void>;
     /**
@@ -239,12 +414,14 @@ export declare class CognitoClient {
      * @param newPassword New password
      * @param confirmationCode Confirmation code which the user got through E-mail
      *
-     * @throws {CognitoException}
+     * @throws {ConfirmForgotPasswordException}
      */
     confirmForgotPassword(username: string, newPassword: string, confirmationCode: string): Promise<void>;
     /**
      * Triggers cognito to resend the confirmation code
      * @param username Username
+     *
+     * @throws {ResendConfirmationCodeException}
      */
     resendConfirmationCode(username: string): Promise<void>;
     /**

package/lib/cognito-client.js

@@ -1,8 +1,8 @@
 import hashJs from 'hash.js';
 import { BigInteger } from 'jsbn';
 import { Buffer } from 'buffer';
-import { CognitoError, CognitoException } from './error.js';
-import { calculateSignature, calculateU, decodeJwt, generateA, generateSmallA, getPasswordAuthenticationKey, randomBytes } from './utils.js';
+import { CognitoCommonException, CognitoError } from './error.js';
+import { calculateSecretHash, calculateSignature, calculateU, decodeJwt, generateA, generateSmallA, getPasswordAuthenticationKey, randomBytes } from './utils.js';
 /**
  * List of used and supported Cognito API calls.
  * @see https://docs.aws.amazon.com/cognito-user-identity-pools/latest/APIReference/API_Operations.html for more details
@@ -41,16 +41,51 @@ export function authResultToSession(authenticationResult) {
         refreshToken: authenticationResult.RefreshToken
     };
 }
+export async function cognitoRequest(body, serviceTarget, cognitoEndpoint) {
+    const cognitoResponse = await fetch(cognitoEndpoint, {
+        headers: {
+            'x-amz-target': `AWSCognitoIdentityProviderService.${serviceTarget}`,
+            'content-type': 'application/x-amz-json-1.1'
+        },
+        method: 'POST',
+        body: JSON.stringify(body)
+    });
+    if (cognitoResponse && cognitoResponse.status < 300) {
+        return cognitoResponse.json();
+    }
+    const cognitoResponseBody = await cognitoResponse.json();
+    /**
+     * The whole error handling and value sanitization was inspired
+     * by @see https://github.com/aws-amplify/amplify-js/blob/1f5eefd9c40285eb99e57764ac8fca1f9519e2c6/packages/core/src/clients/serde/json.ts#L14
+     */
+    const sanitizeErrorType = (rawValue) => {
+        const [cleanValue] = rawValue.toString().split(/[,:]+/);
+        if (cleanValue.includes('#')) {
+            return cleanValue.split('#')[1];
+        }
+        return cleanValue;
+    };
+    const errorMessage = cognitoResponse.headers.get('X-Amzn-ErrorMessage') ??
+        cognitoResponseBody.message ??
+        cognitoResponseBody.Message ??
+        'Unknown error';
+    const cognitoException = sanitizeErrorType(cognitoResponse.headers.get('X-Amzn-ErrorType') ??
+        cognitoResponseBody.code ??
+        cognitoResponseBody.__type ??
+        CognitoCommonException.Unknown);
+    throw new CognitoError(errorMessage, cognitoException);
+}
 /**
  * Lightweight AWS Cogito client without any AWS SDK dependencies.
  */
 export class CognitoClient {
-    constructor({ userPoolId, userPoolClientId, endpoint, oAuth2: oAuth }) {
+    constructor({ userPoolId, userPoolClientId, endpoint, oAuth2: oAuth, clientSecret }) {
         const [cognitoPoolRegion, cognitoPoolName] = userPoolId.split('_');
         this.cognitoEndpoint = (endpoint || `https://cognito-idp.${cognitoPoolRegion}.amazonaws.com`).replace(/\/$/, '');
         this.cognitoPoolName = cognitoPoolName;
         this.userPoolClientId = userPoolClientId;
         this.oAuth = oAuth;
+        this.clientSecret = clientSecret;
     }
     static getDecodedTokenFromSession(session) {
         const { payload: idToken } = decodeJwt(session.idToken);
@@ -60,22 +95,6 @@ export class CognitoClient {
             accessToken
         };
     }
-    async cognitoRequest(body, serviceTarget) {
-        const cognitoResponse = await fetch(this.cognitoEndpoint, {
-            headers: {
-                'x-amz-target': `AWSCognitoIdentityProviderService.${serviceTarget}`,
-                'content-type': 'application/x-amz-json-1.1'
-            },
-            method: 'POST',
-            body: JSON.stringify(body)
-        });
-        if (cognitoResponse.status < 200 || cognitoResponse.status > 299) {
-            const errorMessage = cognitoResponse.headers.get('X-Amzn-ErrorMessage') ?? 'Unknown';
-            const cognitoException = cognitoResponse.headers.get('X-Amzn-ErrorType') ?? CognitoException.Unknown;
-            throw new CognitoError(errorMessage, cognitoException);
-        }
-        return cognitoResponse.json();
-    }
     /**
      *
      * Performs user authentication with username and password through ALLOW_USER_SRP_AUTH .
@@ -83,7 +102,8 @@ export class CognitoClient {
      *
      * @param username Username
      * @param password Password
-     * @throws {CognitoException}
+     *
+     * @throws {InitiateAuthException}
      */
     async authenticateUserSrp(username, password) {
         const smallA = await generateSmallA();
@@ -93,28 +113,31 @@ export class CognitoClient {
             ClientId: this.userPoolClientId,
             AuthParameters: {
                 USERNAME: username,
-                SRP_A: A.toString(16)
+                SRP_A: A.toString(16),
+                SECRET_HASH: this.clientSecret && calculateSecretHash(this.clientSecret, this.userPoolClientId, username)
             },
             ClientMetadata: {}
         };
-        const challenge = (await this.cognitoRequest(initiateAuthPayload, CognitoServiceTarget.InitiateAuth));
+        const challenge = (await cognitoRequest(initiateAuthPayload, CognitoServiceTarget.InitiateAuth, this.cognitoEndpoint));
         const B = new BigInteger(challenge.ChallengeParameters.SRP_B, 16);
         const salt = new BigInteger(challenge.ChallengeParameters.SALT, 16);
         const U = calculateU(A, B);
         const hkdf = getPasswordAuthenticationKey(this.cognitoPoolName, challenge.ChallengeParameters.USER_ID_FOR_SRP, password, B, U, smallA, salt);
         const { signature, timeStamp } = calculateSignature(this.cognitoPoolName, challenge.ChallengeParameters.USER_ID_FOR_SRP, challenge.ChallengeParameters.SECRET_BLOCK, hkdf);
-        const respondToAuthChallengePayload = {
+        const respondToAuthChallengeRequest = {
             ChallengeName: 'PASSWORD_VERIFIER',
             ClientId: this.userPoolClientId,
             ChallengeResponses: {
                 PASSWORD_CLAIM_SECRET_BLOCK: challenge.ChallengeParameters.SECRET_BLOCK,
                 PASSWORD_CLAIM_SIGNATURE: signature,
                 USERNAME: challenge.ChallengeParameters.USER_ID_FOR_SRP,
-                TIMESTAMP: timeStamp
+                TIMESTAMP: timeStamp,
+                SECRET_HASH: this.clientSecret &&
+                    calculateSecretHash(this.clientSecret, this.userPoolClientId, challenge.ChallengeParameters.USER_ID_FOR_SRP)
             },
             ClientMetadata: {}
         };
-        const { AuthenticationResult } = await this.cognitoRequest(respondToAuthChallengePayload, CognitoServiceTarget.RespondToAuthChallenge);
+        const { AuthenticationResult } = await cognitoRequest(respondToAuthChallengeRequest, CognitoServiceTarget.RespondToAuthChallenge, this.cognitoEndpoint);
         return authResultToSession(AuthenticationResult);
     }
     /**
@@ -124,7 +147,7 @@ export class CognitoClient {
      *
      * @param username Username
      * @param password Password
-     * @throws {CognitoException}
+     * @throws {InitiateAuthException}
      */
     async authenticateUser(username, password) {
         const initiateAuthPayload = {
@@ -132,11 +155,12 @@ export class CognitoClient {
             ClientId: this.userPoolClientId,
             AuthParameters: {
                 USERNAME: username,
-                PASSWORD: password
+                PASSWORD: password,
+                SECRET_HASH: this.clientSecret && calculateSecretHash(this.clientSecret, this.userPoolClientId, username)
             },
             ClientMetadata: {}
         };
-        const { AuthenticationResult } = (await this.cognitoRequest(initiateAuthPayload, CognitoServiceTarget.InitiateAuth));
+        const { AuthenticationResult } = (await cognitoRequest(initiateAuthPayload, CognitoServiceTarget.InitiateAuth, this.cognitoEndpoint));
         const session = authResultToSession(AuthenticationResult);
         return session;
     }
@@ -144,19 +168,21 @@ export class CognitoClient {
      * Returns a new session based on the given refresh token.
      *
      * @param refreshToken
+     * @param username
      * @returns @see Session
-     * @throws {CognitoError}
+     * @throws {InitiateAuthException}
      */
-    async refreshSession(refreshToken) {
+    async refreshSession(refreshToken, username) {
         const refreshTokenPayload = {
             AuthFlow: 'REFRESH_TOKEN_AUTH',
             ClientId: this.userPoolClientId,
             AuthParameters: {
-                REFRESH_TOKEN: refreshToken
+                REFRESH_TOKEN: refreshToken,
+                SECRET_HASH: this.clientSecret && username && calculateSecretHash(this.clientSecret, this.userPoolClientId, username)
             },
             ClientMetadata: {}
         };
-        const { AuthenticationResult } = (await this.cognitoRequest(refreshTokenPayload, CognitoServiceTarget.InitiateAuth));
+        const { AuthenticationResult } = (await cognitoRequest(refreshTokenPayload, CognitoServiceTarget.InitiateAuth, this.cognitoEndpoint));
         if (!AuthenticationResult.RefreshToken) {
             AuthenticationResult.RefreshToken = refreshToken;
         }
@@ -167,16 +193,17 @@ export class CognitoClient {
      * @param username Username
      * @param password Password
      *
-     * @throws {CognitoException}
+     * @throws {SignUpException}
      */
     async signUp(username, password, userAttributes) {
-        const signUpPayload = {
+        const signUpRequest = {
             ClientId: this.userPoolClientId,
             Username: username,
             Password: password,
-            UserAttributes: userAttributes
+            UserAttributes: userAttributes,
+            SecretHash: this.clientSecret && calculateSecretHash(this.clientSecret, this.userPoolClientId, username)
         };
-        const data = await this.cognitoRequest(signUpPayload, CognitoServiceTarget.SignUp);
+        const data = await cognitoRequest(signUpRequest, CognitoServiceTarget.SignUp, this.cognitoEndpoint);
         return {
             id: data.UserSub,
             confirmed: data.UserConfirmed
@@ -188,22 +215,23 @@ export class CognitoClient {
      * @param username Username
      * @param code Confirmation code the user gets through the registration E-Mail
      *
-     * @throws {CognitoException}
+     * @throws {ConfirmSignUpException}
      */
     async confirmSignUp(username, code) {
-        const confirmSignUpPayload = {
+        const confirmSignUpRequest = {
             ClientId: this.userPoolClientId,
             ConfirmationCode: code,
-            Username: username
+            Username: username,
+            SecretHash: this.clientSecret && calculateSecretHash(this.clientSecret, this.userPoolClientId, username)
         };
-        await this.cognitoRequest(confirmSignUpPayload, CognitoServiceTarget.ConfirmSignUp);
+        await cognitoRequest(confirmSignUpRequest, CognitoServiceTarget.ConfirmSignUp, this.cognitoEndpoint);
     }
     /**
      *
      * @param currentPassword Current user password.
      * @param newPassword  New user password.
      *
-     * @throws {CognitoException}
+     * @throws {ChangePasswordException}
      */
     async changePassword(currentPassword, newPassword, accessToken) {
         const changePasswordPayload = {
@@ -211,47 +239,65 @@ export class CognitoClient {
             ProposedPassword: newPassword,
             AccessToken: accessToken
         };
-        await this.cognitoRequest(changePasswordPayload, CognitoServiceTarget.ChangePassword);
+        await cognitoRequest(changePasswordPayload, CognitoServiceTarget.ChangePassword, this.cognitoEndpoint);
     }
+    /**
+     * Updates the user attributes.
+     *
+     * @param userAttributes List of user attributes to update.
+     * @param accessToken Access token of the current user.
+     *
+     * @throws {UpdateUserAttributesException}
+     */
     async updateUserAttributes(userAttributes, accessToken) {
         const updateUserAttributesPayload = {
             UserAttributes: userAttributes,
             AccessToken: accessToken
         };
-        await this.cognitoRequest(updateUserAttributesPayload, CognitoServiceTarget.UpdateUserAttributes);
+        await cognitoRequest(updateUserAttributesPayload, CognitoServiceTarget.UpdateUserAttributes, this.cognitoEndpoint);
     }
+    /**
+     * Verifies a given user attribute
+     *
+     * @param attributeName Name of the attribute to verify
+     * @param code  Verification code
+     * @param accessToken Access token of the current user.
+     *
+     * @throws {VerifyUserAttributeException}
+     */
     async verifyUserAttribute(attributeName, code, accessToken) {
         const verifyUserAttributePayload = {
             AttributeName: attributeName,
             Code: code,
             AccessToken: accessToken
         };
-        await this.cognitoRequest(verifyUserAttributePayload, CognitoServiceTarget.VerifyUserAttribute);
+        await cognitoRequest(verifyUserAttributePayload, CognitoServiceTarget.VerifyUserAttribute, this.cognitoEndpoint);
     }
     /**
      * Sign out the user and remove the current user session.
      *
-     * @throws {CognitoException}
+     * @throws {RevokeTokenException}
      */
     async signOut(refreshToken) {
         const revokeTokenPayload = {
             Token: refreshToken,
             ClientId: this.userPoolClientId
         };
-        await this.cognitoRequest(revokeTokenPayload, CognitoServiceTarget.RevokeToken);
+        await cognitoRequest(revokeTokenPayload, CognitoServiceTarget.RevokeToken, this.cognitoEndpoint);
     }
     /**
      * Request forgot password.
      * @param username Username
      *
-     * @throws {CognitoException}
+     * @throws {ForgotPasswordException}
      */
     async forgotPassword(username) {
-        const forgotPasswordPayload = {
+        const forgotPasswordRequest = {
             ClientId: this.userPoolClientId,
-            Username: username
+            Username: username,
+            SecretHash: this.clientSecret && calculateSecretHash(this.clientSecret, this.userPoolClientId, username)
         };
-        await this.cognitoRequest(forgotPasswordPayload, CognitoServiceTarget.ForgotPassword);
+        await cognitoRequest(forgotPasswordRequest, CognitoServiceTarget.ForgotPassword, this.cognitoEndpoint);
     }
     /**
      * Confirms the new password via the given code send via cognito triggered by @see forgotPassword .
@@ -260,27 +306,31 @@ export class CognitoClient {
      * @param newPassword New password
      * @param confirmationCode Confirmation code which the user got through E-mail
      *
-     * @throws {CognitoException}
+     * @throws {ConfirmForgotPasswordException}
      */
     async confirmForgotPassword(username, newPassword, confirmationCode) {
-        const confirmForgotPasswordPayload = {
+        const confirmForgotPasswordRequest = {
             ClientId: this.userPoolClientId,
             Username: username,
             ConfirmationCode: confirmationCode,
-            Password: newPassword
+            Password: newPassword,
+            SecretHash: this.clientSecret && calculateSecretHash(this.clientSecret, this.userPoolClientId, username)
         };
-        await this.cognitoRequest(confirmForgotPasswordPayload, CognitoServiceTarget.ConfirmForgotPassword);
+        await cognitoRequest(confirmForgotPasswordRequest, CognitoServiceTarget.ConfirmForgotPassword, this.cognitoEndpoint);
     }
     /**
      * Triggers cognito to resend the confirmation code
      * @param username Username
+     *
+     * @throws {ResendConfirmationCodeException}
      */
     async resendConfirmationCode(username) {
-        const resendConfirmationCodePayLoad = {
+        const resendConfirmationCodeRequest = {
             ClientId: this.userPoolClientId,
-            Username: username
+            Username: username,
+            SecretHash: this.clientSecret && calculateSecretHash(this.clientSecret, this.userPoolClientId, username)
         };
-        await this.cognitoRequest(resendConfirmationCodePayLoad, CognitoServiceTarget.ResendConfirmationCode);
+        await cognitoRequest(resendConfirmationCodeRequest, CognitoServiceTarget.ResendConfirmationCode, this.cognitoEndpoint);
     }
     /**
      * Returns a link to Cognito`s Hosted UI for OAuth2 authentication.