@aws-amplify/auth 6.12.4 → 6.12.5-local-stack.00864ae.0
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.
- package/dist/cjs/client/apis/associateWebAuthnCredential.js +1 -2
- package/dist/cjs/client/apis/associateWebAuthnCredential.js.map +1 -1
- package/dist/cjs/client/apis/deleteWebAuthnCredential.js +1 -2
- package/dist/cjs/client/apis/deleteWebAuthnCredential.js.map +1 -1
- package/dist/cjs/client/apis/listWebAuthnCredentials.js +1 -2
- package/dist/cjs/client/apis/listWebAuthnCredentials.js.map +1 -1
- package/dist/cjs/client/flows/shared/handlePasswordSRP.js +1 -2
- package/dist/cjs/client/flows/shared/handlePasswordSRP.js.map +1 -1
- package/dist/cjs/client/flows/userAuth/handleSelectChallenge.js +1 -2
- package/dist/cjs/client/flows/userAuth/handleSelectChallenge.js.map +1 -1
- package/dist/cjs/client/flows/userAuth/handleSelectChallengeWithPassword.js +1 -2
- package/dist/cjs/client/flows/userAuth/handleSelectChallengeWithPassword.js.map +1 -1
- package/dist/cjs/client/flows/userAuth/handleSelectChallengeWithPasswordSRP.js +1 -2
- package/dist/cjs/client/flows/userAuth/handleSelectChallengeWithPasswordSRP.js.map +1 -1
- package/dist/cjs/client/flows/userAuth/handleUserAuthFlow.js +1 -2
- package/dist/cjs/client/flows/userAuth/handleUserAuthFlow.js.map +1 -1
- package/dist/cjs/client/flows/userAuth/handleWebAuthnSignInResult.js +1 -2
- package/dist/cjs/client/flows/userAuth/handleWebAuthnSignInResult.js.map +1 -1
- package/dist/cjs/client/utils/passkey/errors.js +1 -1
- package/dist/cjs/client/utils/passkey/errors.js.map +1 -1
- package/dist/cjs/client/utils/passkey/types/index.js +3 -3
- package/dist/cjs/client/utils/passkey/types/index.js.map +1 -1
- package/dist/cjs/client/utils/passkey/types/shared.js +1 -2
- package/dist/cjs/client/utils/passkey/types/shared.js.map +1 -1
- package/dist/cjs/client/utils/store/signInStore.js +2 -2
- package/dist/cjs/client/utils/store/signInStore.js.map +1 -1
- package/dist/cjs/common/AuthErrorStrings.js +5 -2
- package/dist/cjs/common/AuthErrorStrings.js.map +1 -1
- package/dist/cjs/errors/types/validation.js +2 -1
- package/dist/cjs/errors/types/validation.js.map +1 -1
- package/dist/cjs/errors/utils/assertServiceError.js +1 -2
- package/dist/cjs/errors/utils/assertServiceError.js.map +1 -1
- package/dist/cjs/errors/utils/assertValidationError.js +1 -2
- package/dist/cjs/errors/utils/assertValidationError.js.map +1 -1
- package/dist/cjs/foundation/apis/deleteWebAuthnCredential.js +1 -2
- package/dist/cjs/foundation/apis/deleteWebAuthnCredential.js.map +1 -1
- package/dist/cjs/foundation/apis/listWebAuthnCredentials.js +1 -2
- package/dist/cjs/foundation/apis/listWebAuthnCredentials.js.map +1 -1
- package/dist/cjs/foundation/factories/serviceClients/cognitoIdentityProvider/types/errors.js +8 -4
- package/dist/cjs/foundation/factories/serviceClients/cognitoIdentityProvider/types/errors.js.map +1 -1
- package/dist/cjs/foundation/parsers/regionParsers.js +2 -3
- package/dist/cjs/foundation/parsers/regionParsers.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/autoSignIn.js +3 -3
- package/dist/cjs/providers/cognito/apis/autoSignIn.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/confirmResetPassword.js +1 -2
- package/dist/cjs/providers/cognito/apis/confirmResetPassword.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/confirmSignIn.js +1 -2
- package/dist/cjs/providers/cognito/apis/confirmSignIn.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/confirmSignUp.js +1 -2
- package/dist/cjs/providers/cognito/apis/confirmSignUp.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/confirmUserAttribute.js +1 -2
- package/dist/cjs/providers/cognito/apis/confirmUserAttribute.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/deleteUser.js +1 -2
- package/dist/cjs/providers/cognito/apis/deleteUser.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/deleteUserAttributes.js +1 -2
- package/dist/cjs/providers/cognito/apis/deleteUserAttributes.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/fetchDevices.js +1 -2
- package/dist/cjs/providers/cognito/apis/fetchDevices.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/fetchMFAPreference.js +1 -2
- package/dist/cjs/providers/cognito/apis/fetchMFAPreference.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/forgetDevice.js +1 -2
- package/dist/cjs/providers/cognito/apis/forgetDevice.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/rememberDevice.js +1 -2
- package/dist/cjs/providers/cognito/apis/rememberDevice.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/resendSignUpCode.js +1 -2
- package/dist/cjs/providers/cognito/apis/resendSignUpCode.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/resetPassword.js +1 -2
- package/dist/cjs/providers/cognito/apis/resetPassword.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/setUpTOTP.js +1 -2
- package/dist/cjs/providers/cognito/apis/setUpTOTP.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/signIn.js +1 -2
- package/dist/cjs/providers/cognito/apis/signIn.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/signInWithCustomAuth.js +1 -2
- package/dist/cjs/providers/cognito/apis/signInWithCustomAuth.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/signInWithCustomSRPAuth.js +1 -2
- package/dist/cjs/providers/cognito/apis/signInWithCustomSRPAuth.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/signInWithRedirect.js +1 -2
- package/dist/cjs/providers/cognito/apis/signInWithRedirect.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/signInWithSRP.js +1 -2
- package/dist/cjs/providers/cognito/apis/signInWithSRP.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/signInWithUserAuth.js +1 -2
- package/dist/cjs/providers/cognito/apis/signInWithUserAuth.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/signInWithUserPassword.js +1 -2
- package/dist/cjs/providers/cognito/apis/signInWithUserPassword.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/signOut.js +1 -2
- package/dist/cjs/providers/cognito/apis/signOut.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/signUp.js +1 -2
- package/dist/cjs/providers/cognito/apis/signUp.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/updateMFAPreference.js +2 -3
- package/dist/cjs/providers/cognito/apis/updateMFAPreference.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/updatePassword.js +1 -2
- package/dist/cjs/providers/cognito/apis/updatePassword.js.map +1 -1
- package/dist/cjs/providers/cognito/apis/verifyTOTPSetup.js +1 -2
- package/dist/cjs/providers/cognito/apis/verifyTOTPSetup.js.map +1 -1
- package/dist/cjs/providers/cognito/credentialsProvider/IdentityIdProvider.js +8 -3
- package/dist/cjs/providers/cognito/credentialsProvider/IdentityIdProvider.js.map +1 -1
- package/dist/cjs/providers/cognito/credentialsProvider/credentialsProvider.js +13 -2
- package/dist/cjs/providers/cognito/credentialsProvider/credentialsProvider.js.map +1 -1
- package/dist/cjs/providers/cognito/credentialsProvider/utils.js +1 -2
- package/dist/cjs/providers/cognito/credentialsProvider/utils.js.map +1 -1
- package/dist/cjs/providers/cognito/factories/createCognitoIdentityPoolEndpointResolver.js +16 -0
- package/dist/cjs/providers/cognito/factories/createCognitoIdentityPoolEndpointResolver.js.map +1 -0
- package/dist/cjs/providers/cognito/factories/index.js +3 -1
- package/dist/cjs/providers/cognito/factories/index.js.map +1 -1
- package/dist/cjs/providers/cognito/tokenProvider/TokenStore.js +2 -2
- package/dist/cjs/providers/cognito/tokenProvider/TokenStore.js.map +1 -1
- package/dist/cjs/providers/cognito/tokenProvider/cacheTokens.js +1 -2
- package/dist/cjs/providers/cognito/tokenProvider/cacheTokens.js.map +1 -1
- package/dist/cjs/providers/cognito/tokenProvider/errorHelpers.js +1 -1
- package/dist/cjs/providers/cognito/tokenProvider/errorHelpers.js.map +1 -1
- package/dist/cjs/providers/cognito/types/errors.js +48 -24
- package/dist/cjs/providers/cognito/types/errors.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/apiHelpers.js +2 -3
- package/dist/cjs/providers/cognito/utils/apiHelpers.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/getNewDeviceMetadata.js +1 -2
- package/dist/cjs/providers/cognito/utils/getNewDeviceMetadata.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/handleDeviceSRPAuth.js +1 -2
- package/dist/cjs/providers/cognito/utils/handleDeviceSRPAuth.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/handlePasswordVerifierChallenge.js +1 -2
- package/dist/cjs/providers/cognito/utils/handlePasswordVerifierChallenge.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/oauth/getRedirectUrl.js +2 -5
- package/dist/cjs/providers/cognito/utils/oauth/getRedirectUrl.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/oauth/getRedirectUrl.native.js +1 -2
- package/dist/cjs/providers/cognito/utils/oauth/getRedirectUrl.native.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/retryOnResourceNotFoundException.js +1 -2
- package/dist/cjs/providers/cognito/utils/retryOnResourceNotFoundException.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/setActiveSignInUsername.js +1 -2
- package/dist/cjs/providers/cognito/utils/setActiveSignInUsername.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/signInHelpers.js +22 -23
- package/dist/cjs/providers/cognito/utils/signInHelpers.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/signUpHelpers.js +3 -3
- package/dist/cjs/providers/cognito/utils/signUpHelpers.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/types.js +6 -6
- package/dist/cjs/providers/cognito/utils/types.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/userContextData.js +1 -2
- package/dist/cjs/providers/cognito/utils/userContextData.js.map +1 -1
- package/dist/cjs/providers/cognito/utils/userContextData.native.js +1 -2
- package/dist/cjs/providers/cognito/utils/userContextData.native.js.map +1 -1
- package/dist/cjs/types/Auth.js +2 -1
- package/dist/cjs/types/Auth.js.map +1 -1
- package/dist/esm/client/flows/shared/handlePasswordSRP.mjs +1 -0
- package/dist/esm/client/flows/shared/handlePasswordSRP.mjs.map +1 -1
- package/dist/esm/client/flows/userAuth/handleSelectChallenge.mjs +1 -0
- package/dist/esm/client/flows/userAuth/handleSelectChallenge.mjs.map +1 -1
- package/dist/esm/client/flows/userAuth/handleSelectChallengeWithPassword.mjs +1 -0
- package/dist/esm/client/flows/userAuth/handleSelectChallengeWithPassword.mjs.map +1 -1
- package/dist/esm/client/flows/userAuth/handleSelectChallengeWithPasswordSRP.mjs +1 -0
- package/dist/esm/client/flows/userAuth/handleSelectChallengeWithPasswordSRP.mjs.map +1 -1
- package/dist/esm/client/flows/userAuth/handleUserAuthFlow.mjs +1 -0
- package/dist/esm/client/flows/userAuth/handleUserAuthFlow.mjs.map +1 -1
- package/dist/esm/foundation/apis/deleteWebAuthnCredential.mjs +1 -0
- package/dist/esm/foundation/apis/deleteWebAuthnCredential.mjs.map +1 -1
- package/dist/esm/foundation/apis/listWebAuthnCredentials.mjs +1 -0
- package/dist/esm/foundation/apis/listWebAuthnCredentials.mjs.map +1 -1
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/constants.d.ts +1 -1
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createAssociateSoftwareTokenClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createChangePasswordClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createCompleteWebAuthnRegistrationClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createConfirmDeviceClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createConfirmForgotPasswordClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createConfirmSignUpClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createDeleteUserAttributesClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createDeleteUserClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createDeleteWebAuthnCredentialClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createForgetDeviceClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createForgotPasswordClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createGetUserAttributeVerificationCodeClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createGetUserClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createGlobalSignOutClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createInitiateAuthClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createListDevicesClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createListWebAuthnCredentialsClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createResendConfirmationCodeClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createRespondToAuthChallengeClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createRevokeTokenClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createSetUserMFAPreferenceClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createSignUpClient.d.ts +3 -3
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createStartWebAuthnRegistrationClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createUpdateDeviceStatusClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createUpdateUserAttributesClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createVerifySoftwareTokenClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/createVerifyUserAttributeClient.d.ts +2 -2
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/shared/serde/createEmptyResponseDeserializer.d.ts +1 -1
- package/dist/esm/foundation/factories/serviceClients/cognitoIdentityProvider/shared/serde/createUserPoolDeserializer.d.ts +1 -1
- package/dist/esm/providers/cognito/apis/internal/fetchUserAttributes.mjs +1 -0
- package/dist/esm/providers/cognito/apis/internal/fetchUserAttributes.mjs.map +1 -1
- package/dist/esm/providers/cognito/credentialsProvider/IdentityIdProvider.mjs +9 -1
- package/dist/esm/providers/cognito/credentialsProvider/IdentityIdProvider.mjs.map +1 -1
- package/dist/esm/providers/cognito/credentialsProvider/credentialsProvider.mjs +13 -1
- package/dist/esm/providers/cognito/credentialsProvider/credentialsProvider.mjs.map +1 -1
- package/dist/esm/providers/cognito/factories/createCognitoIdentityPoolEndpointResolver.d.ts +6 -0
- package/dist/esm/providers/cognito/factories/createCognitoIdentityPoolEndpointResolver.mjs +14 -0
- package/dist/esm/providers/cognito/factories/createCognitoIdentityPoolEndpointResolver.mjs.map +1 -0
- package/dist/esm/providers/cognito/factories/index.d.ts +1 -0
- package/dist/esm/providers/cognito/factories/index.mjs +1 -0
- package/dist/esm/providers/cognito/factories/index.mjs.map +1 -1
- package/dist/esm/providers/cognito/utils/getNewDeviceMetadata.mjs +1 -0
- package/dist/esm/providers/cognito/utils/getNewDeviceMetadata.mjs.map +1 -1
- package/dist/esm/providers/cognito/utils/handleDeviceSRPAuth.mjs +1 -0
- package/dist/esm/providers/cognito/utils/handleDeviceSRPAuth.mjs.map +1 -1
- package/dist/esm/providers/cognito/utils/handlePasswordVerifierChallenge.mjs +1 -0
- package/dist/esm/providers/cognito/utils/handlePasswordVerifierChallenge.mjs.map +1 -1
- package/dist/esm/providers/cognito/utils/oauth/attemptCompleteOAuthFlow.d.ts +1 -1
- package/dist/esm/providers/cognito/utils/oauth/completeOAuthFlow.d.ts +1 -1
- package/dist/esm/providers/cognito/utils/oauth/generateCodeVerifier.d.ts +1 -1
- package/dist/esm/providers/cognito/utils/oauth/getRedirectUrl.mjs +1 -3
- package/dist/esm/providers/cognito/utils/oauth/getRedirectUrl.mjs.map +1 -1
- package/dist/esm/providers/cognito/utils/refreshAuthTokens.d.ts +1 -1
- package/dist/esm/providers/cognito/utils/refreshAuthTokens.mjs +1 -0
- package/dist/esm/providers/cognito/utils/refreshAuthTokens.mjs.map +1 -1
- package/dist/esm/providers/cognito/utils/signInHelpers.d.ts +1 -1
- package/package.json +105 -106
- package/src/providers/cognito/credentialsProvider/IdentityIdProvider.ts +8 -1
- package/src/providers/cognito/credentialsProvider/credentialsProvider.ts +14 -1
- package/src/providers/cognito/factories/createCognitoIdentityPoolEndpointResolver.ts +15 -0
- package/src/providers/cognito/factories/index.ts +1 -0
- package/src/providers/cognito/utils/oauth/getRedirectUrl.ts +1 -2
|
@@ -25,9 +25,7 @@ function getRedirectUrl(redirects, preferredRedirectUrl) {
|
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
// origin + pathname => https://example.com/app
|
|
28
|
-
const isSameOriginAndPathName = (redirect) => redirect.startsWith(
|
|
29
|
-
// eslint-disable-next-line no-constant-binary-expression
|
|
30
|
-
String(window.location.origin + window.location.pathname ?? '/'));
|
|
28
|
+
const isSameOriginAndPathName = (redirect) => redirect.startsWith(String(window.location.origin + (window.location.pathname || '/')));
|
|
31
29
|
// domain => outlook.live.com, github.com
|
|
32
30
|
const isTheSameDomain = (redirect) => redirect.includes(String(window.location.hostname));
|
|
33
31
|
const isHttp = (redirect) => redirect.startsWith('http://');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getRedirectUrl.mjs","sources":["../../../../../../src/providers/cognito/utils/oauth/getRedirectUrl.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { invalidOriginException, invalidPreferredRedirectUrlException, invalidRedirectException, } from '../../../../errors/constants';\n/** @internal */\nexport function getRedirectUrl(redirects, preferredRedirectUrl) {\n if (preferredRedirectUrl) {\n const redirectUrl = redirects?.find(redirect => redirect === preferredRedirectUrl);\n if (!redirectUrl) {\n throw invalidPreferredRedirectUrlException;\n }\n return redirectUrl;\n }\n else {\n const redirectUrlFromTheSameOrigin = redirects?.find(isSameOriginAndPathName) ??\n redirects?.find(isTheSameDomain);\n const redirectUrlFromDifferentOrigin = redirects?.find(isHttps) ?? redirects?.find(isHttp);\n if (redirectUrlFromTheSameOrigin) {\n return redirectUrlFromTheSameOrigin;\n }\n else if (redirectUrlFromDifferentOrigin) {\n throw invalidOriginException;\n }\n throw invalidRedirectException;\n }\n}\n// origin + pathname => https://example.com/app\nconst isSameOriginAndPathName = (redirect) => redirect.startsWith(
|
|
1
|
+
{"version":3,"file":"getRedirectUrl.mjs","sources":["../../../../../../src/providers/cognito/utils/oauth/getRedirectUrl.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { invalidOriginException, invalidPreferredRedirectUrlException, invalidRedirectException, } from '../../../../errors/constants';\n/** @internal */\nexport function getRedirectUrl(redirects, preferredRedirectUrl) {\n if (preferredRedirectUrl) {\n const redirectUrl = redirects?.find(redirect => redirect === preferredRedirectUrl);\n if (!redirectUrl) {\n throw invalidPreferredRedirectUrlException;\n }\n return redirectUrl;\n }\n else {\n const redirectUrlFromTheSameOrigin = redirects?.find(isSameOriginAndPathName) ??\n redirects?.find(isTheSameDomain);\n const redirectUrlFromDifferentOrigin = redirects?.find(isHttps) ?? redirects?.find(isHttp);\n if (redirectUrlFromTheSameOrigin) {\n return redirectUrlFromTheSameOrigin;\n }\n else if (redirectUrlFromDifferentOrigin) {\n throw invalidOriginException;\n }\n throw invalidRedirectException;\n }\n}\n// origin + pathname => https://example.com/app\nconst isSameOriginAndPathName = (redirect) => redirect.startsWith(String(window.location.origin + (window.location.pathname || '/')));\n// domain => outlook.live.com, github.com\nconst isTheSameDomain = (redirect) => redirect.includes(String(window.location.hostname));\nconst isHttp = (redirect) => redirect.startsWith('http://');\nconst isHttps = (redirect) => redirect.startsWith('https://');\n"],"names":[],"mappings":";;AAAA;AACA;AAEA;AACO,SAAS,cAAc,CAAC,SAAS,EAAE,oBAAoB,EAAE;AAChE,IAAI,IAAI,oBAAoB,EAAE;AAC9B,QAAQ,MAAM,WAAW,GAAG,SAAS,EAAE,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,oBAAoB,CAAC;AAC1F,QAAQ,IAAI,CAAC,WAAW,EAAE;AAC1B,YAAY,MAAM,oCAAoC;AACtD;AACA,QAAQ,OAAO,WAAW;AAC1B;AACA,SAAS;AACT,QAAQ,MAAM,4BAA4B,GAAG,SAAS,EAAE,IAAI,CAAC,uBAAuB,CAAC;AACrF,YAAY,SAAS,EAAE,IAAI,CAAC,eAAe,CAAC;AAC5C,QAAQ,MAAM,8BAA8B,GAAG,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC;AAClG,QAAQ,IAAI,4BAA4B,EAAE;AAC1C,YAAY,OAAO,4BAA4B;AAC/C;AACA,aAAa,IAAI,8BAA8B,EAAE;AACjD,YAAY,MAAM,sBAAsB;AACxC;AACA,QAAQ,MAAM,wBAAwB;AACtC;AACA;AACA;AACA,MAAM,uBAAuB,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC;AACrI;AACA,MAAM,eAAe,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACzF,MAAM,MAAM,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;AAC3D,MAAM,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;;;;"}
|
|
@@ -2,7 +2,7 @@ import { AuthConfig } from '@aws-amplify/core';
|
|
|
2
2
|
import { CognitoAuthTokens, TokenRefresher } from '../tokenProvider/types';
|
|
3
3
|
export declare const refreshAuthTokens: (args_0: {
|
|
4
4
|
tokens: CognitoAuthTokens;
|
|
5
|
-
authConfig?: AuthConfig
|
|
5
|
+
authConfig?: AuthConfig;
|
|
6
6
|
username: string;
|
|
7
7
|
}) => Promise<CognitoAuthTokens>;
|
|
8
8
|
export declare const refreshAuthTokensWithoutDedupe: TokenRefresher;
|
|
@@ -11,6 +11,7 @@ import '../../../common/AuthErrorStrings.mjs';
|
|
|
11
11
|
import '../../../errors/types/validation.mjs';
|
|
12
12
|
import '../types/errors.mjs';
|
|
13
13
|
import { createCognitoUserPoolEndpointResolver } from '../factories/createCognitoUserPoolEndpointResolver.mjs';
|
|
14
|
+
import '@aws-amplify/core';
|
|
14
15
|
import { getUserContextData } from './userContextData.mjs';
|
|
15
16
|
|
|
16
17
|
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshAuthTokens.mjs","sources":["../../../../../src/providers/cognito/utils/refreshAuthTokens.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { assertTokenProviderConfig, deDupeAsyncFunction, decodeJWT, } from '@aws-amplify/core/internals/utils';\nimport { getRegionFromUserPoolId } from '../../../foundation/parsers';\nimport { assertAuthTokensWithRefreshToken } from '../utils/types';\nimport { AuthError } from '../../../errors/AuthError';\nimport { createInitiateAuthClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';\nimport { createCognitoUserPoolEndpointResolver } from '../factories';\nimport { getUserContextData } from './userContextData';\nconst refreshAuthTokensFunction = async ({ tokens, authConfig, username, }) => {\n assertTokenProviderConfig(authConfig?.Cognito);\n const { userPoolId, userPoolClientId, userPoolEndpoint } = authConfig.Cognito;\n const region = getRegionFromUserPoolId(userPoolId);\n assertAuthTokensWithRefreshToken(tokens);\n const refreshTokenString = tokens.refreshToken;\n const AuthParameters = {\n REFRESH_TOKEN: refreshTokenString,\n };\n if (tokens.deviceMetadata?.deviceKey) {\n AuthParameters.DEVICE_KEY = tokens.deviceMetadata.deviceKey;\n }\n const UserContextData = getUserContextData({\n username,\n userPoolId,\n userPoolClientId,\n });\n const initiateAuth = createInitiateAuthClient({\n endpointResolver: createCognitoUserPoolEndpointResolver({\n endpointOverride: userPoolEndpoint,\n }),\n });\n const { AuthenticationResult } = await initiateAuth({ region }, {\n ClientId: userPoolClientId,\n AuthFlow: 'REFRESH_TOKEN_AUTH',\n AuthParameters,\n UserContextData,\n });\n const accessToken = decodeJWT(AuthenticationResult?.AccessToken ?? '');\n const idToken = AuthenticationResult?.IdToken\n ? decodeJWT(AuthenticationResult.IdToken)\n : undefined;\n const { iat } = accessToken.payload;\n // This should never happen. If it does, it's a bug from the service.\n if (!iat) {\n throw new AuthError({\n name: 'iatNotFoundException',\n message: 'iat not found in access token',\n });\n }\n const clockDrift = iat * 1000 - new Date().getTime();\n return {\n accessToken,\n idToken,\n clockDrift,\n refreshToken: refreshTokenString,\n username,\n };\n};\nexport const refreshAuthTokens = deDupeAsyncFunction(refreshAuthTokensFunction);\nexport const refreshAuthTokensWithoutDedupe = refreshAuthTokensFunction;\n"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"refreshAuthTokens.mjs","sources":["../../../../../src/providers/cognito/utils/refreshAuthTokens.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { assertTokenProviderConfig, deDupeAsyncFunction, decodeJWT, } from '@aws-amplify/core/internals/utils';\nimport { getRegionFromUserPoolId } from '../../../foundation/parsers';\nimport { assertAuthTokensWithRefreshToken } from '../utils/types';\nimport { AuthError } from '../../../errors/AuthError';\nimport { createInitiateAuthClient } from '../../../foundation/factories/serviceClients/cognitoIdentityProvider';\nimport { createCognitoUserPoolEndpointResolver } from '../factories';\nimport { getUserContextData } from './userContextData';\nconst refreshAuthTokensFunction = async ({ tokens, authConfig, username, }) => {\n assertTokenProviderConfig(authConfig?.Cognito);\n const { userPoolId, userPoolClientId, userPoolEndpoint } = authConfig.Cognito;\n const region = getRegionFromUserPoolId(userPoolId);\n assertAuthTokensWithRefreshToken(tokens);\n const refreshTokenString = tokens.refreshToken;\n const AuthParameters = {\n REFRESH_TOKEN: refreshTokenString,\n };\n if (tokens.deviceMetadata?.deviceKey) {\n AuthParameters.DEVICE_KEY = tokens.deviceMetadata.deviceKey;\n }\n const UserContextData = getUserContextData({\n username,\n userPoolId,\n userPoolClientId,\n });\n const initiateAuth = createInitiateAuthClient({\n endpointResolver: createCognitoUserPoolEndpointResolver({\n endpointOverride: userPoolEndpoint,\n }),\n });\n const { AuthenticationResult } = await initiateAuth({ region }, {\n ClientId: userPoolClientId,\n AuthFlow: 'REFRESH_TOKEN_AUTH',\n AuthParameters,\n UserContextData,\n });\n const accessToken = decodeJWT(AuthenticationResult?.AccessToken ?? '');\n const idToken = AuthenticationResult?.IdToken\n ? decodeJWT(AuthenticationResult.IdToken)\n : undefined;\n const { iat } = accessToken.payload;\n // This should never happen. If it does, it's a bug from the service.\n if (!iat) {\n throw new AuthError({\n name: 'iatNotFoundException',\n message: 'iat not found in access token',\n });\n }\n const clockDrift = iat * 1000 - new Date().getTime();\n return {\n accessToken,\n idToken,\n clockDrift,\n refreshToken: refreshTokenString,\n username,\n };\n};\nexport const refreshAuthTokens = deDupeAsyncFunction(refreshAuthTokensFunction);\nexport const refreshAuthTokensWithoutDedupe = refreshAuthTokensFunction;\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;AACA;AAQA,MAAM,yBAAyB,GAAG,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,GAAG,KAAK;AAC/E,IAAI,yBAAyB,CAAC,UAAU,EAAE,OAAO,CAAC;AAClD,IAAI,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,UAAU,CAAC,OAAO;AACjF,IAAI,MAAM,MAAM,GAAG,uBAAuB,CAAC,UAAU,CAAC;AACtD,IAAI,gCAAgC,CAAC,MAAM,CAAC;AAC5C,IAAI,MAAM,kBAAkB,GAAG,MAAM,CAAC,YAAY;AAClD,IAAI,MAAM,cAAc,GAAG;AAC3B,QAAQ,aAAa,EAAE,kBAAkB;AACzC,KAAK;AACL,IAAI,IAAI,MAAM,CAAC,cAAc,EAAE,SAAS,EAAE;AAC1C,QAAQ,cAAc,CAAC,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,SAAS;AACnE;AACA,IAAI,MAAM,eAAe,GAAG,kBAAkB,CAAC;AAC/C,QAAQ,QAAQ;AAChB,QAAQ,UAAU;AAClB,QAAQ,gBAAgB;AACxB,KAAK,CAAC;AACN,IAAI,MAAM,YAAY,GAAG,wBAAwB,CAAC;AAClD,QAAQ,gBAAgB,EAAE,qCAAqC,CAAC;AAChE,YAAY,gBAAgB,EAAE,gBAAgB;AAC9C,SAAS,CAAC;AACV,KAAK,CAAC;AACN,IAAI,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE;AACpE,QAAQ,QAAQ,EAAE,gBAAgB;AAClC,QAAQ,QAAQ,EAAE,oBAAoB;AACtC,QAAQ,cAAc;AACtB,QAAQ,eAAe;AACvB,KAAK,CAAC;AACN,IAAI,MAAM,WAAW,GAAG,SAAS,CAAC,oBAAoB,EAAE,WAAW,IAAI,EAAE,CAAC;AAC1E,IAAI,MAAM,OAAO,GAAG,oBAAoB,EAAE;AAC1C,UAAU,SAAS,CAAC,oBAAoB,CAAC,OAAO;AAChD,UAAU,SAAS;AACnB,IAAI,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC,OAAO;AACvC;AACA,IAAI,IAAI,CAAC,GAAG,EAAE;AACd,QAAQ,MAAM,IAAI,SAAS,CAAC;AAC5B,YAAY,IAAI,EAAE,sBAAsB;AACxC,YAAY,OAAO,EAAE,+BAA+B;AACpD,SAAS,CAAC;AACV;AACA,IAAI,MAAM,UAAU,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;AACxD,IAAI,OAAO;AACX,QAAQ,WAAW;AACnB,QAAQ,OAAO;AACf,QAAQ,UAAU;AAClB,QAAQ,YAAY,EAAE,kBAAkB;AACxC,QAAQ,QAAQ;AAChB,KAAK;AACL,CAAC;AACW,MAAC,iBAAiB,GAAG,mBAAmB,CAAC,yBAAyB;AAClE,MAAC,8BAA8B,GAAG;;;;"}
|
|
@@ -37,7 +37,7 @@ export declare function mapMfaType(mfa: string): CognitoMFAType;
|
|
|
37
37
|
export declare function getMFAType(type?: string): AuthMFAType | undefined;
|
|
38
38
|
export declare function getMFATypes(types?: string[]): AuthMFAType[] | undefined;
|
|
39
39
|
export declare function parseMFATypes(mfa?: string): CognitoMFAType[];
|
|
40
|
-
export declare function getAllowedMfaSetupTypes(availableMfaSetupTypes: AuthMFAType[]):
|
|
40
|
+
export declare function getAllowedMfaSetupTypes(availableMfaSetupTypes: AuthMFAType[]): ("EMAIL" | "TOTP")[];
|
|
41
41
|
export declare function assertUserNotAuthenticated(): Promise<void>;
|
|
42
42
|
export declare function getActiveSignInUsername(username: string): string;
|
|
43
43
|
export declare function handleMFAChallenge({ challengeName, challengeResponse, clientMetadata, session, username, config, }: HandleAuthChallengeRequest & {
|
package/package.json
CHANGED
|
@@ -1,108 +1,107 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
"gitHead": "f2ac9929610f7f878f124083ceaf03465113cd44"
|
|
2
|
+
"name": "@aws-amplify/auth",
|
|
3
|
+
"version": "6.12.5-local-stack.00864ae.0+00864ae",
|
|
4
|
+
"description": "Auth category of aws-amplify",
|
|
5
|
+
"main": "./dist/cjs/index.js",
|
|
6
|
+
"module": "./dist/esm/index.mjs",
|
|
7
|
+
"typings": "./dist/esm/index.d.ts",
|
|
8
|
+
"react-native": "./dist/cjs/index.js",
|
|
9
|
+
"sideEffects": [
|
|
10
|
+
"./dist/cjs/providers/cognito/apis/signInWithRedirect.js",
|
|
11
|
+
"./dist/esm/providers/cognito/apis/signInWithRedirect.mjs",
|
|
12
|
+
"./dist/cjs/providers/cognito/utils/oauth/enableOAuthListener.js",
|
|
13
|
+
"./dist/esm/providers/cognito/utils/oauth/enableOAuthListener.mjs"
|
|
14
|
+
],
|
|
15
|
+
"publishConfig": {
|
|
16
|
+
"access": "public"
|
|
17
|
+
},
|
|
18
|
+
"scripts": {
|
|
19
|
+
"test": "yarn lint --fix && jest -w 1 --coverage --logHeapUsage",
|
|
20
|
+
"build-with-test": "npm test && npm run build",
|
|
21
|
+
"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
|
|
22
|
+
"build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",
|
|
23
|
+
"build:watch": "npm run build:esm-cjs -- --watch",
|
|
24
|
+
"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
|
|
25
|
+
"clean": "npm run clean:size && rimraf lib-esm lib dist",
|
|
26
|
+
"clean:size": "rimraf dual-publish-tmp tmp*",
|
|
27
|
+
"format": "echo \"Not implemented\"",
|
|
28
|
+
"lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
|
|
29
|
+
"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
|
|
30
|
+
"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 91.18"
|
|
31
|
+
},
|
|
32
|
+
"typesVersions": {
|
|
33
|
+
">=4.2": {
|
|
34
|
+
"cognito": [
|
|
35
|
+
"./dist/esm/providers/cognito/index.d.ts"
|
|
36
|
+
],
|
|
37
|
+
"cognito/server": [
|
|
38
|
+
"./dist/esm/providers/cognito/apis/server/index.d.ts"
|
|
39
|
+
],
|
|
40
|
+
"server": [
|
|
41
|
+
"./dist/esm/server.d.ts"
|
|
42
|
+
]
|
|
43
|
+
}
|
|
44
|
+
},
|
|
45
|
+
"exports": {
|
|
46
|
+
".": {
|
|
47
|
+
"react-native": "./dist/cjs/index.js",
|
|
48
|
+
"types": "./dist/esm/index.d.ts",
|
|
49
|
+
"import": "./dist/esm/index.mjs",
|
|
50
|
+
"require": "./dist/cjs/index.js"
|
|
51
|
+
},
|
|
52
|
+
"./cognito": {
|
|
53
|
+
"react-native": "./dist/cjs/providers/cognito/index.js",
|
|
54
|
+
"types": "./dist/esm/providers/cognito/index.d.ts",
|
|
55
|
+
"import": "./dist/esm/providers/cognito/index.mjs",
|
|
56
|
+
"require": "./dist/cjs/providers/cognito/index.js"
|
|
57
|
+
},
|
|
58
|
+
"./cognito/server": {
|
|
59
|
+
"types": "./dist/esm/providers/cognito/apis/server/index.d.ts",
|
|
60
|
+
"import": "./dist/esm/providers/cognito/apis/server/index.mjs",
|
|
61
|
+
"require": "./dist/cjs/providers/cognito/apis/server/index.js"
|
|
62
|
+
},
|
|
63
|
+
"./server": {
|
|
64
|
+
"types": "./dist/esm/server.d.ts",
|
|
65
|
+
"import": "./dist/esm/server.mjs",
|
|
66
|
+
"require": "./dist/cjs/server.js"
|
|
67
|
+
},
|
|
68
|
+
"./enable-oauth-listener": {
|
|
69
|
+
"types": "./dist/esm/providers/cognito/utils/oauth/enableOAuthListener.d.ts",
|
|
70
|
+
"import": "./dist/esm/providers/cognito/utils/oauth/enableOAuthListener.mjs",
|
|
71
|
+
"require": "./dist/cjs/providers/cognito/utils/oauth/enableOAuthListener.js"
|
|
72
|
+
},
|
|
73
|
+
"./package.json": "./package.json"
|
|
74
|
+
},
|
|
75
|
+
"repository": {
|
|
76
|
+
"type": "git",
|
|
77
|
+
"url": "https://github.com/aws-amplify/amplify-js.git"
|
|
78
|
+
},
|
|
79
|
+
"author": "Amazon Web Services",
|
|
80
|
+
"license": "Apache-2.0",
|
|
81
|
+
"bugs": {
|
|
82
|
+
"url": "https://github.com/aws/aws-amplify/issues"
|
|
83
|
+
},
|
|
84
|
+
"homepage": "https://aws-amplify.github.io/",
|
|
85
|
+
"files": [
|
|
86
|
+
"dist/cjs",
|
|
87
|
+
"dist/esm",
|
|
88
|
+
"src",
|
|
89
|
+
"cognito",
|
|
90
|
+
"server",
|
|
91
|
+
"enable-oauth-listener"
|
|
92
|
+
],
|
|
93
|
+
"dependencies": {
|
|
94
|
+
"@aws-crypto/sha256-js": "5.2.0",
|
|
95
|
+
"@smithy/types": "^3.3.0",
|
|
96
|
+
"tslib": "^2.5.0"
|
|
97
|
+
},
|
|
98
|
+
"peerDependencies": {
|
|
99
|
+
"@aws-amplify/core": "6.11.5-local-stack.00864ae.0+00864ae"
|
|
100
|
+
},
|
|
101
|
+
"devDependencies": {
|
|
102
|
+
"@aws-amplify/core": "6.11.5-local-stack.00864ae.0+00864ae",
|
|
103
|
+
"@aws-amplify/react-native": "1.1.10-local-stack.00864ae.0+00864ae",
|
|
104
|
+
"@jest/test-sequencer": "^29.7.0"
|
|
105
|
+
},
|
|
106
|
+
"gitHead": "00864aec571d0509655eea0673e896d69d434972"
|
|
108
107
|
}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
|
-
import { AuthTokens, Identity,
|
|
4
|
+
import { AuthTokens, Identity, createGetIdClient } from '@aws-amplify/core';
|
|
5
5
|
import { CognitoIdentityPoolConfig } from '@aws-amplify/core/internals/utils';
|
|
6
6
|
|
|
7
7
|
import { AuthError } from '../../../errors/AuthError';
|
|
8
8
|
import { assertServiceError } from '../../../errors/utils/assertServiceError';
|
|
9
9
|
import { getRegionFromIdentityPoolId } from '../../../foundation/parsers';
|
|
10
10
|
import { GetIdException } from '../types/errors';
|
|
11
|
+
import { createCognitoIdentityPoolEndpointResolver } from '../factories';
|
|
11
12
|
|
|
12
13
|
import { IdentityIdStore } from './types';
|
|
13
14
|
import { formLoginsMap } from './utils';
|
|
@@ -58,6 +59,12 @@ async function generateIdentityId(
|
|
|
58
59
|
const identityPoolId = authConfig?.identityPoolId;
|
|
59
60
|
const region = getRegionFromIdentityPoolId(identityPoolId);
|
|
60
61
|
|
|
62
|
+
const getId = createGetIdClient({
|
|
63
|
+
endpointResolver: createCognitoIdentityPoolEndpointResolver({
|
|
64
|
+
endpointOverride: authConfig.identityPoolEndpoint,
|
|
65
|
+
}),
|
|
66
|
+
});
|
|
67
|
+
|
|
61
68
|
// IdentityId is absent so get it using IdentityPoolId with Cognito's GetId API
|
|
62
69
|
let idResult: string | undefined;
|
|
63
70
|
// for a first-time user, this will return a brand new identity
|
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
CredentialsAndIdentityId,
|
|
8
8
|
CredentialsAndIdentityIdProvider,
|
|
9
9
|
GetCredentialsOptions,
|
|
10
|
-
|
|
10
|
+
createGetCredentialsForIdentityClient,
|
|
11
11
|
} from '@aws-amplify/core';
|
|
12
12
|
import {
|
|
13
13
|
CognitoIdentityPoolConfig,
|
|
@@ -18,6 +18,7 @@ import { AuthError } from '../../../errors/AuthError';
|
|
|
18
18
|
import { assertServiceError } from '../../../errors/utils/assertServiceError';
|
|
19
19
|
import { getRegionFromIdentityPoolId } from '../../../foundation/parsers';
|
|
20
20
|
import { assertIdTokenInAuthTokens } from '../utils/types';
|
|
21
|
+
import { createCognitoIdentityPoolEndpointResolver } from '../factories';
|
|
21
22
|
|
|
22
23
|
import { IdentityIdStore } from './types';
|
|
23
24
|
import { cognitoIdentityIdProvider } from './IdentityIdProvider';
|
|
@@ -113,6 +114,12 @@ export class CognitoAWSCredentialsAndIdentityIdProvider
|
|
|
113
114
|
|
|
114
115
|
const region = getRegionFromIdentityPoolId(authConfig.identityPoolId);
|
|
115
116
|
|
|
117
|
+
const getCredentialsForIdentity = createGetCredentialsForIdentityClient({
|
|
118
|
+
endpointResolver: createCognitoIdentityPoolEndpointResolver({
|
|
119
|
+
endpointOverride: authConfig.identityPoolEndpoint,
|
|
120
|
+
}),
|
|
121
|
+
});
|
|
122
|
+
|
|
116
123
|
// use identityId to obtain guest credentials
|
|
117
124
|
// save credentials in-memory
|
|
118
125
|
// No logins params should be passed for guest creds:
|
|
@@ -194,6 +201,12 @@ export class CognitoAWSCredentialsAndIdentityIdProvider
|
|
|
194
201
|
|
|
195
202
|
const region = getRegionFromIdentityPoolId(authConfig.identityPoolId);
|
|
196
203
|
|
|
204
|
+
const getCredentialsForIdentity = createGetCredentialsForIdentityClient({
|
|
205
|
+
endpointResolver: createCognitoIdentityPoolEndpointResolver({
|
|
206
|
+
endpointOverride: authConfig.identityPoolEndpoint,
|
|
207
|
+
}),
|
|
208
|
+
});
|
|
209
|
+
|
|
197
210
|
let clientResult:
|
|
198
211
|
| Awaited<ReturnType<typeof getCredentialsForIdentity>>
|
|
199
212
|
| undefined;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
2
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
3
|
+
import { cognitoIdentityPoolEndpointResolver } from '@aws-amplify/core';
|
|
4
|
+
import { EndpointResolverOptions } from '@aws-amplify/core/internals/aws-client-utils';
|
|
5
|
+
import { AmplifyUrl } from '@aws-amplify/core/internals/utils';
|
|
6
|
+
|
|
7
|
+
export const createCognitoIdentityPoolEndpointResolver =
|
|
8
|
+
({ endpointOverride }: { endpointOverride: string | undefined }) =>
|
|
9
|
+
(input: EndpointResolverOptions): { url: URL } => {
|
|
10
|
+
if (endpointOverride) {
|
|
11
|
+
return { url: new AmplifyUrl(endpointOverride) };
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
return cognitoIdentityPoolEndpointResolver(input);
|
|
15
|
+
};
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
export { createCognitoUserPoolEndpointResolver } from './createCognitoUserPoolEndpointResolver';
|
|
4
|
+
export { createCognitoIdentityPoolEndpointResolver } from './createCognitoIdentityPoolEndpointResolver';
|
|
@@ -39,8 +39,7 @@ export function getRedirectUrl(
|
|
|
39
39
|
// origin + pathname => https://example.com/app
|
|
40
40
|
const isSameOriginAndPathName = (redirect: string) =>
|
|
41
41
|
redirect.startsWith(
|
|
42
|
-
|
|
43
|
-
String(window.location.origin + window.location.pathname ?? '/'),
|
|
42
|
+
String(window.location.origin + (window.location.pathname || '/')),
|
|
44
43
|
);
|
|
45
44
|
// domain => outlook.live.com, github.com
|
|
46
45
|
const isTheSameDomain = (redirect: string) =>
|