npm - @webiny/cognito - Versions diffs - 6.4.4-beta.3 → 6.4.4-beta.4 - Mend

@webiny/cognito 6.4.4-beta.3 → 6.4.4-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (72) hide show

package/Cognito.d.ts CHANGED Viewed

@@ -1,4 +1,55 @@
 import { z } from "zod";
+declare const federationSchema: z.ZodObject<{
+    domain: z.ZodString;
+    callbackUrls: z.ZodArray<z.ZodString>;
+    logoutUrls: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    responseType: z.ZodDefault<z.ZodEnum<{
+        code: "code";
+        token: "token";
+    }>>;
+    allowCredentialsLogin: z.ZodDefault<z.ZodBoolean>;
+    identityProviders: z.ZodArray<z.ZodObject<{
+        type: z.ZodEnum<{
+            google: "google";
+            facebook: "facebook";
+            amazon: "amazon";
+            apple: "apple";
+            oidc: "oidc";
+        }>;
+        name: z.ZodOptional<z.ZodString>;
+        label: z.ZodString;
+        providerDetails: z.ZodRecord<z.ZodString, z.ZodAny>;
+        idpIdentifiers: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        attributeMapping: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
 export declare const Cognito: import("@webiny/project/defineExtension/defineExtension").ExtensionComponent<z.ZodObject<{
     apiConfig: z.ZodOptional<z.ZodString>;
+    adminConfig: z.ZodOptional<z.ZodString>;
+    federation: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
+        domain: z.ZodString;
+        callbackUrls: z.ZodArray<z.ZodString>;
+        logoutUrls: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        responseType: z.ZodDefault<z.ZodEnum<{
+            code: "code";
+            token: "token";
+        }>>;
+        allowCredentialsLogin: z.ZodDefault<z.ZodBoolean>;
+        identityProviders: z.ZodArray<z.ZodObject<{
+            type: z.ZodEnum<{
+                google: "google";
+                facebook: "facebook";
+                amazon: "amazon";
+                apple: "apple";
+                oidc: "oidc";
+            }>;
+            name: z.ZodOptional<z.ZodString>;
+            label: z.ZodString;
+            providerDetails: z.ZodRecord<z.ZodString, z.ZodAny>;
+            idpIdentifiers: z.ZodOptional<z.ZodArray<z.ZodString>>;
+            attributeMapping: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>, z.ZodCustom<() => Promise<z.infer<typeof federationSchema>>, () => Promise<z.infer<typeof federationSchema>>>]>>;
+    mfa: z.ZodDefault<z.ZodBoolean>;
 }, z.core.$strip>>;
+export {};

package/Cognito.js CHANGED Viewed

@@ -1,7 +1,33 @@
 import react from "react";
 import { defineExtension } from "@webiny/project/defineExtension/index.js";
 import { Admin, Api, Infra } from "@webiny/project-aws";
+import { Await } from "@webiny/react-properties";
 import { z } from "zod";
+const identityProviderSchema = z.object({
+    type: z["enum"]([
+        "google",
+        "facebook",
+        "amazon",
+        "apple",
+        "oidc"
+    ]),
+    name: z.string().optional(),
+    label: z.string(),
+    providerDetails: z.record(z.string(), z.any()),
+    idpIdentifiers: z.array(z.string()).optional(),
+    attributeMapping: z.record(z.string(), z.string()).optional()
+});
+const federationSchema = z.object({
+    domain: z.string().describe("Cognito User Pool domain prefix."),
+    callbackUrls: z.array(z.string()).describe("OAuth callback URLs."),
+    logoutUrls: z.array(z.string()).optional(),
+    responseType: z["enum"]([
+        "code",
+        "token"
+    ]).default("code"),
+    allowCredentialsLogin: z.boolean().default(true),
+    identityProviders: z.array(identityProviderSchema)
+});
 const Cognito = defineExtension({
     type: "Project/Cognito",
     tags: {
@@ -9,19 +35,64 @@ const Cognito = defineExtension({
     },
     description: "Enable and configure Cognito authentication.",
     paramsSchema: z.object({
-        apiConfig: z.string().describe("Path to API configuration.").optional()
+        apiConfig: z.string().describe("Path to API configuration.").optional(),
+        adminConfig: z.string().describe("Path to Admin configuration.").optional(),
+        federation: z.union([
+            federationSchema,
+            z.custom((val)=>"function" == typeof val)
+        ]).optional(),
+        mfa: z.boolean().describe("Enable TOTP MFA for all users.").default(false)
     }),
-    render: (props)=>/*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(Infra.EnvVar, {
+    render: (props)=>{
+        const federationProp = props.federation;
+        const federationFn = federationProp ? "function" == typeof federationProp ? federationProp : ()=>Promise.resolve(federationProp) : null;
+        return /*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(Infra.EnvVar, {
             varName: "REACT_APP_IDP_TYPE",
             value: "cognito"
-        }), /*#__PURE__*/ react.createElement(Api.Extension, {
+        }), props.mfa ? /*#__PURE__*/ react.createElement(Infra.EnvVar, {
+            varName: "COGNITO_MFA",
+            value: "true"
+        }) : null, /*#__PURE__*/ react.createElement(Api.Extension, {
             src: import.meta.dirname + "/api/CognitoApiFeature.js",
             exportName: "CognitoApiFeature"
         }), props.apiConfig ? /*#__PURE__*/ react.createElement(Api.Extension, {
             src: props.apiConfig
         }) : null, /*#__PURE__*/ react.createElement(Admin.Extension, {
             src: import.meta.dirname + "/admin/Extension.js"
-        }))
+        }), props.adminConfig ? /*#__PURE__*/ react.createElement(Admin.Extension, {
+            src: props.adminConfig
+        }) : null, federationFn ? /*#__PURE__*/ react.createElement(Await, {
+            fn: federationFn
+        }, (federation)=>/*#__PURE__*/ react.createElement(react.Fragment, null, /*#__PURE__*/ react.createElement(Infra.EnvVar, {
+                varName: "COGNITO_FEDERATION_INFRA_CONFIG",
+                value: JSON.stringify({
+                    domain: federation.domain,
+                    callbackUrls: federation.callbackUrls,
+                    logoutUrls: federation.logoutUrls,
+                    identityProviders: federation.identityProviders.map((idp)=>({
+                            type: idp.type,
+                            name: idp.name,
+                            providerDetails: idp.providerDetails,
+                            idpIdentifiers: idp.idpIdentifiers,
+                            attributeMapping: idp.attributeMapping
+                        }))
+                })
+            }), /*#__PURE__*/ react.createElement(Infra.Core.Pulumi, {
+                src: import.meta.dirname + "/infra/CognitoFederationPulumi.js"
+            }), /*#__PURE__*/ react.createElement(Admin.BuildParam, {
+                paramName: "cognitoFederation",
+                value: {
+                    callbackUrls: federation.callbackUrls,
+                    logoutUrls: federation.logoutUrls || federation.callbackUrls,
+                    responseType: federation.responseType,
+                    allowCredentialsLogin: federation.allowCredentialsLogin,
+                    providers: federation.identityProviders.map((idp)=>({
+                            name: idp.name || idp.type,
+                            label: idp.label
+                        }))
+                }
+            }))) : null);
+    }
 });
 export { Cognito };

