@aws-amplify/core 6.0.1-console-preview.7739091.0 → 6.0.1-preview-testing.ddb17c0.0

package/lib/clients/handlers/unauthenticated.d.ts

@@ -1,4 +1,4 @@
 import { RetryOptions } from '../middleware/retry';
 import { UserAgentOptions } from '../middleware/userAgent';
 import { HttpRequest, HttpResponse } from '../types';
-export declare const unauthenticatedHandler: (request: HttpRequest, options: UserAgentOptions & RetryOptions<HttpResponse>) => Promise<HttpResponse>;
+export declare const unauthenticatedHandler: (request: HttpRequest, options: UserAgentOptions & RetryOptions<HttpResponse> & import("../types").HttpTransferOptions) => Promise<HttpResponse>;

package/lib/clients/internal/composeServiceApi.d.ts

@@ -1,9 +1,11 @@
 import { ServiceClientOptions } from '../types/aws';
 import { TransferHandler, Endpoint } from '../types/core';
 import { HttpRequest, HttpResponse } from '../types/http';
-export declare const composeServiceApi: <TransferHandlerOptions, Input, Output, DefaultConfig>(transferHandler: TransferHandler<HttpRequest, HttpResponse, TransferHandlerOptions>, serializer: (input: Input, endpoint: Endpoint) => Promise<HttpRequest> | HttpRequest, deserializer: (output: HttpResponse) => Promise<Output>, defaultConfig: Partial<DefaultConfig>) => (config: OptionalizeKey<TransferHandlerOptions & ServiceClientOptions & Partial<DefaultConfig> & InferEndpointResolverOptionType<DefaultConfig>, keyof DefaultConfig>, input: Input) => Promise<Output>;
-type OptionalizeKey<T, K extends keyof T> = Omit<T, K> & {
-    [P in K & keyof T]?: T[P];
+export declare const composeServiceApi: <TransferHandlerOptions, Input, Output, DefaultConfig>(transferHandler: TransferHandler<HttpRequest, HttpResponse, TransferHandlerOptions>, serializer: (input: Input, endpoint: Endpoint) => Promise<HttpRequest> | HttpRequest, deserializer: (output: HttpResponse) => Promise<Output>, defaultConfig: Partial<DefaultConfig>) => (config: OptionalizeKey<TransferHandlerOptions & ServiceClientOptions & Partial<DefaultConfig> & InferEndpointResolverOptionType<DefaultConfig>, DefaultConfig>, input: Input) => Promise<Output>;
+type OptionalizeKey<InputType, InputDefaultsType> = {
+    [KeyWithDefaultValue in keyof InputDefaultsType]?: KeyWithDefaultValue extends keyof InputType ? InputType[KeyWithDefaultValue] : never;
+} & {
+    [KeyWithoutDefaultValue in keyof Omit<InputType, keyof InputDefaultsType>]: InputType[KeyWithoutDefaultValue];
 };
 type InferEndpointResolverOptionType<T> = T extends {
     endpointResolver: (options: infer EndpointOptions) => any;

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.
@@ -18,7 +18,3 @@ export interface ServiceClientOptions {
  * This function is protocol-specific (e.g. JSON, XML, etc.)
  */
 export type ErrorParser = (response?: HttpResponse) => Promise<(Error & MetadataBearer) | undefined>;
-/**
- *  Default config options for the `composeServiceApi`.
- */
-export type DefaultConfigOptions<TransferHandlerOptions extends Record<string, unknown> = Record<string, unknown>> = Partial<TransferHandlerOptions & ServiceClientOptions>;

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

@@ -26,5 +26,13 @@ export interface HttpResponse extends Response {
 }
 export interface HttpTransferOptions {
     abortSignal?: AbortSignal;
+    /**
+     * Cache mode for the request. Note that this is only effective when the underlying HTTP handler is fetch.
+     * For XHR handler, or Node.js `"http(s)"` module or running on React Native, this option is ignored.
+     * Instead, you can configure the `Cache-Control` headers to achieve similar effects.
+     * @default 'default'
+     * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Request/cache}
+     */
+    cache?: RequestCache;
 }
 export type HttpTransferHandler = TransferHandler<HttpRequest, HttpResponse, HttpTransferOptions>;

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

@@ -1,3 +1,3 @@
 export { Middleware, MiddlewareHandler, Request, Response, TransferHandler, Endpoint, } from './core';
 export { Headers, HttpRequest, HttpResponse, HttpTransferHandler, HttpTransferOptions, ResponseBodyMixin, } from './http';
-export { Credentials, EndpointResolverOptions, ErrorParser, ServiceClientOptions, DefaultConfigOptions, } from './aws';
+export { Credentials, EndpointResolverOptions, ErrorParser, ServiceClientOptions, } from './aws';

package/lib/index.d.ts

@@ -5,7 +5,7 @@ export { AuthConfig, AuthUserPoolConfig, AuthUserPoolAndIdentityPoolConfig, Stor
 export { Amplify, fetchAuthSession, AmplifyClass as AmplifyClassV6, clearCredentials, } from './singleton';
 export { getCredentialsForIdentity, getId, GetCredentialsForIdentityInput, GetCredentialsForIdentityOutput, } from './AwsClients/CognitoIdentity';
 export { UserProfile } from './types';
-export { CookieStorage, defaultStorage, sessionStorage, sharedInMemoryStorage, } from './storage';
+export { StorageHelper, MemoryStorage, LocalStorage, CookieStorage, SessionStorage, MemoryKeyValueStorage, } from './StorageHelper';
 export { KeyValueStorageInterface } from './types';
 import { BrowserStorageCache } from './Cache/BrowserStorageCache';
 export { InMemoryCache } from './Cache/InMemoryCache';

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.sharedInMemoryStorage = exports.sessionStorage = exports.defaultStorage = exports.CookieStorage = exports.getId = exports.getCredentialsForIdentity = exports.clearCredentials = exports.AmplifyClassV6 = exports.fetchAuthSession = exports.Amplify = exports.Hub = void 0;
+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;
 /*
 This file maps top-level exports from `@aws-amplify/core`. These are intended to be potentially customer-facing exports.
 */
@@ -19,11 +19,13 @@ var CognitoIdentity_1 = require("./AwsClients/CognitoIdentity");
 Object.defineProperty(exports, "getCredentialsForIdentity", { enumerable: true, get: function () { return CognitoIdentity_1.getCredentialsForIdentity; } });
 Object.defineProperty(exports, "getId", { enumerable: true, get: function () { return CognitoIdentity_1.getId; } });
 // Storage helpers
-var storage_1 = require("./storage");
-Object.defineProperty(exports, "CookieStorage", { enumerable: true, get: function () { return storage_1.CookieStorage; } });
-Object.defineProperty(exports, "defaultStorage", { enumerable: true, get: function () { return storage_1.defaultStorage; } });
-Object.defineProperty(exports, "sessionStorage", { enumerable: true, get: function () { return storage_1.sessionStorage; } });
-Object.defineProperty(exports, "sharedInMemoryStorage", { enumerable: true, get: function () { return storage_1.sharedInMemoryStorage; } });
+var StorageHelper_1 = require("./StorageHelper");
+Object.defineProperty(exports, "StorageHelper", { enumerable: true, get: function () { return StorageHelper_1.StorageHelper; } });
+Object.defineProperty(exports, "MemoryStorage", { enumerable: true, get: function () { return StorageHelper_1.MemoryStorage; } });
+Object.defineProperty(exports, "LocalStorage", { enumerable: true, get: function () { return StorageHelper_1.LocalStorage; } });
+Object.defineProperty(exports, "CookieStorage", { enumerable: true, get: function () { return StorageHelper_1.CookieStorage; } });
+Object.defineProperty(exports, "SessionStorage", { enumerable: true, get: function () { return StorageHelper_1.SessionStorage; } });
+Object.defineProperty(exports, "MemoryKeyValueStorage", { enumerable: true, get: function () { return StorageHelper_1.MemoryKeyValueStorage; } });
 // Cache exports
 var BrowserStorageCache_1 = require("./Cache/BrowserStorageCache");
 Object.defineProperty(exports, "BrowserStorageCache", { enumerable: true, get: function () { return BrowserStorageCache_1.BrowserStorageCache; } });

package/lib/parseAWSExports.js

@@ -12,11 +12,6 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseAWSExports = void 0;
-var authTypeMapping = {
-    API_KEY: 'apiKey',
-    AWS_IAM: 'iam',
-    AMAZON_COGNITO_USER_POOLS: 'jwt',
-};
 /**
  * This utility converts the `aws-exports.js` file generated by the Amplify CLI into a {@link ResourcesConfig} object
  * consumable by Amplify.
@@ -27,7 +22,7 @@ var authTypeMapping = {
  */
 var parseAWSExports = function (config) {
     if (config === void 0) { config = {}; }
-    var aws_appsync_apiKey = config.aws_appsync_apiKey, aws_appsync_authenticationType = config.aws_appsync_authenticationType, aws_appsync_graphqlEndpoint = config.aws_appsync_graphqlEndpoint, aws_appsync_region = config.aws_appsync_region, aws_cognito_identity_pool_id = config.aws_cognito_identity_pool_id, aws_cognito_sign_up_verification_method = config.aws_cognito_sign_up_verification_method, aws_mandatory_sign_in = config.aws_mandatory_sign_in, aws_mobile_analytics_app_id = config.aws_mobile_analytics_app_id, aws_mobile_analytics_app_region = config.aws_mobile_analytics_app_region, aws_user_files_s3_bucket = config.aws_user_files_s3_bucket, aws_user_files_s3_bucket_region = config.aws_user_files_s3_bucket_region, aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing = config.aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing, aws_user_pools_id = config.aws_user_pools_id, aws_user_pools_web_client_id = config.aws_user_pools_web_client_id, geo = config.geo, oauth = config.oauth;
+    var aws_cognito_identity_pool_id = config.aws_cognito_identity_pool_id, aws_cognito_sign_up_verification_method = config.aws_cognito_sign_up_verification_method, aws_mandatory_sign_in = config.aws_mandatory_sign_in, aws_mobile_analytics_app_id = config.aws_mobile_analytics_app_id, aws_mobile_analytics_app_region = config.aws_mobile_analytics_app_region, aws_user_files_s3_bucket = config.aws_user_files_s3_bucket, aws_user_files_s3_bucket_region = config.aws_user_files_s3_bucket_region, aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing = config.aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing, aws_user_pools_id = config.aws_user_pools_id, aws_user_pools_web_client_id = config.aws_user_pools_web_client_id, geo = config.geo, oauth = config.oauth;
     var amplifyConfig = {};
     // Analytics
     if (aws_mobile_analytics_app_id) {
@@ -38,20 +33,6 @@ var parseAWSExports = function (config) {
             },
         };
     }
-    // TODO: Need to support all API configurations
-    // API
-    if (aws_appsync_graphqlEndpoint) {
-        amplifyConfig.API = {
-            AppSync: {
-                defaultAuthMode: {
-                    type: authTypeMapping[aws_appsync_authenticationType],
-                    apiKey: aws_appsync_apiKey,
-                },
-                endpoint: aws_appsync_graphqlEndpoint,
-                region: aws_appsync_region,
-            },
-        };
-    }
     // Auth
     if (aws_cognito_identity_pool_id || aws_user_pools_id) {
         amplifyConfig.Auth = {

package/lib/providers/pinpoint/types/buffer.d.ts

@@ -3,7 +3,7 @@ import { PinpointAnalyticsEvent, PinpointSession } from './pinpoint';
 export type EventBufferConfig = {
     appId: string;
     bufferSize: number;
-    credentials: AuthSession['credentials'];
+    credentials: Required<AuthSession>['credentials'];
     identityId: AuthSession['identityId'];
     flushInterval: number;
     flushSize: number;

package/lib/providers/pinpoint/types/pinpoint.d.ts

@@ -24,7 +24,7 @@ export type PinpointAnalyticsEvent = {
 type PinpointCommonParameters = {
     appId: string;
     category: SupportedCategory;
-    credentials: AuthSession['credentials'];
+    credentials: Required<AuthSession>['credentials'];
     identityId?: AuthSession['identityId'];
     region: string;
     userAgentValue?: string;

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,17 +1,14 @@
-import { APIConfig, LibraryAPIOptions } from './API/types';
 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 ResourcesConfig = {
-    API?: APIConfig;
     Analytics?: AnalyticsConfig;
     Auth?: AuthConfig;
     Storage?: StorageConfig;
 };
 export type LibraryOptions = {
-    API?: LibraryAPIOptions;
     Auth?: LibraryAuthOptions;
     Storage?: LibraryStorageOptions;
     ssr?: boolean;
 };
-export { APIConfig, AuthConfig, AuthUserPoolConfig, AuthIdentityPoolConfig, AuthUserPoolAndIdentityPoolConfig, GetCredentialsOptions, StorageAccessLevel, StorageConfig, AnalyticsConfig, CognitoIdentityPoolConfig, };
+export { AuthConfig, AuthUserPoolConfig, AuthIdentityPoolConfig, AuthUserPoolAndIdentityPoolConfig, GetCredentialsOptions, StorageAccessLevel, StorageConfig, AnalyticsConfig, CognitoIdentityPoolConfig, };