@aws-amplify/core 6.0.1-preview-testing.64b45b1.0 → 6.0.1-preview-testing.034e780.0

package/lib/AwsClients/Pinpoint/getInAppMessages.d.ts

@@ -14,7 +14,7 @@ export declare const getInAppMessages: (config: {
     userAgentValue?: string | undefined;
 } & {
     uriEscapePath?: boolean | undefined;
-    credentials: import("@aws-sdk/types/dist-types/credentials").Credentials | (() => Promise<import("@aws-sdk/types/dist-types/credentials").Credentials>);
+    credentials: import("@smithy/types/dist-types/identity/awsCredentialIdentity").AwsCredentialIdentity | (() => Promise<import("@smithy/types/dist-types/identity/awsCredentialIdentity").AwsCredentialIdentity>);
     region: string;
     abortSignal?: AbortSignal | undefined;
     cache?: RequestCache | undefined;

package/lib/AwsClients/Pinpoint/putEvents.d.ts

@@ -14,7 +14,7 @@ export declare const putEvents: (config: {
     userAgentValue?: string | undefined;
 } & {
     uriEscapePath?: boolean | undefined;
-    credentials: import("@aws-sdk/types/dist-types/credentials").Credentials | (() => Promise<import("@aws-sdk/types/dist-types/credentials").Credentials>);
+    credentials: import("@smithy/types/dist-types/identity/awsCredentialIdentity").AwsCredentialIdentity | (() => Promise<import("@smithy/types/dist-types/identity/awsCredentialIdentity").AwsCredentialIdentity>);
     region: string;
     abortSignal?: AbortSignal | undefined;
     cache?: RequestCache | undefined;

package/lib/AwsClients/Pinpoint/updateEndpoint.d.ts

@@ -14,7 +14,7 @@ export declare const updateEndpoint: (config: {
     userAgentValue?: string | undefined;
 } & {
     uriEscapePath?: boolean | undefined;
-    credentials: import("@aws-sdk/types/dist-types/credentials").Credentials | (() => Promise<import("@aws-sdk/types/dist-types/credentials").Credentials>);
+    credentials: import("@smithy/types/dist-types/identity/awsCredentialIdentity").AwsCredentialIdentity | (() => Promise<import("@smithy/types/dist-types/identity/awsCredentialIdentity").AwsCredentialIdentity>);
     region: string;
     abortSignal?: AbortSignal | undefined;
     cache?: RequestCache | undefined;

package/lib/Platform/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.0.1-preview-testing.64b45b1.0+64b45b1";
+export declare const version = "6.0.1-preview-testing.034e780.0+034e780";

package/lib/Platform/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // generated by genversion
-exports.version = '6.0.1-preview-testing.64b45b1.0+64b45b1';
+exports.version = '6.0.1-preview-testing.034e780.0+034e780';

package/lib/clients/types/aws.d.ts

@@ -1,7 +1,7 @@
 import { MetadataBearer } from '@aws-sdk/types';
 import { Endpoint } from './core';
 import { HttpResponse } from './http';
-export type { Credentials, MetadataBearer } from '@aws-sdk/types';
+export type { AwsCredentialIdentity as Credentials, MetadataBearer, } from '@aws-sdk/types';
 export type SourceData = string | ArrayBuffer | ArrayBufferView;
 /**
  * Basic option type for endpoint resolvers. It contains region only.

package/lib/index.d.ts

@@ -12,4 +12,3 @@ export { InMemoryCache } from './Cache/InMemoryCache';
 export { BrowserStorageCache };
 export { BrowserStorageCache as Cache };
 export { I18n } from './I18n';
-export { parseAWSExports } from './parseAWSExports';

package/lib/index.js

@@ -2,7 +2,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseAWSExports = exports.I18n = exports.Cache = exports.BrowserStorageCache = exports.InMemoryCache = exports.MemoryKeyValueStorage = exports.SessionStorage = exports.CookieStorage = exports.LocalStorage = exports.MemoryStorage = exports.StorageHelper = exports.getId = exports.getCredentialsForIdentity = exports.clearCredentials = exports.AmplifyClassV6 = exports.fetchAuthSession = exports.Amplify = exports.Hub = void 0;
+exports.I18n = exports.Cache = exports.BrowserStorageCache = exports.InMemoryCache = exports.MemoryKeyValueStorage = exports.SessionStorage = exports.CookieStorage = exports.LocalStorage = exports.MemoryStorage = exports.StorageHelper = exports.getId = exports.getCredentialsForIdentity = exports.clearCredentials = exports.AmplifyClassV6 = exports.fetchAuthSession = exports.Amplify = exports.Hub = void 0;
 /*
 This file maps top-level exports from `@aws-amplify/core`. These are intended to be potentially customer-facing exports.
 */
@@ -35,5 +35,3 @@ Object.defineProperty(exports, "InMemoryCache", { enumerable: true, get: functio
 // Internationalization utilities
 var I18n_1 = require("./I18n");
 Object.defineProperty(exports, "I18n", { enumerable: true, get: function () { return I18n_1.I18n; } });
-var parseAWSExports_1 = require("./parseAWSExports");
-Object.defineProperty(exports, "parseAWSExports", { enumerable: true, get: function () { return parseAWSExports_1.parseAWSExports; } });

package/lib/libraryUtils.d.ts

@@ -1,4 +1,6 @@
 export { isBrowser, filenameToContentType, generateRandomString, isEmpty, isStrictObject, isTextFile, isWebWorker, makeQuerablePromise, objectLessAttributes, sortByField, transferKeyToLowerCase, transferKeyToUpperCase, } from './Util/JS';
+export { parseAWSExports } from './parseAWSExports';
+export { LegacyConfig } from './singleton/types';
 export { JWT, StrictUnion, CognitoIdentityPoolConfig, } from './singleton/Auth/types';
 export { decodeJWT, assertTokenProviderConfig, assertIdentityPooIdConfig, assertOAuthConfig, } from './singleton/Auth/utils';
 export { isTokenExpired } from './singleton/Auth';

package/lib/libraryUtils.js

@@ -2,8 +2,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNonRetryableError = exports.Reachability = exports.RETRY_ERROR_CODES = exports.NonRetryableError = exports.NO_CREDS_ERROR_STRING = exports.Mutex = exports.DateUtils = exports.BackgroundProcessManagerState = exports.BackgroundProcessManager = exports.BackgroundManagerNotOpenError = exports.AWS_CLOUDWATCH_CATEGORY = exports.ServiceWorker = exports.Constants = exports.StorageAction = exports.PushNotificationAction = exports.PubSubAction = exports.PredictionsAction = exports.InAppMessagingAction = exports.InteractionsAction = exports.GeoAction = exports.Framework = exports.DataStoreAction = exports.Category = exports.AnalyticsAction = exports.AuthAction = exports.ApiAction = exports.getAmplifyUserAgent = exports.getAmplifyUserAgentObject = exports.Platform = exports.ClientDevice = exports.Logger = exports.ConsoleLogger = exports.Signer = exports.isTokenExpired = exports.assertOAuthConfig = exports.assertIdentityPooIdConfig = exports.assertTokenProviderConfig = exports.decodeJWT = exports.transferKeyToUpperCase = exports.transferKeyToLowerCase = exports.sortByField = exports.objectLessAttributes = exports.makeQuerablePromise = exports.isWebWorker = exports.isTextFile = exports.isStrictObject = exports.isEmpty = exports.generateRandomString = exports.filenameToContentType = exports.isBrowser = void 0;
-exports.AMPLIFY_SYMBOL = exports.fetchAuthSession = exports.USER_AGENT_HEADER = exports.INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER = exports.Linking = exports.AsyncStorage = exports.AppState = exports.AmplifyErrorString = exports.AmplifyError = exports.missingConfig = exports.invalidParameter = exports.asserts = exports.urlSafeEncode = exports.urlSafeDecode = exports.retry = exports.jitteredExponentialRetry = exports.jitteredBackoff = void 0;
+exports.Reachability = exports.RETRY_ERROR_CODES = exports.NonRetryableError = exports.NO_CREDS_ERROR_STRING = exports.Mutex = exports.DateUtils = exports.BackgroundProcessManagerState = exports.BackgroundProcessManager = exports.BackgroundManagerNotOpenError = exports.AWS_CLOUDWATCH_CATEGORY = exports.ServiceWorker = exports.Constants = exports.StorageAction = exports.PushNotificationAction = exports.PubSubAction = exports.PredictionsAction = exports.InAppMessagingAction = exports.InteractionsAction = exports.GeoAction = exports.Framework = exports.DataStoreAction = exports.Category = exports.AnalyticsAction = exports.AuthAction = exports.ApiAction = exports.getAmplifyUserAgent = exports.getAmplifyUserAgentObject = exports.Platform = exports.ClientDevice = exports.Logger = exports.ConsoleLogger = exports.Signer = exports.isTokenExpired = exports.assertOAuthConfig = exports.assertIdentityPooIdConfig = exports.assertTokenProviderConfig = exports.decodeJWT = exports.parseAWSExports = exports.transferKeyToUpperCase = exports.transferKeyToLowerCase = exports.sortByField = exports.objectLessAttributes = exports.makeQuerablePromise = exports.isWebWorker = exports.isTextFile = exports.isStrictObject = exports.isEmpty = exports.generateRandomString = exports.filenameToContentType = exports.isBrowser = void 0;
+exports.AMPLIFY_SYMBOL = exports.fetchAuthSession = exports.USER_AGENT_HEADER = exports.INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER = exports.Linking = exports.AsyncStorage = exports.AppState = exports.AmplifyErrorString = exports.AmplifyError = exports.missingConfig = exports.invalidParameter = exports.asserts = exports.urlSafeEncode = exports.urlSafeDecode = exports.retry = exports.jitteredExponentialRetry = exports.jitteredBackoff = exports.isNonRetryableError = void 0;
 /*
 This file maps top-level exports from `@aws-amplify/core/internals/utils`. These are intended to be internal
 utils for use throughout the library.
@@ -22,6 +22,8 @@ Object.defineProperty(exports, "objectLessAttributes", { enumerable: true, get:
 Object.defineProperty(exports, "sortByField", { enumerable: true, get: function () { return JS_1.sortByField; } });
 Object.defineProperty(exports, "transferKeyToLowerCase", { enumerable: true, get: function () { return JS_1.transferKeyToLowerCase; } });
 Object.defineProperty(exports, "transferKeyToUpperCase", { enumerable: true, get: function () { return JS_1.transferKeyToUpperCase; } });
+var parseAWSExports_1 = require("./parseAWSExports");
+Object.defineProperty(exports, "parseAWSExports", { enumerable: true, get: function () { return parseAWSExports_1.parseAWSExports; } });
 // Auth utilities
 var utils_1 = require("./singleton/Auth/utils");
 Object.defineProperty(exports, "decodeJWT", { enumerable: true, get: function () { return utils_1.decodeJWT; } });

package/lib/singleton/Amplify.d.ts

@@ -1,5 +1,5 @@
 import { AuthClass } from './Auth';
-import { LibraryOptions, ResourcesConfig } from './types';
+import { LegacyConfig, LibraryOptions, ResourcesConfig } from './types';
 export declare class AmplifyClass {
     resourcesConfig: ResourcesConfig;
     libraryOptions: LibraryOptions;
@@ -19,7 +19,7 @@ export declare class AmplifyClass {
      * @param resourceConfig - Back-end resource configuration. Typically provided via the `aws-exports.js` file.
      * @param libraryOptions - Additional options for customizing the behavior of the library.
      */
-    configure(resourcesConfig: ResourcesConfig, libraryOptions?: LibraryOptions): void;
+    configure(resourcesConfig: ResourcesConfig | LegacyConfig, libraryOptions?: LibraryOptions): void;
     /**
      * Provides access to the current back-end resource configuration for the Library.
      *

package/lib/singleton/Amplify.js

@@ -27,6 +27,7 @@ exports.Amplify = exports.AmplifyClass = void 0;
 // SPDX-License-Identifier: Apache-2.0
 var Auth_1 = require("./Auth");
 var Hub_1 = require("../Hub");
+var parseAWSExports_1 = require("../parseAWSExports");
 // TODO(v6): add default AuthTokenStore for each platform
 var AmplifyClass = /** @class */ (function () {
     function AmplifyClass() {
@@ -46,7 +47,14 @@ var AmplifyClass = /** @class */ (function () {
      */
     AmplifyClass.prototype.configure = function (resourcesConfig, libraryOptions) {
         if (libraryOptions === void 0) { libraryOptions = {}; }
-        this.resourcesConfig = mergeResourceConfig(this.resourcesConfig, resourcesConfig);
+        var resolvedResourceConfig;
+        if (Object.keys(resourcesConfig).some(function (key) { return key.startsWith('aws_'); })) {
+            resolvedResourceConfig = (0, parseAWSExports_1.parseAWSExports)(resourcesConfig);
+        }
+        else {
+            resolvedResourceConfig = resourcesConfig;
+        }
+        this.resourcesConfig = mergeResourceConfig(this.resourcesConfig, resolvedResourceConfig);
         this.libraryOptions = mergeLibraryOptions(this.libraryOptions, libraryOptions);
         this.Auth.configure(this.resourcesConfig.Auth, this.libraryOptions.Auth);
         Hub_1.Hub.dispatch('core', {

package/lib/singleton/Auth/index.d.ts

@@ -1,4 +1,4 @@
-import { AuthConfig, AuthSession, FetchAuthSessionOptions, LibraryAuthOptions } from './types';
+import { AuthConfig, AuthSession, AuthTokens, FetchAuthSessionOptions, LibraryAuthOptions } from './types';
 export declare function isTokenExpired({ expiresAt, clockDrift, }: {
     expiresAt: number;
     clockDrift: number;
@@ -20,4 +20,5 @@ export declare class AuthClass {
     configure(authResourcesConfig: AuthConfig, authOptions?: LibraryAuthOptions): void;
     fetchAuthSession(options?: FetchAuthSessionOptions): Promise<AuthSession>;
     clearCredentials(): Promise<void>;
+    getTokens(options: FetchAuthSessionOptions): Promise<AuthTokens | undefined>;
 }

package/lib/singleton/Auth/index.js

@@ -61,20 +61,19 @@ var AuthClass = /** @class */ (function () {
         this.authOptions = authOptions;
     };
     AuthClass.prototype.fetchAuthSession = function (options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f;
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
             var tokens, credentialsAndIdentityId, userSub;
-            return __generator(this, function (_k) {
-                switch (_k.label) {
-                    case 0: return [4 /*yield*/, ((_b = (_a = this.authOptions) === null || _a === void 0 ? void 0 : _a.tokenProvider) === null || _b === void 0 ? void 0 : _b.getTokens(options))];
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0: return [4 /*yield*/, this.getTokens(options)];
                     case 1:
                         // Get tokens will throw if session cannot be refreshed (network or service error) or return null if not available
-                        tokens =
-                            (_c = (_k.sent())) !== null && _c !== void 0 ? _c : undefined;
+                        tokens = _g.sent();
                         if (!tokens) return [3 /*break*/, 3];
-                        userSub = (_e = (_d = tokens.accessToken) === null || _d === void 0 ? void 0 : _d.payload) === null || _e === void 0 ? void 0 : _e.sub;
-                        return [4 /*yield*/, ((_g = (_f = this.authOptions) === null || _f === void 0 ? void 0 : _f.credentialsProvider) === null || _g === void 0 ? void 0 : _g.getCredentialsAndIdentityId({
+                        userSub = (_b = (_a = tokens.accessToken) === null || _a === void 0 ? void 0 : _a.payload) === null || _b === void 0 ? void 0 : _b.sub;
+                        return [4 /*yield*/, ((_d = (_c = this.authOptions) === null || _c === void 0 ? void 0 : _c.credentialsProvider) === null || _d === void 0 ? void 0 : _d.getCredentialsAndIdentityId({
                                 authConfig: this.authConfig,
                                 tokens: tokens,
                                 authenticated: true,
@@ -83,9 +82,9 @@ var AuthClass = /** @class */ (function () {
                     case 2:
                         // getCredentialsAndIdentityId will throw if cannot get credentials (network or service error)
                         credentialsAndIdentityId =
-                            _k.sent();
+                            _g.sent();
                         return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, ((_j = (_h = this.authOptions) === null || _h === void 0 ? void 0 : _h.credentialsProvider) === null || _j === void 0 ? void 0 : _j.getCredentialsAndIdentityId({
+                    case 3: return [4 /*yield*/, ((_f = (_e = this.authOptions) === null || _e === void 0 ? void 0 : _e.credentialsProvider) === null || _f === void 0 ? void 0 : _f.getCredentialsAndIdentityId({
                             authConfig: this.authConfig,
                             authenticated: false,
                             forceRefresh: options.forceRefresh,
@@ -93,8 +92,8 @@ var AuthClass = /** @class */ (function () {
                     case 4:
                         // getCredentialsAndIdentityId will throw if cannot get credentials (network or service error)
                         credentialsAndIdentityId =
-                            _k.sent();
-                        _k.label = 5;
+                            _g.sent();
+                        _g.label = 5;
                     case 5: return [2 /*return*/, {
                             tokens: tokens,
                             credentials: credentialsAndIdentityId === null || credentialsAndIdentityId === void 0 ? void 0 : credentialsAndIdentityId.credentials,
@@ -119,6 +118,17 @@ var AuthClass = /** @class */ (function () {
             });
         });
     };
+    AuthClass.prototype.getTokens = function (options) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0: return [4 /*yield*/, ((_b = (_a = this.authOptions) === null || _a === void 0 ? void 0 : _a.tokenProvider) === null || _b === void 0 ? void 0 : _b.getTokens(options))];
+                    case 1: return [2 /*return*/, ((_c = (_d.sent())) !== null && _c !== void 0 ? _c : undefined)];
+                }
+            });
+        });
+    };
     return AuthClass;
 }());
 exports.AuthClass = AuthClass;

package/lib/singleton/Auth/utils/index.js

@@ -36,9 +36,9 @@ exports.assertOAuthConfig = assertOAuthConfig;
 function assertIdentityPooIdConfig(cognitoConfig) {
     var validConfig = !!(cognitoConfig === null || cognitoConfig === void 0 ? void 0 : cognitoConfig.identityPoolId);
     return (0, AssertError_1.asserts)(validConfig, {
-        name: 'AuthIdentityPoolIdException',
-        message: 'Auth IdentityPoolId not configured',
-        recoverySuggestion: 'Make sure to call Amplify.configure in your app with a valid IdentityPoolId',
+        name: 'InvalidIdentityPoolIdException',
+        message: 'Invalid identity pool id provided.',
+        recoverySuggestion: 'Make sure a valid identityPoolId is given in the config.',
     });
 }
 exports.assertIdentityPooIdConfig = assertIdentityPooIdConfig;

package/lib/singleton/types.d.ts

@@ -1,6 +1,12 @@
 import { AnalyticsConfig } from './Analytics/types';
 import { AuthConfig, LibraryAuthOptions, AuthUserPoolConfig, AuthIdentityPoolConfig, AuthUserPoolAndIdentityPoolConfig, GetCredentialsOptions, CognitoIdentityPoolConfig } from './Auth/types';
 import { LibraryStorageOptions, StorageAccessLevel, StorageConfig } from './Storage/types';
+export type LegacyConfig = {
+    /**
+     * @deprecated The field should not be used.
+     */
+    aws_project_region?: string;
+};
 export type ResourcesConfig = {
     Analytics?: AnalyticsConfig;
     Auth?: AuthConfig;