package/Cognito.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Cognito.js","sources":["../src/Cognito.tsx"],"sourcesContent":["import React from \"react\";\nimport { defineExtension } from \"@webiny/project/defineExtension/index.js\";\nimport { Api, Admin, Infra } from \"@webiny/project-aws\";\nimport { z } from \"zod\";\n\nexport const Cognito = defineExtension({\n type: \"Project/Cognito\",\n tags: { runtimeContext: \"project\" },\n description: \"Enable and configure Cognito authentication.\",\n paramsSchema: z.object({\n apiConfig: z.string().describe(\"Path to API configuration.\").optional()\n }),\n render: props => {\n return (\n <>\n <Infra.EnvVar varName={\"REACT_APP_IDP_TYPE\"} value={\"cognito\"} />\n {/* Api extensions /}\n <Api.Extension\n src={import.meta.dirname + \"/api/CognitoApiFeature.js\"}\n exportName={\"CognitoApiFeature\"}\n />\n {props.apiConfig ? <Api.Extension src={props.apiConfig} /> : null}\n {/ Admin extensions */}\n <Admin.Extension src={import.meta.dirname + \"/admin/Extension.js\"} />\n </>\n );\n }\n});\n"],"names":["Cognito","defineExtension","z","props","Infra","Api","Admin"],"mappings":"~~;;;;AAKO~~,MAAMA,UAAUC,gBAAgB;IACnC,MAAM;IACN,MAAM;QAAE,gBAAgB;IAAU;IAClC,aAAa;IACb,~~cAAcC~~,EAAE,MAAM,CAAC;QACnB,WAAWA,EAAE,MAAM,GAAG,QAAQ,CAAC,8BAA8B,QAAQ;~~IACzE~~;IACA,~~QAAQC~~,CAAAA,~~QACG~~,WAAP,GACI,wDACI,~~oBAACC~~,MAAM,MAAM;YAAC,SAAS;YAAsB,OAAO;~~0BAEpD~~,oBAACC,IAAI,SAAS;YACV,KAAK,YAAY,OAAO,GAAG;YAC3B,YAAY;~~YAEfF~~,MAAM,SAAS,GAAG,WAAH,GAAG,~~oBAACE~~,IAAI,SAAS;YAAC,~~KAAKF~~,MAAM,SAAS;aAAO,~~oBAE7D~~,~~oBAACG~~,MAAM,SAAS;YAAC,KAAK,YAAY,OAAO,GAAG~~;;AAI5D~~"}
1	+ {"version":3,"file":"Cognito.js","sources":["../src/Cognito.tsx"],"sourcesContent":["import React from \"react\";\nimport { defineExtension } from \"@webiny/project/defineExtension/index.js\";\nimport { Api, Admin, Infra } from \"@webiny/project-aws\";\nimport { Await } from \"@webiny/react-properties\";\nimport { z } from \"zod\";\n\nconst identityProviderSchema = z.object({\n type: z.enum([\"google\", \"facebook\", \"amazon\", \"apple\", \"oidc\"]),\n name: z.string().optional(),\n label: z.string(),\n providerDetails: z.record(z.string(), z.any()),\n idpIdentifiers: z.array(z.string()).optional(),\n attributeMapping: z.record(z.string(), z.string()).optional()\n});\n\nconst federationSchema = z.object({\n domain: z.string().describe(\"Cognito User Pool domain prefix.\"),\n callbackUrls: z.array(z.string()).describe(\"OAuth callback URLs.\"),\n logoutUrls: z.array(z.string()).optional(),\n responseType: z.enum([\"code\", \"token\"]).default(\"code\"),\n allowCredentialsLogin: z.boolean().default(true),\n identityProviders: z.array(identityProviderSchema)\n});\n\nexport const Cognito = defineExtension({\n type: \"Project/Cognito\",\n tags: { runtimeContext: \"project\" },\n description: \"Enable and configure Cognito authentication.\",\n paramsSchema: z.object({\n apiConfig: z.string().describe(\"Path to API configuration.\").optional(),\n adminConfig: z.string().describe(\"Path to Admin configuration.\").optional(),\n federation: z\n .union([\n federationSchema,\n z.custom<() => Promise<z.infer<typeof federationSchema>>>(\n val => typeof val === \"function\"\n )\n ])\n .optional(),\n mfa: z.boolean().describe(\"Enable TOTP MFA for all users.\").default(false)\n }),\n render: props => {\n const federationProp = props.federation;\n const federationFn = federationProp\n ? typeof federationProp === \"function\"\n ? federationProp\n : () => Promise.resolve(federationProp)\n : null;\n\n return (\n <>\n <Infra.EnvVar varName={\"REACT_APP_IDP_TYPE\"} value={\"cognito\"} />\n {props.mfa ? <Infra.EnvVar varName={\"COGNITO_MFA\"} value={\"true\"} /> : null}\n\n {/* Api extensions /}\n <Api.Extension\n src={import.meta.dirname + \"/api/CognitoApiFeature.js\"}\n exportName={\"CognitoApiFeature\"}\n />\n {props.apiConfig ? <Api.Extension src={props.apiConfig} /> : null}\n\n {/ Admin extensions /}\n <Admin.Extension src={import.meta.dirname + \"/admin/Extension.js\"} />\n {props.adminConfig ? <Admin.Extension src={props.adminConfig} /> : null}\n\n {/ Federation infra + admin config */}\n {federationFn ? (\n <Await fn={federationFn}>\n {federation => (\n <>\n <Infra.EnvVar\n varName={\"COGNITO_FEDERATION_INFRA_CONFIG\"}\n value={JSON.stringify({\n domain: federation.domain,\n callbackUrls: federation.callbackUrls,\n logoutUrls: federation.logoutUrls,\n identityProviders: federation.identityProviders.map(\n idp => ({\n type: idp.type,\n name: idp.name,\n providerDetails: idp.providerDetails,\n idpIdentifiers: idp.idpIdentifiers,\n attributeMapping: idp.attributeMapping\n })\n )\n })}\n />\n <Infra.Core.Pulumi\n src={import.meta.dirname + \"/infra/CognitoFederationPulumi.js\"}\n />\n <Admin.BuildParam\n paramName={\"cognitoFederation\"}\n value={{\n callbackUrls: federation.callbackUrls,\n logoutUrls:\n federation.logoutUrls \|\| federation.callbackUrls,\n responseType: federation.responseType,\n allowCredentialsLogin: federation.allowCredentialsLogin,\n providers: federation.identityProviders.map(idp => ({\n name: idp.name \|\| idp.type,\n label: idp.label\n }))\n }}\n />\n </>\n )}\n </Await>\n ) : null}\n </>\n );\n }\n});\n"],"names":["identityProviderSchema","z","federationSchema","Cognito","defineExtension","val","props","federationProp","federationFn","Promise","Infra","Api","Admin","Await","federation","JSON","idp"],"mappings":"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"}

