@vardario/cognito-client 5.3.1 → 6.0.0

package/lib/browser.js

@@ -897,17 +897,17 @@ async function cognitoRequest(body, serviceTarget, cognitoEndpoint) {
 }
 var CognitoClient = class {
   cognitoEndpoint;
+  cognitoDomain;
   cognitoPoolName;
   userPoolClientId;
-  oAuth;
   clientSecret;
-  constructor({ userPoolId, userPoolClientId, endpoint, oAuth2: oAuth, clientSecret }) {
+  constructor({ userPoolId, userPoolClientId, endpoint, clientSecret, cognitoDomain }) {
     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;
+    this.cognitoDomain = cognitoDomain;
   }
   static getDecodedTokenFromSession(auth) {
     const { payload: idToken } = decodeJwt(auth.IdToken);
@@ -1380,24 +1380,25 @@ var CognitoClient = class {
    *
    * @throws {Error}
    */
-  async generateOAuthSignInUrl(identityProvider) {
-    if (this.oAuth === void 0) {
-      throw Error("You have to define oAuth options to use generateFederatedSignUrl");
-    }
+  async generateOAuthSignInUrl({
+    identityProvider,
+    redirectUri,
+    scope
+  }) {
     const state = (await randomBytes(32)).toString("hex");
     const pkce = (await randomBytes(128)).toString("hex");
     const code_challenge = uint8ArrayToBase64String(await digest("SHA-256", uint8ArrayFromString(pkce))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
     const queryParams = new URLSearchParams();
-    queryParams.append("redirect_uri", this.oAuth.redirectUrl);
-    queryParams.append("response_type", this.oAuth.responseType);
+    queryParams.append("redirect_uri", redirectUri);
+    queryParams.append("response_type", "code");
     queryParams.append("client_id", this.userPoolClientId);
     identityProvider && queryParams.append("identity_provider", identityProvider);
-    queryParams.append("scope", this.oAuth.scopes.join(" "));
+    queryParams.append("scope", scope.join(" "));
     queryParams.append("state", state);
     queryParams.append("code_challenge", code_challenge);
     queryParams.append("code_challenge_method", "S256");
     return {
-      url: `${this.oAuth.cognitoDomain}/oauth2/authorize?${queryParams.toString()}`,
+      url: `${this.cognitoDomain}/oauth2/authorize?${queryParams.toString()}`,
       state,
       pkce
     };
@@ -1413,15 +1414,20 @@ var CognitoClient = class {
    *
    * @throws {Error}
    */
-  async handleCodeFlow(returnUrl, pkce, state) {
-    if (this.oAuth === void 0) {
-      throw Error("You have to define oAuth options to use handleCodeFlow");
-    }
+  async handleCodeFlow({
+    pkce,
+    redirectUri,
+    returnUrl,
+    state
+  }) {
     const url = new URL(returnUrl);
     const code = url.searchParams.get("code");
     if (code === null) {
       throw Error("code parameter is missing from return url.");
     }
+    if (!this.cognitoDomain) {
+      throw Error("Cognito domain is not set. Please set cognitoDomain in the CognitoClient constructor.");
+    }
     if (url.searchParams.get("state") !== state) {
       throw Error("State parameter does not match.");
     }
@@ -1429,14 +1435,19 @@ var CognitoClient = class {
     urlParams.append("grant_type", "authorization_code");
     urlParams.append("code", code);
     urlParams.append("client_id", this.userPoolClientId);
-    urlParams.append("redirect_uri", this.oAuth.redirectUrl);
+    urlParams.append("redirect_uri", redirectUri);
     urlParams.append("code_verifier", pkce);
-    const tokenEndpoint = `${this.oAuth.cognitoDomain}/oauth2/token`;
+    const tokenEndpoint = `${this.cognitoDomain}/oauth2/token`;
+    const headers = {
+      "Content-Type": "application/x-www-form-urlencoded"
+    };
+    if (this.clientSecret) {
+      const basicAuth = btoa(`${this.userPoolClientId}:${this.clientSecret}`);
+      headers["Authorization"] = `Basic ${basicAuth}`;
+    }
     const response = await fetch(tokenEndpoint, {
       method: "POST",
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
+      headers,
       body: urlParams.toString()
     });
     const { access_token, refresh_token, id_token, expires_in, error } = await response.json();

package/lib/cognito-client.d.ts

@@ -181,28 +181,6 @@ export interface ResendConfirmationCodeRequest extends CognitoBaseRequest {
     Username: string;
     SecretHash?: string;
 }
-/**
- * Cognito related OAuth props.
- */
-export interface OAuth2Props {
-    /**
-     * Cognito domain for OAuth2 token endpoints.
-     */
-    cognitoDomain: string;
-    /**
-     * Requested OAuth scopes
-     * @example ['email', 'openid']
-     */
-    scopes: string[];
-    /**
-     * Redirect URL after a successful OAuth2 authentication.
-     */
-    redirectUrl: string;
-    /**
-     * Response type.
-     */
-    responseType: 'code';
-}
 export interface CognitoClientProps {
     /**
      * Cognito User Pool ID
@@ -213,15 +191,15 @@ export interface CognitoClientProps {
      * Cognito User Pool Client ID
      */
     userPoolClientId: string;
+    /**
+     * Cognito Domain. Required for OAuth2 flows.
+     */
+    cognitoDomain?: string;
     /**
      * Optional Cognito endpoint. Useful for local testing.
      * If not defined the endpoint will be determined by @see userPoolId .
      */
     endpoint?: string;
-    /**
-     * Cognito OAuth related options. See @see OAuthProps .
-     */
-    oAuth2?: OAuth2Props;
     /**
      * Optional Cognito User Pool Client Secret.
      */
@@ -554,11 +532,11 @@ export declare function cognitoRequest<T extends ServiceTarget>(body: CognitoReq
  */
 export declare class CognitoClient {
     private readonly cognitoEndpoint;
+    private readonly cognitoDomain?;
     private readonly cognitoPoolName;
     private readonly userPoolClientId;
-    private readonly oAuth?;
     private readonly clientSecret?;
-    constructor({ userPoolId, userPoolClientId, endpoint, oAuth2: oAuth, clientSecret }: CognitoClientProps);
+    constructor({ userPoolId, userPoolClientId, endpoint, clientSecret, cognitoDomain }: CognitoClientProps);
     static getDecodedTokenFromSession(auth: AuthenticationResult): DecodedTokens;
     initiateAuth(request: InitiateAuthRequest): Promise<InitiateAuthResponse>;
     /**
@@ -778,7 +756,11 @@ export declare class CognitoClient {
      *
      * @throws {Error}
      */
-    generateOAuthSignInUrl(identityProvider?: string): Promise<{
+    generateOAuthSignInUrl({ identityProvider, redirectUri, scope }: {
+        identityProvider?: string;
+        redirectUri: string;
+        scope: string[];
+    }): Promise<{
         url: string;
         state: string;
         pkce: string;
@@ -794,7 +776,12 @@ export declare class CognitoClient {
      *
      * @throws {Error}
      */
-    handleCodeFlow(returnUrl: string, pkce: string, state: string): Promise<AuthenticationResult>;
+    handleCodeFlow({ pkce, redirectUri, returnUrl, state }: {
+        returnUrl: string;
+        redirectUri: string;
+        pkce: string;
+        state: string;
+    }): Promise<AuthenticationResult>;
     /**
      * Invalidates the identity, access, and refresh tokens that Amazon Cognito issued to a user. Call this operation when your user signs out of your app. This results in the following behavior.
      * @param accessToken Access token of the current user.

package/lib/cognito-client.js

@@ -114,17 +114,17 @@ export async function cognitoRequest(body, serviceTarget, cognitoEndpoint) {
  */
 export class CognitoClient {
     cognitoEndpoint;
+    cognitoDomain;
     cognitoPoolName;
     userPoolClientId;
-    oAuth;
     clientSecret;
-    constructor({ userPoolId, userPoolClientId, endpoint, oAuth2: oAuth, clientSecret }) {
+    constructor({ userPoolId, userPoolClientId, endpoint, clientSecret, cognitoDomain }) {
         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;
+        this.cognitoDomain = cognitoDomain;
     }
     static getDecodedTokenFromSession(auth) {
         const { payload: idToken } = decodeJwt(auth.IdToken);
@@ -564,10 +564,7 @@ export class CognitoClient {
      *
      * @throws {Error}
      */
-    async generateOAuthSignInUrl(identityProvider) {
-        if (this.oAuth === undefined) {
-            throw Error('You have to define oAuth options to use generateFederatedSignUrl');
-        }
+    async generateOAuthSignInUrl({ identityProvider, redirectUri, scope }) {
         const state = (await randomBytes(32)).toString('hex');
         const pkce = (await randomBytes(128)).toString('hex');
         const code_challenge = uint8ArrayToBase64String(await digest('SHA-256', uint8ArrayFromString(pkce)))
@@ -575,16 +572,16 @@ export class CognitoClient {
             .replace(/\//g, '_')
             .replace(/=+$/, '');
         const queryParams = new URLSearchParams();
-        queryParams.append('redirect_uri', this.oAuth.redirectUrl);
-        queryParams.append('response_type', this.oAuth.responseType);
+        queryParams.append('redirect_uri', redirectUri);
+        queryParams.append('response_type', 'code');
         queryParams.append('client_id', this.userPoolClientId);
         identityProvider && queryParams.append('identity_provider', identityProvider);
-        queryParams.append('scope', this.oAuth.scopes.join(' '));
+        queryParams.append('scope', scope.join(' '));
         queryParams.append('state', state);
         queryParams.append('code_challenge', code_challenge);
         queryParams.append('code_challenge_method', 'S256');
         return {
-            url: `${this.oAuth.cognitoDomain}/oauth2/authorize?${queryParams.toString()}`,
+            url: `${this.cognitoDomain}/oauth2/authorize?${queryParams.toString()}`,
             state,
             pkce
         };
@@ -600,15 +597,15 @@ export class CognitoClient {
      *
      * @throws {Error}
      */
-    async handleCodeFlow(returnUrl, pkce, state) {
-        if (this.oAuth === undefined) {
-            throw Error('You have to define oAuth options to use handleCodeFlow');
-        }
+    async handleCodeFlow({ pkce, redirectUri, returnUrl, state }) {
         const url = new URL(returnUrl);
         const code = url.searchParams.get('code');
         if (code === null) {
             throw Error('code parameter is missing from return url.');
         }
+        if (!this.cognitoDomain) {
+            throw Error('Cognito domain is not set. Please set cognitoDomain in the CognitoClient constructor.');
+        }
         if (url.searchParams.get('state') !== state) {
             throw Error('State parameter does not match.');
         }
@@ -616,14 +613,19 @@ export class CognitoClient {
         urlParams.append('grant_type', 'authorization_code');
         urlParams.append('code', code);
         urlParams.append('client_id', this.userPoolClientId);
-        urlParams.append('redirect_uri', this.oAuth.redirectUrl);
+        urlParams.append('redirect_uri', redirectUri);
         urlParams.append('code_verifier', pkce);
-        const tokenEndpoint = `${this.oAuth.cognitoDomain}/oauth2/token`;
+        const tokenEndpoint = `${this.cognitoDomain}/oauth2/token`;
+        const headers = {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        };
+        if (this.clientSecret) {
+            const basicAuth = btoa(`${this.userPoolClientId}:${this.clientSecret}`);
+            headers['Authorization'] = `Basic ${basicAuth}`;
+        }
         const response = await fetch(tokenEndpoint, {
             method: 'POST',
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded'
-            },
+            headers,
             body: urlParams.toString()
         });
         const { access_token, refresh_token, id_token, expires_in, error } = await response.json();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vardario/cognito-client",
-  "version": "5.3.1",
+  "version": "6.0.0",
   "description": "",
   "license": "MIT",
   "author": "Sahin Vardar",