package/admin/DefaultCognitoSignInConfig.d.ts ADDED Viewed

@@ -0,0 +1,23 @@
+import { BuildParams } from "@webiny/app-admin/features/buildParams/index.js";
+import { type ICognitoSignInConfig } from "./presentation/Cognito/CognitoSignInConfig.js";
+declare class DefaultCognitoSignInConfigImpl implements ICognitoSignInConfig {
+    private buildParams;
+    constructor(buildParams: BuildParams.Interface);
+    getConfig(): Promise<{
+        oauth: {
+            scopes: string[];
+            redirectSignIn: string[];
+            redirectSignOut: string[];
+            responseType: "code" | "token";
+        };
+        allowCredentialsLogin: boolean;
+        providers: {
+            name: string;
+            label: string;
+        }[];
+    }>;
+}
+export declare const DefaultCognitoSignInConfig: typeof DefaultCognitoSignInConfigImpl & {
+    __abstraction: import("@webiny/di").Abstraction<ICognitoSignInConfig>;
+};
+export {};

package/admin/DefaultCognitoSignInConfig.js ADDED Viewed

@@ -0,0 +1,51 @@
+import { BuildParams } from "@webiny/app-admin/features/buildParams/index.js";
+import { CognitoSignInConfig } from "./presentation/Cognito/CognitoSignInConfig.js";
+class DefaultCognitoSignInConfigImpl {
+    constructor(buildParams){
+        this.buildParams = buildParams;
+    }
+    async getConfig() {
+        const config = this.buildParams.get("cognitoFederation");
+        if (!config) return {
+            oauth: {
+                scopes: [
+                    "profile",
+                    "email",
+                    "openid"
+                ],
+                redirectSignIn: [
+                    window.location.origin
+                ],
+                redirectSignOut: [
+                    window.location.origin
+                ],
+                responseType: "code"
+            },
+            allowCredentialsLogin: true,
+            providers: []
+        };
+        return {
+            oauth: {
+                scopes: [
+                    "profile",
+                    "email",
+                    "openid"
+                ],
+                redirectSignIn: config.callbackUrls,
+                redirectSignOut: config.logoutUrls,
+                responseType: config.responseType
+            },
+            allowCredentialsLogin: config.allowCredentialsLogin,
+            providers: config.providers
+        };
+    }
+}
+const DefaultCognitoSignInConfig = CognitoSignInConfig.createImplementation({
+    implementation: DefaultCognitoSignInConfigImpl,
+    dependencies: [
+        BuildParams
+    ]
+});
+export { DefaultCognitoSignInConfig };
+//# sourceMappingURL=DefaultCognitoSignInConfig.js.map

package/admin/DefaultCognitoSignInConfig.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"admin/DefaultCognitoSignInConfig.js","sources":["../../src/admin/DefaultCognitoSignInConfig.ts"],"sourcesContent":["import { BuildParams } from \"@webiny/app-admin/features/buildParams/index.js\";\nimport {\n CognitoSignInConfig,\n type ICognitoSignInConfig\n} from \"./presentation/Cognito/CognitoSignInConfig.js\";\n\ninterface FederationBuildParam {\n callbackUrls: string[];\n logoutUrls: string[];\n responseType: \"code\" | \"token\";\n allowCredentialsLogin: boolean;\n providers: { name: string; label: string }[];\n}\n\nclass DefaultCognitoSignInConfigImpl implements ICognitoSignInConfig {\n constructor(private buildParams: BuildParams.Interface) {}\n\n async getConfig() {\n const config = this.buildParams.get<FederationBuildParam>(\"cognitoFederation\");\n\n if (!config) {\n return {\n oauth: {\n scopes: [\"profile\", \"email\", \"openid\"],\n redirectSignIn: [window.location.origin],\n redirectSignOut: [window.location.origin],\n responseType: \"code\" as const\n },\n allowCredentialsLogin: true,\n providers: []\n };\n }\n\n return {\n oauth: {\n scopes: [\"profile\", \"email\", \"openid\"],\n redirectSignIn: config.callbackUrls,\n redirectSignOut: config.logoutUrls,\n responseType: config.responseType\n },\n allowCredentialsLogin: config.allowCredentialsLogin,\n providers: config.providers\n };\n }\n}\n\nexport const DefaultCognitoSignInConfig = CognitoSignInConfig.createImplementation({\n implementation: DefaultCognitoSignInConfigImpl,\n dependencies: [BuildParams]\n});\n"],"names":["DefaultCognitoSignInConfigImpl","buildParams","config","window","DefaultCognitoSignInConfig","CognitoSignInConfig","BuildParams"],"mappings":";;AAcA,MAAMA;IACF,YAAoBC,WAAkC,CAAE;aAApCA,WAAW,GAAXA;IAAqC;IAEzD,MAAM,YAAY;QACd,MAAMC,SAAS,IAAI,CAAC,WAAW,CAAC,GAAG,CAAuB;QAE1D,IAAI,CAACA,QACD,OAAO;YACH,OAAO;gBACH,QAAQ;oBAAC;oBAAW;oBAAS;iBAAS;gBACtC,gBAAgB;oBAACC,OAAO,QAAQ,CAAC,MAAM;iBAAC;gBACxC,iBAAiB;oBAACA,OAAO,QAAQ,CAAC,MAAM;iBAAC;gBACzC,cAAc;YAClB;YACA,uBAAuB;YACvB,WAAW,EAAE;QACjB;QAGJ,OAAO;YACH,OAAO;gBACH,QAAQ;oBAAC;oBAAW;oBAAS;iBAAS;gBACtC,gBAAgBD,OAAO,YAAY;gBACnC,iBAAiBA,OAAO,UAAU;gBAClC,cAAcA,OAAO,YAAY;YACrC;YACA,uBAAuBA,OAAO,qBAAqB;YACnD,WAAWA,OAAO,SAAS;QAC/B;IACJ;AACJ;AAEO,MAAME,6BAA6BC,oBAAoB,oBAAoB,CAAC;IAC/E,gBAAgBL;IAChB,cAAc;QAACM;KAAY;AAC/B"}

package/admin/Extension.js CHANGED Viewed

@@ -3,6 +3,7 @@ import { RegisterFeature } from "@webiny/app-admin";
 import { CognitoFeature } from "./presentation/Cognito/feature.js";
 import { CognitoAdmin } from "./Cognito.js";
 import { CognitoPermissionsFeature } from "./features/permissions/feature.js";
+import { CognitoSignInFeature } from "./presentation/Cognito/signInFeature.js";
 const Extension = ()=>{
     const region = process.env.REACT_APP_USER_POOL_REGION || "";
     const userPoolId = process.env.REACT_APP_USER_POOL_ID || "";
@@ -11,6 +12,8 @@ const Extension = ()=>{
         feature: CognitoFeature
     }), /*#__PURE__*/ react.createElement(RegisterFeature, {
         feature: CognitoPermissionsFeature
+    }), /*#__PURE__*/ react.createElement(RegisterFeature, {
+        feature: CognitoSignInFeature
     }), /*#__PURE__*/ react.createElement(CognitoAdmin, {
         login: {
             region,

package/admin/Extension.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"admin/Extension.js","sources":["../../src/admin/Extension.tsx"],"sourcesContent":["import React from \"react\";\nimport { RegisterFeature } from \"@webiny/app-admin\";\nimport { CognitoFeature } from \"./presentation/Cognito/feature.js\";\nimport { CognitoAdmin } from \"./Cognito.js\";\nimport { CognitoPermissionsFeature } from \"./features/permissions/feature.js\";\n\nexport const Extension = () => {\n const region = process.env.REACT_APP_USER_POOL_REGION \|\| \"\";\n const userPoolId = process.env.REACT_APP_USER_POOL_ID \|\| \"\";\n const clientId = process.env.REACT_APP_USER_POOL_WEB_CLIENT_ID \|\| \"\";\n\n return (\n <>\n <RegisterFeature feature={CognitoFeature} />\n <RegisterFeature feature={CognitoPermissionsFeature} />\n <CognitoAdmin\n login={{\n region~~,\n~~ userPoolId~~,\n~~ clientId\n }}\n />\n </>\n );\n};\n"],"names":["Extension","region","process","userPoolId","clientId","RegisterFeature","CognitoFeature","CognitoPermissionsFeature","CognitoAdmin"],"mappings":"~~;;;;;AAMO~~,MAAMA,YAAY;IACrB,MAAMC,SAASC,QAAQ,GAAG,CAAC,0BAA0B,IAAI;IACzD,MAAMC,aAAaD,QAAQ,GAAG,CAAC,sBAAsB,IAAI;IACzD,MAAME,WAAWF,QAAQ,GAAG,CAAC,iCAAiC,IAAI;IAElE,OAAO,WAAP,GACI,wDACI,oBAACG,iBAAeA;QAAC,SAASC;sBAC1B,oBAACD,iBAAeA;QAAC,SAASE;sBAC1B,oBAACC,cAAYA;~~QACT~~,OAAO;~~YACHP~~;~~YACAE~~;~~YACAC~~;~~QACJ~~;;~~AAIhB~~"}
1	+ {"version":3,"file":"admin/Extension.js","sources":["../../src/admin/Extension.tsx"],"sourcesContent":["import React from \"react\";\nimport { RegisterFeature } from \"@webiny/app-admin\";\nimport { CognitoFeature } from \"./presentation/Cognito/feature.js\";\nimport { CognitoAdmin } from \"./Cognito.js\";\nimport { CognitoPermissionsFeature } from \"./features/permissions/feature.js\";\nimport { CognitoSignInFeature } from \"./presentation/Cognito/signInFeature.js\";\n\nexport const Extension = () => {\n const region = process.env.REACT_APP_USER_POOL_REGION \|\| \"\";\n const userPoolId = process.env.REACT_APP_USER_POOL_ID \|\| \"\";\n const clientId = process.env.REACT_APP_USER_POOL_WEB_CLIENT_ID \|\| \"\";\n\n return (\n <>\n <RegisterFeature feature={CognitoFeature} />\n <RegisterFeature feature={CognitoPermissionsFeature} />\n <RegisterFeature feature={CognitoSignInFeature} />\n <CognitoAdmin login={{ region, userPoolId, clientId }} />\n </>\n );\n};\n"],"names":["Extension","region","process","userPoolId","clientId","RegisterFeature","CognitoFeature","CognitoPermissionsFeature","CognitoSignInFeature","CognitoAdmin"],"mappings":";;;;;;AAOO,MAAMA,YAAY;IACrB,MAAMC,SAASC,QAAQ,GAAG,CAAC,0BAA0B,IAAI;IACzD,MAAMC,aAAaD,QAAQ,GAAG,CAAC,sBAAsB,IAAI;IACzD,MAAME,WAAWF,QAAQ,GAAG,CAAC,iCAAiC,IAAI;IAElE,OAAO,WAAP,GACI,wDACI,oBAACG,iBAAeA;QAAC,SAASC;sBAC1B,oBAACD,iBAAeA;QAAC,SAASE;sBAC1B,oBAACF,iBAAeA;QAAC,SAASG;sBAC1B,oBAACC,cAAYA;QAAC,OAAO;YAAER;YAAQE;YAAYC;QAAS;;AAGhE"}

package/admin/index.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export { CognitoSignInConfig } from "./presentation/Cognito/CognitoSignInConfig.js";
2	+ export { Components as CognitoComponents } from "./presentation/Cognito/components/index.js";

package/admin/index.js ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export { CognitoSignInConfig } from "./presentation/Cognito/CognitoSignInConfig.js";
2	+ export { Components as CognitoComponents } from "./presentation/Cognito/components/index.js";

package/admin/presentation/Cognito/CognitoLoginScreen.js CHANGED Viewed

@@ -8,6 +8,8 @@ import { RequireNewPassword } from "./components/RequireNewPassword.js";
 import { RequestPasswordResetCode } from "./components/RequestPasswordResetCode.js";
 import { SetNewPassword } from "./components/SetNewPassword.js";
 import { PasswordResetCodeSent } from "./components/PasswordResetCodeSent.js";
+import { ConfirmTotpCode } from "./components/ConfirmTotpCode.js";
+import { SetupTotp } from "./components/SetupTotp.js";
 const CognitoLoginScreen = observer((props)=>{
     const { presenter } = useFeature(CognitoFeature);
     useEffect(()=>{
@@ -40,6 +42,13 @@ const CognitoLoginScreen = observer((props)=>{
         vm: vm.setNewPassword,
         onSetNewPassword: (code, password)=>presenter.confirmPasswordReset(code, password),
         onCancel: ()=>presenter.showSignIn()
+    }), "confirmTotpCode" === vm.authState && /*#__PURE__*/ react.createElement(ConfirmTotpCode, {
+        vm: vm.confirmTotpCode,
+        onSubmit: (code)=>presenter.confirmTotpCode(code),
+        onCancel: ()=>presenter.showSignIn()
+    }), "setupTotp" === vm.authState && /*#__PURE__*/ react.createElement(SetupTotp, {
+        vm: vm.setupTotp,
+        onSubmit: (code)=>presenter.verifyTotpSetup(code)
     }), ("signIn" === vm.authState || "signedOut" === vm.authState) && /*#__PURE__*/ react.createElement(SignIn, {
         vm: vm.signIn,
         onSubmit: (username, password)=>presenter.signIn(username, password),

package/admin/presentation/Cognito/CognitoLoginScreen.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"admin/presentation/Cognito/CognitoLoginScreen.js","sources":["../../../../src/admin/presentation/Cognito/CognitoLoginScreen.tsx"],"sourcesContent":["import React, { useEffect } from \"react\";\nimport { observer } from \"mobx-react-lite\";\nimport { useFeature } from \"@webiny/app\";\nimport { OverlayLoader } from \"@webiny/admin-ui\";\nimport { CognitoFeature } from \"./feature.js\";\nimport { SignIn } from \"./components/SignIn.js\";\nimport { RequireNewPassword } from \"./components/RequireNewPassword.js\";\nimport { RequestPasswordResetCode } from \"./components/RequestPasswordResetCode.js\";\nimport { SetNewPassword } from \"./components/SetNewPassword.js\";\nimport { PasswordResetCodeSent } from \"~/admin/presentation/Cognito/components/PasswordResetCodeSent.js\";\n\nexport interface CognitoLoginScreenProps {\n region: string;\n userPoolId: string;\n clientId: string;\n children: React.ReactNode;\n}\n\nexport const CognitoLoginScreen = observer((props: CognitoLoginScreenProps) => {\n const { presenter } = useFeature(CognitoFeature);\n\n useEffect(() => {\n presenter.init({\n region: props.region,\n userPoolId: props.userPoolId,\n clientId: props.clientId\n });\n }, []);\n\n const vm = presenter.vm;\n\n if (vm.isAuthenticated) {\n return <>{props.children}</>;\n }\n\n return (\n <>\n {vm.isLoggingIn ? <OverlayLoader text={\"Signing in...\"} /> : null}\n {vm.checkingSession ? <OverlayLoader text={\"Checking session...\"} /> : null}\n\n {!vm.isLoggingIn && !vm.checkingSession ? (\n <>\n {vm.authState === \"requireNewPassword\" && (\n <RequireNewPassword\n vm={vm.requireNewPassword}\n onSubmit={(password, attributes) =>\n presenter.confirmNewPassword(password, attributes)\n }\n onCancel={() => presenter.showSignIn()}\n />\n )}\n\n {vm.authState === \"requestPasswordResetCode\" && (\n <RequestPasswordResetCode\n vm={vm.requestPasswordResetCode}\n onRequestCode={username => presenter.requestPasswordReset(username)}\n onCancel={() => presenter.showSignIn()}\n />\n )}\n\n {vm.authState === \"passwordResetCodeSent\" && (\n <PasswordResetCodeSent\n vm={vm.passwordResetCodeSent}\n onResendCode={() => presenter.resendPasswordResetCode()}\n onCodeAcquired={() => presenter.showSetNewPassword()}\n onCancel={() => presenter.showSignIn()}\n />\n )}\n\n {vm.authState === \"setNewPassword\" && (\n <SetNewPassword\n vm={vm.setNewPassword}\n onSetNewPassword={(code, password) =>\n presenter.confirmPasswordReset(code, password)\n }\n onCancel={() => presenter.showSignIn()}\n />\n )}\n\n {(vm.authState === \"signIn\" \|\| vm.authState === \"signedOut\") && (\n <SignIn\n vm={vm.signIn}\n onSubmit={(username, password) => presenter.signIn(username, password)}\n onForgotPassword={() => presenter.showRequestPasswordResetCode()}\n />\n )}\n </>\n ) : null}\n </>\n );\n});\n"],"names":["CognitoLoginScreen","observer","props","presenter","useFeature","CognitoFeature","useEffect","vm","OverlayLoader","RequireNewPassword","password","attributes","RequestPasswordResetCode","username","PasswordResetCodeSent","SetNewPassword","code","SignIn"],"mappings":"~~;;;;;;;;;;AAkBO~~,MAAMA,qBAAqBC,SAAS,CAACC;IACxC,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAWC;IAEjCC,UAAU;QACNH,UAAU,IAAI,CAAC;YACX,QAAQD,MAAM,MAAM;YACpB,YAAYA,MAAM,UAAU;YAC5B,UAAUA,MAAM,QAAQ;QAC5B;IACJ,GAAG,EAAE;IAEL,MAAMK,KAAKJ,UAAU,EAAE;IAEvB,IAAII,GAAG,eAAe,EAClB,OAAO,WAAP,GAAO,0CAAGL,MAAM,QAAQ;IAG5B,OAAO,WAAP,GACI,0CACKK,GAAG,WAAW,GAAG,WAAH,GAAG,oBAACC,eAAaA;QAAC,MAAM;SAAsB,MAC5DD,GAAG,eAAe,GAAG,WAAH,GAAG,oBAACC,eAAaA;QAAC,MAAM;SAA4B,MAEtE,AAACD,GAAG,WAAW,IAAKA,GAAG,eAAe,~~GA+CnC~~,~~OA/CsC~~,WAAH,GACnC,0CACKA,AAAiB,yBAAjBA,GAAG,SAAS,IAA6B,WAAxB,GACd,oBAACE,oBAAkBA;QACf,IAAIF,GAAG,kBAAkB;QACzB,UAAU,CAACG,UAAUC,aACjBR,UAAU,kBAAkB,CAACO,UAAUC;QAE3C,UAAU,IAAMR,UAAU,UAAU;QAI3CI,AAAiB,+BAAjBA,GAAG,SAAS,IAAmC,WAA9B,GACd,oBAACK,0BAAwBA;QACrB,IAAIL,GAAG,wBAAwB;QAC/B,eAAeM,CAAAA,WAAYV,UAAU,oBAAoB,CAACU;QAC1D,UAAU,IAAMV,UAAU,UAAU;QAI3CI,AAAiB,4BAAjBA,GAAG,SAAS,IAAgC,WAA3B,GACd,oBAACO,uBAAqBA;QAClB,IAAIP,GAAG,qBAAqB;QAC5B,cAAc,IAAMJ,UAAU,uBAAuB;QACrD,gBAAgB,IAAMA,UAAU,kBAAkB;QAClD,UAAU,IAAMA,UAAU,UAAU;QAI3CI,AAAiB,qBAAjBA,GAAG,SAAS,IAAyB,WAApB,GACd,oBAACQ,gBAAcA;QACX,IAAIR,GAAG,cAAc;QACrB,kBAAkB,CAACS,MAAMN,WACrBP,UAAU,oBAAoB,CAACa,MAAMN;QAEzC,UAAU,IAAMP,UAAU,UAAU;~~QAI1CI~~,AAAAA,CAAAA,AAAiB,aAAjBA,GAAG,SAAS,IAAiBA,AAAiB,gBAAjBA,GAAG,SAAS,AAAe,mBACtD,~~oBAACU~~,QAAMA;QACH,~~IAAIV~~,GAAG,MAAM;QACb,UAAU,CAACM,UAAUH,WAAaP,UAAU,MAAM,CAACU,UAAUH;QAC7D,kBAAkB,IAAMP,UAAU,4BAA4B;;AAO1F"}
1	+ {"version":3,"file":"admin/presentation/Cognito/CognitoLoginScreen.js","sources":["../../../../src/admin/presentation/Cognito/CognitoLoginScreen.tsx"],"sourcesContent":["import React, { useEffect } from \"react\";\nimport { observer } from \"mobx-react-lite\";\nimport { useFeature } from \"@webiny/app\";\nimport { OverlayLoader } from \"@webiny/admin-ui\";\nimport { CognitoFeature } from \"./feature.js\";\nimport { SignIn } from \"./components/SignIn.js\";\nimport { RequireNewPassword } from \"./components/RequireNewPassword.js\";\nimport { RequestPasswordResetCode } from \"./components/RequestPasswordResetCode.js\";\nimport { SetNewPassword } from \"./components/SetNewPassword.js\";\nimport { PasswordResetCodeSent } from \"~/admin/presentation/Cognito/components/PasswordResetCodeSent.js\";\nimport { ConfirmTotpCode } from \"./components/ConfirmTotpCode.js\";\nimport { SetupTotp } from \"./components/SetupTotp.js\";\n\nexport interface CognitoLoginScreenProps {\n region: string;\n userPoolId: string;\n clientId: string;\n children: React.ReactNode;\n}\n\nexport const CognitoLoginScreen = observer((props: CognitoLoginScreenProps) => {\n const { presenter } = useFeature(CognitoFeature);\n\n useEffect(() => {\n presenter.init({\n region: props.region,\n userPoolId: props.userPoolId,\n clientId: props.clientId\n });\n }, []);\n\n const vm = presenter.vm;\n\n if (vm.isAuthenticated) {\n return <>{props.children}</>;\n }\n\n return (\n <>\n {vm.isLoggingIn ? <OverlayLoader text={\"Signing in...\"} /> : null}\n {vm.checkingSession ? <OverlayLoader text={\"Checking session...\"} /> : null}\n\n {!vm.isLoggingIn && !vm.checkingSession ? (\n <>\n {vm.authState === \"requireNewPassword\" && (\n <RequireNewPassword\n vm={vm.requireNewPassword}\n onSubmit={(password, attributes) =>\n presenter.confirmNewPassword(password, attributes)\n }\n onCancel={() => presenter.showSignIn()}\n />\n )}\n\n {vm.authState === \"requestPasswordResetCode\" && (\n <RequestPasswordResetCode\n vm={vm.requestPasswordResetCode}\n onRequestCode={username => presenter.requestPasswordReset(username)}\n onCancel={() => presenter.showSignIn()}\n />\n )}\n\n {vm.authState === \"passwordResetCodeSent\" && (\n <PasswordResetCodeSent\n vm={vm.passwordResetCodeSent}\n onResendCode={() => presenter.resendPasswordResetCode()}\n onCodeAcquired={() => presenter.showSetNewPassword()}\n onCancel={() => presenter.showSignIn()}\n />\n )}\n\n {vm.authState === \"setNewPassword\" && (\n <SetNewPassword\n vm={vm.setNewPassword}\n onSetNewPassword={(code, password) =>\n presenter.confirmPasswordReset(code, password)\n }\n onCancel={() => presenter.showSignIn()}\n />\n )}\n\n {vm.authState === \"confirmTotpCode\" && (\n <ConfirmTotpCode\n vm={vm.confirmTotpCode}\n onSubmit={code => presenter.confirmTotpCode(code)}\n onCancel={() => presenter.showSignIn()}\n />\n )}\n\n {vm.authState === \"setupTotp\" && (\n <SetupTotp\n vm={vm.setupTotp}\n onSubmit={code => presenter.verifyTotpSetup(code)}\n />\n )}\n\n {(vm.authState === \"signIn\" \|\| vm.authState === \"signedOut\") && (\n <SignIn\n vm={vm.signIn}\n onSubmit={(username, password) => presenter.signIn(username, password)}\n onForgotPassword={() => presenter.showRequestPasswordResetCode()}\n />\n )}\n </>\n ) : null}\n </>\n );\n});\n"],"names":["CognitoLoginScreen","observer","props","presenter","useFeature","CognitoFeature","useEffect","vm","OverlayLoader","RequireNewPassword","password","attributes","RequestPasswordResetCode","username","PasswordResetCodeSent","SetNewPassword","code","ConfirmTotpCode","SetupTotp","SignIn"],"mappings":";;;;;;;;;;;;AAoBO,MAAMA,qBAAqBC,SAAS,CAACC;IACxC,MAAM,EAAEC,SAAS,EAAE,GAAGC,WAAWC;IAEjCC,UAAU;QACNH,UAAU,IAAI,CAAC;YACX,QAAQD,MAAM,MAAM;YACpB,YAAYA,MAAM,UAAU;YAC5B,UAAUA,MAAM,QAAQ;QAC5B;IACJ,GAAG,EAAE;IAEL,MAAMK,KAAKJ,UAAU,EAAE;IAEvB,IAAII,GAAG,eAAe,EAClB,OAAO,WAAP,GAAO,0CAAGL,MAAM,QAAQ;IAG5B,OAAO,WAAP,GACI,0CACKK,GAAG,WAAW,GAAG,WAAH,GAAG,oBAACC,eAAaA;QAAC,MAAM;SAAsB,MAC5DD,GAAG,eAAe,GAAG,WAAH,GAAG,oBAACC,eAAaA;QAAC,MAAM;SAA4B,MAEtE,AAACD,GAAG,WAAW,IAAKA,GAAG,eAAe,GA8DnC,OA9DsC,WAAH,GACnC,0CACKA,AAAiB,yBAAjBA,GAAG,SAAS,IAA6B,WAAxB,GACd,oBAACE,oBAAkBA;QACf,IAAIF,GAAG,kBAAkB;QACzB,UAAU,CAACG,UAAUC,aACjBR,UAAU,kBAAkB,CAACO,UAAUC;QAE3C,UAAU,IAAMR,UAAU,UAAU;QAI3CI,AAAiB,+BAAjBA,GAAG,SAAS,IAAmC,WAA9B,GACd,oBAACK,0BAAwBA;QACrB,IAAIL,GAAG,wBAAwB;QAC/B,eAAeM,CAAAA,WAAYV,UAAU,oBAAoB,CAACU;QAC1D,UAAU,IAAMV,UAAU,UAAU;QAI3CI,AAAiB,4BAAjBA,GAAG,SAAS,IAAgC,WAA3B,GACd,oBAACO,uBAAqBA;QAClB,IAAIP,GAAG,qBAAqB;QAC5B,cAAc,IAAMJ,UAAU,uBAAuB;QACrD,gBAAgB,IAAMA,UAAU,kBAAkB;QAClD,UAAU,IAAMA,UAAU,UAAU;QAI3CI,AAAiB,qBAAjBA,GAAG,SAAS,IAAyB,WAApB,GACd,oBAACQ,gBAAcA;QACX,IAAIR,GAAG,cAAc;QACrB,kBAAkB,CAACS,MAAMN,WACrBP,UAAU,oBAAoB,CAACa,MAAMN;QAEzC,UAAU,IAAMP,UAAU,UAAU;QAI3CI,AAAiB,sBAAjBA,GAAG,SAAS,IAA0B,WAArB,GACd,oBAACU,iBAAeA;QACZ,IAAIV,GAAG,eAAe;QACtB,UAAUS,CAAAA,OAAQb,UAAU,eAAe,CAACa;QAC5C,UAAU,IAAMb,UAAU,UAAU;QAI3CI,AAAiB,gBAAjBA,GAAG,SAAS,IAAoB,WAAf,GACd,oBAACW,WAASA;QACN,IAAIX,GAAG,SAAS;QAChB,UAAUS,CAAAA,OAAQb,UAAU,eAAe,CAACa;QAIlDT,AAAAA,CAAAA,AAAiB,aAAjBA,GAAG,SAAS,IAAiBA,AAAiB,gBAAjBA,GAAG,SAAS,AAAe,mBACtD,oBAACY,QAAMA;QACH,IAAIZ,GAAG,MAAM;QACb,UAAU,CAACM,UAAUH,WAAaP,UAAU,MAAM,CAACU,UAAUH;QAC7D,kBAAkB,IAAMP,UAAU,4BAA4B;;AAO1F"}

package/admin/presentation/Cognito/CognitoPresenter.d.ts CHANGED Viewed

@@ -1,9 +1,11 @@
 import { CognitoPresenter as CognitoPresenterAbstraction, AuthState, AuthMessage, ICognitoInitParams } from "./abstractions.js";
 import { LogInUseCase } from "@webiny/app-admin/features/security/LogIn/index.js";
 import { IdentityContext } from "@webiny/app-admin/features/security/IdentityContext/index.js";
+import { CognitoSignInConfig } from "./CognitoSignInConfig.js";
 declare class CognitoPresenterImpl implements CognitoPresenterAbstraction.Interface {
     private identity;
     private logInUseCase;
+    private signInConfig;
     private authState;
     private authData;
     private message;
@@ -11,7 +13,13 @@ declare class CognitoPresenterImpl implements CognitoPresenterAbstraction.Interf
     private isLoggingIn;
     private formLoading;
     private initialized;
-    constructor(identity: IdentityContext.Interface, logInUseCase: LogInUseCase.Interface);
+    private signInTitle;
+    private signInDescription;
+    private allowCredentialsLogin;
+    private federatedProviders;
+    private totpSharedSecret;
+    private totpQrCodeUri;
+    constructor(identity: IdentityContext.Interface, logInUseCase: LogInUseCase.Interface, signInConfig: CognitoSignInConfig.Interface | undefined);
     get vm(): {
         authState: AuthState;
         checkingSession: boolean;
@@ -20,6 +28,10 @@ declare class CognitoPresenterImpl implements CognitoPresenterAbstraction.Interf
         signIn: {
             isLoading: boolean;
             message: AuthMessage | null;
+            title: string;
+            description: string | undefined;
+            allowCredentialsLogin: boolean;
+            federatedProviders: import("./CognitoSignInConfig.js").IFederatedProvider[];
         };
         requestPasswordResetCode: {
             isLoading: boolean;
@@ -37,6 +49,16 @@ declare class CognitoPresenterImpl implements CognitoPresenterAbstraction.Interf
             isLoading: boolean;
             requiredAttributes: string[];
         };
+        confirmTotpCode: {
+            isLoading: boolean;
+            message: AuthMessage | null;
+        };
+        setupTotp: {
+            isLoading: boolean;
+            sharedSecret: string;
+            qrCodeUri: string;
+            message: AuthMessage | null;
+        };
     };
     init(params: ICognitoInitParams): Promise<void>;
     signIn(username: string, password: string): Promise<void>;
@@ -44,6 +66,8 @@ declare class CognitoPresenterImpl implements CognitoPresenterAbstraction.Interf
     requestPasswordReset(username: string): Promise<void>;
     resendPasswordResetCode(): Promise<void>;
     confirmPasswordReset(code: string, password: string): Promise<void>;
+    confirmTotpCode(code: string): Promise<void>;
+    verifyTotpSetup(code: string): Promise<void>;
     showSignIn(): void;
     showRequestPasswordResetCode(): void;
     showSetNewPassword(): void;

package/admin/presentation/Cognito/CognitoPresenter.js CHANGED Viewed

@@ -4,10 +4,13 @@ import { confirmResetPassword, confirmSignIn, fetchAuthSession, resetPassword, s
 import { CognitoPresenter } from "./abstractions.js";
 import { LogInUseCase } from "@webiny/app-admin/features/security/LogIn/index.js";
 import { IdentityContext } from "@webiny/app-admin/features/security/IdentityContext/index.js";
+import { CognitoSignInConfig } from "./CognitoSignInConfig.js";
+const federatedDescription = "You will be taken to an external service to complete the sign-in process.";
 class CognitoPresenterImpl {
-    constructor(identity, logInUseCase){
+    constructor(identity, logInUseCase, signInConfig){
         this.identity = identity;
         this.logInUseCase = logInUseCase;
+        this.signInConfig = signInConfig;
         this.authState = "signIn";
         this.authData = null;
         this.message = null;
@@ -15,6 +18,12 @@ class CognitoPresenterImpl {
         this.isLoggingIn = false;
         this.formLoading = false;
         this.initialized = false;
+        this.signInTitle = "Sign in";
+        this.signInDescription = void 0;
+        this.allowCredentialsLogin = true;
+        this.federatedProviders = [];
+        this.totpSharedSecret = "";
+        this.totpQrCodeUri = "";
         makeAutoObservable(this);
     }
     get vm() {
@@ -26,7 +35,11 @@ class CognitoPresenterImpl {
             isAuthenticated: identity.isAuthenticated,
             signIn: {
                 isLoading: this.formLoading,
-                message: this.message
+                message: this.message,
+                title: this.signInTitle,
+                description: this.signInDescription,
+                allowCredentialsLogin: this.allowCredentialsLogin,
+                federatedProviders: this.federatedProviders
             },
             requestPasswordResetCode: {
                 isLoading: this.formLoading,
@@ -43,13 +56,50 @@ class CognitoPresenterImpl {
             requireNewPassword: {
                 isLoading: this.formLoading,
                 requiredAttributes: this.authData && this.authData.requiredAttributes || []
+            },
+            confirmTotpCode: {
+                isLoading: this.formLoading,
+                message: this.message
+            },
+            setupTotp: {
+                isLoading: this.formLoading,
+                sharedSecret: this.totpSharedSecret,
+                qrCodeUri: this.totpQrCodeUri,
+                message: this.message
             }
         };
     }
     async init(params) {
         if (this.initialized) return;
+        let oauthConfig;
+        if (this.signInConfig) {
+            const config = await this.signInConfig.getConfig();
+            runInAction(()=>{
+                this.signInTitle = config.title ?? "Sign in";
+                this.signInDescription = config.description;
+                if (!config.description && !config.allowCredentialsLogin) this.signInDescription = federatedDescription;
+                this.allowCredentialsLogin = config.allowCredentialsLogin;
+                this.federatedProviders = config.providers;
+            });
+            const domain = process.env.REACT_APP_USER_POOL_DOMAIN;
+            if (domain) oauthConfig = {
+                Cognito: {
+                    userPoolId: params.userPoolId,
+                    userPoolClientId: params.clientId,
+                    loginWith: {
+                        oauth: {
+                            domain,
+                            redirectSignIn: config.oauth.redirectSignIn,
+                            redirectSignOut: config.oauth.redirectSignOut,
+                            scopes: config.oauth.scopes,
+                            responseType: config.oauth.responseType
+                        }
+                    }
+                }
+            };
+        }
         Amplify.configure({
-            Auth: {
+            Auth: oauthConfig ?? {
                 Cognito: {
                     userPoolId: params.userPoolId,
                     userPoolClientId: params.clientId
@@ -81,7 +131,20 @@ class CognitoPresenterImpl {
                 };
                 this.formLoading = false;
             });
-            else {
+            else if ("CONFIRM_SIGN_IN_WITH_TOTP_CODE" === nextStep.signInStep) runInAction(()=>{
+                this.authState = "confirmTotpCode";
+                this.formLoading = false;
+            });
+            else if ("CONTINUE_SIGN_IN_WITH_TOTP_SETUP" === nextStep.signInStep) {
+                const totpSetup = nextStep.totpSetupDetails;
+                const uri = totpSetup.getSetupUri("Webiny").toString();
+                runInAction(()=>{
+                    this.totpSharedSecret = totpSetup.sharedSecret;
+                    this.totpQrCodeUri = uri;
+                    this.authState = "setupTotp";
+                    this.formLoading = false;
+                });
+            } else {
                 await this.handleSignedIn();
                 runInAction(()=>{
                     this.formLoading = false;
@@ -193,6 +256,54 @@ class CognitoPresenterImpl {
             });
         }
     }
+    async confirmTotpCode(code) {
+        runInAction(()=>{
+            this.formLoading = true;
+            this.message = null;
+        });
+        try {
+            await confirmSignIn({
+                challengeResponse: code
+            });
+            await this.handleSignedIn();
+        } catch (error) {
+            runInAction(()=>{
+                this.message = {
+                    title: "Verification Failed",
+                    text: error.message,
+                    type: "danger"
+                };
+            });
+        } finally{
+            runInAction(()=>{
+                this.formLoading = false;
+            });
+        }
+    }
+    async verifyTotpSetup(code) {
+        runInAction(()=>{
+            this.formLoading = true;
+            this.message = null;
+        });
+        try {
+            await confirmSignIn({
+                challengeResponse: code
+            });
+            await this.handleSignedIn();
+        } catch (error) {
+            runInAction(()=>{
+                this.message = {
+                    title: "Setup Failed",
+                    text: error.message,
+                    type: "danger"
+                };
+            });
+        } finally{
+            runInAction(()=>{
+                this.formLoading = false;
+            });
+        }
+    }
     showSignIn() {
         this.authState = "signIn";
         this.authData = null;
@@ -241,11 +352,6 @@ class CognitoPresenterImpl {
         }
     }
     async checkUrl() {
-        const query = new URLSearchParams(window.location.search);
-        const queryData = {};
-        query.forEach((value, key)=>queryData[key] = value);
-        const { state } = queryData;
-        if (state) return;
         return this.checkSession();
     }
     async checkSession() {
@@ -266,7 +372,13 @@ const CognitoPresenter_CognitoPresenter = CognitoPresenter.createImplementation(
     implementation: CognitoPresenterImpl,
     dependencies: [
         IdentityContext,
-        LogInUseCase
+        LogInUseCase,
+        [
+            CognitoSignInConfig,
+            {
+                optional: true
+            }
+        ]
     ]
 });
 export { CognitoPresenter_CognitoPresenter as CognitoPresenter };