@aws-amplify/core 6.0.1-console-preview.096eee3.0 → 6.0.1-console-preview.2f5ba46.0

package/lib/Cache/StorageCache.js

@@ -4,7 +4,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageCache = void 0;
 var Utils_1 = require("./Utils");
-var singleton_1 = require("../singleton");
 var Logger_1 = require("../Logger");
 var logger = new Logger_1.ConsoleLogger('StorageCache');
 /**
@@ -105,7 +104,8 @@ var StorageCache = /** @class */ (function () {
          * @internal
          */
         get: function () {
-            var globalCacheConfig = singleton_1.Amplify.getConfig().Cache || {};
+            // const globalCacheConfig = Amplify.getConfig().Cache || {};
+            var globalCacheConfig = {};
             if (this.instanceConfig) {
                 return Object.assign({}, Utils_1.defaultConfig, globalCacheConfig, this.instanceConfig);
             }

package/lib/I18n/I18n.js

@@ -15,7 +15,6 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18n = void 0;
 var Logger_1 = require("../Logger");
-var singleton_1 = require("../singleton");
 var logger = new Logger_1.ConsoleLogger('I18n');
 /**
  * Language translation utility.
@@ -50,10 +49,10 @@ var I18n = /** @class */ (function () {
      * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
      */
     I18n.prototype.setDefaultLanguage = function () {
-        if (!this._lang) {
-            var i18nConfig = singleton_1.Amplify.getConfig().I18n;
-            this._lang = i18nConfig === null || i18nConfig === void 0 ? void 0 : i18nConfig.language;
-        }
+        /*if (!this._lang) {
+            const i18nConfig = Amplify.getConfig().I18n;
+            this._lang = i18nConfig?.language;
+        }*/
         // Default to window language if not set in config
         if (!this._lang &&
             typeof window !== 'undefined' &&

package/lib/Platform/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.0.1-console-preview.096eee3.0+096eee3";
+export declare const version = "6.0.1-console-preview.2f5ba46.0+2f5ba46";

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-console-preview.096eee3.0+096eee3';
+exports.version = '6.0.1-console-preview.2f5ba46.0+2f5ba46';

package/lib/index.d.ts

@@ -6,8 +6,8 @@ export { FacebookOAuth, GoogleOAuth } from './OAuthHelper';
 export { AppState, AsyncStorage, Linking } from './RNComponents';
 export { Credentials, CredentialsClass } from './Credentials';
 export { ICredentials } from './types';
-export { TokenProvider, AuthTokens, FetchAuthSessionOptions, AWSCredentialsAndIdentityIdProvider, AWSCredentialsAndIdentityId, Identity, OAuthConfig, } from './singleton/Auth/types';
-export { AuthConfig, UserPoolConfig, UserPoolConfigAndIdentityPoolConfig, StorageAccessLevel, StorageConfig, GetCredentialsOptions, ResourcesConfig, LibraryOptions, } from './singleton/types';
+export { TokenProvider, AuthTokens, FetchAuthSessionOptions, AWSCredentialsAndIdentityIdProvider, AWSCredentialsAndIdentityId, Identity, OAuthConfig, CognitoUserPoolConfig, } from './singleton/Auth/types';
+export { AuthConfig, AuthUserPoolConfig, AuthUserPoolAndIdentityPoolConfig, StorageAccessLevel, StorageConfig, GetCredentialsOptions, ResourcesConfig, LibraryOptions, AnalyticsConfig, } from './singleton/types';
 export { Amplify, fetchAuthSession, AmplifyClass as AmplifyClassV6, clearCredentials, } from './singleton';
 export { getCredentialsForIdentity, getId, GetCredentialsForIdentityInput, GetCredentialsForIdentityOutput, } from './AwsClients/CognitoIdentity';
 export { UserProfile } from './types';
@@ -16,7 +16,6 @@ export { KeyValueStorageInterface } from './types';
 export { UniversalStorage } from './UniversalStorage';
 import { BrowserStorageCache } from './Cache/BrowserStorageCache';
 export { InMemoryCache } from './Cache/InMemoryCache';
-export { CacheConfig } from './Cache/types';
 export { BrowserStorageCache };
 export { BrowserStorageCache as Cache };
 export { I18n } from './I18n';

package/lib/libraryUtils.d.ts

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

package/lib/parseAWSExports.d.ts

@@ -1,2 +1,9 @@
 import { AmplifyConfig } from './types';
+/**
+ * This utility generates an `AmplifyConfig` object from an `aws-exports.js` file generated by the Amplify CLI.
+ *
+ * @param config A configuration object from `aws-exports.js`.
+ *
+ * @returns An AmplifyConfig object.
+ */
 export declare const parseAWSExports: (config: Record<string, any>) => AmplifyConfig;

package/lib/parseAWSExports.js

@@ -14,12 +14,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseAWSExports = void 0;
 var Logger_1 = require("./Logger");
 var logger = new Logger_1.ConsoleLogger('Parser');
+/**
+ * This utility generates an `AmplifyConfig` object from an `aws-exports.js` file generated by the Amplify CLI.
+ *
+ * @param config A configuration object from `aws-exports.js`.
+ *
+ * @returns An AmplifyConfig object.
+ */
 var parseAWSExports = function (config) {
     var amplifyConfig = {};
     // Analytics
     if (config['aws_mobile_analytics_app_id']) {
         var Analytics = {
-            AWSPinpoint: {
+            Pinpoint: {
                 appId: config['aws_mobile_analytics_app_id'],
                 region: config['aws_mobile_analytics_app_region'],
             },

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

@@ -3,7 +3,7 @@ import { UserProfile } from '../../../types';
 export type SupportedCategory = 'Analytics' | 'InAppMessaging' | 'PushNotification';
 export type SupportedChannelType = 'APNS' | 'APNS_SANDBOX' | 'GCM' | 'IN_APP';
 export type PinpointProviderConfig = {
-    AWSPinpoint: {
+    Pinpoint: {
         appId: string;
         region: string;
     };

package/lib/singleton/Auth/index.js

@@ -94,7 +94,7 @@ var AuthClass = /** @class */ (function () {
                             _k.sent();
                         return [3 /*break*/, 5];
                     case 3:
-                        if (!!this.authConfig.isMandatorySignInEnabled) return [3 /*break*/, 5];
+                        if (!this.authConfig.Cognito.allowGuestAccess) return [3 /*break*/, 5];
                         return [4 /*yield*/, ((_j = (_h = this.authOptions) === null || _h === void 0 ? void 0 : _h.credentialsProvider) === null || _j === void 0 ? void 0 : _j.getCredentialsAndIdentityId({
                                 authConfig: this.authConfig,
                                 authenticated: false,
@@ -122,7 +122,7 @@ var AuthClass = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         if (!((_a = this.authOptions) === null || _a === void 0 ? void 0 : _a.credentialsProvider)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.authOptions.credentialsProvider.clearCredentials()];
+                        return [4 /*yield*/, this.authOptions.credentialsProvider.clearCredentialsAndIdentityId()];
                     case 1: return [2 /*return*/, _b.sent()];
                     case 2: return [2 /*return*/];
                 }

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

@@ -36,7 +36,7 @@ export type Identity = {
 };
 export interface AWSCredentialsAndIdentityIdProvider {
     getCredentialsAndIdentityId: (getCredentialsOptions: GetCredentialsOptions) => Promise<AWSCredentialsAndIdentityId>;
-    clearCredentials: () => void;
+    clearCredentialsAndIdentityId: () => void;
 }
 export type TokenProvider = {
     getTokens: ({ forceRefresh, }?: {
@@ -50,52 +50,58 @@ export type AuthTokens = {
     idToken?: JWT;
     accessToken: JWT;
 };
-export type AuthConfig = StrictUnion<IdentityPoolConfig | UserPoolConfig | UserPoolConfigWithOAuth | UserPoolConfigAndIdentityPoolConfig | UserPoolConfigAndIdentityPoolConfigWithOAuth>;
+export type AuthConfig = StrictUnion<AuthIdentityPoolConfig | AuthUserPoolConfig | AuthUserPoolAndIdentityPoolConfig>;
 type UnionKeys<T> = T extends T ? keyof T : never;
 type StrictUnionHelper<T, TAll> = T extends any ? T & Partial<Record<Exclude<UnionKeys<TAll>, keyof T>, never>> : never;
-type StrictUnion<T> = StrictUnionHelper<T, T>;
-export type IdentityPoolConfig = {
+export type StrictUnion<T> = StrictUnionHelper<T, T>;
+export type AuthIdentityPoolConfig = {
+    Cognito: CognitoIdentityPoolConfig & {
+        userPoolClientId?: never;
+        userPoolId?: never;
+        loginWith?: never;
+    };
+};
+export type CognitoIdentityPoolConfig = {
     identityPoolId: string;
-    userPoolWebClientId?: never;
-    userPoolId?: never;
-    clientMetadata?: never;
-    isMandatorySignInEnabled?: never;
+    allowGuestAccess?: boolean;
 };
-export type UserPoolConfig = {
-    userPoolWebClientId: string;
-    userPoolId: string;
-    identityPoolId?: never;
-    clientMetadata?: Record<string, string>;
+export type AuthUserPoolConfig = {
+    Cognito: CognitoUserPoolConfig & {
+        identityPoolId?: never;
+        allowGuestAccess?: never;
+    };
 };
-export type UserPoolConfigWithOAuth = {
-    userPoolWebClientId: string;
+export type CognitoUserPoolConfig = {
+    userPoolClientId: string;
     userPoolId: string;
-    identityPoolId?: never;
-    clientMetadata?: Record<string, string>;
-    oauth: OAuthConfig;
+    signUpVerificationMethod?: 'code' | 'link';
+    loginWith?: {
+        oauth?: OAuthConfig;
+    };
 };
 export type OAuthConfig = {
     domain: string;
-    scopes: Array<string>;
-    redirectSignIn: string;
-    redirectSignOut: string;
-    responseType: string;
-};
-export type UserPoolConfigAndIdentityPoolConfig = {
-    userPoolWebClientId: string;
-    userPoolId: string;
-    identityPoolId: string;
-    clientMetadata?: Record<string, string>;
-    isMandatorySignInEnabled?: boolean;
-};
-export type UserPoolConfigAndIdentityPoolConfigWithOAuth = {
-    userPoolWebClientId: string;
-    userPoolId: string;
-    identityPoolId: string;
-    clientMetadata?: Record<string, string>;
-    isMandatorySignInEnabled?: boolean;
-    oauth: OAuthConfig;
-};
+    scopes: Array<OAuthScope>;
+    redirectSignIn: Array<string>;
+    redirectSignOut: Array<string>;
+    responseType: 'code' | 'token';
+    providers?: Array<OAuthProviders | CustomProvider>;
+};
+type OAuthProviders = 'Google' | 'Facebook' | 'Amazon' | 'Apple';
+type CustomProvider = {
+    custom: string;
+};
+type CustomScope = string & {};
+type OAuthScope = 'email' | 'openid' | 'phone' | 'email' | 'profile' | 'aws.cognito.signin.user.admin' | CustomScope;
+export type CognitoUserPoolWithOAuthConfig = CognitoUserPoolConfig & {
+    loginWith: {
+        oauth: OAuthConfig;
+    };
+};
+export type AuthUserPoolAndIdentityPoolConfig = {
+    Cognito: CognitoUserPoolAndIdentityPoolConfig;
+};
+export type CognitoUserPoolAndIdentityPoolConfig = CognitoUserPoolConfig & CognitoIdentityPoolConfig;
 export type GetCredentialsOptions = GetCredentialsAuthenticatedUser | GetCredentialsUnauthenticatedUser;
 type GetCredentialsAuthenticatedUser = {
     authenticated: true;

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

@@ -1,6 +1,5 @@
-import { AuthConfig, IdentityPoolConfig, JWT, UserPoolConfig, UserPoolConfigAndIdentityPoolConfig, UserPoolConfigAndIdentityPoolConfigWithOAuth, UserPoolConfigWithOAuth } from '../types';
-export declare function assertTokenProviderConfig(authConfig?: AuthConfig): asserts authConfig is UserPoolConfigAndIdentityPoolConfigWithOAuth | UserPoolConfigWithOAuth | UserPoolConfigAndIdentityPoolConfig | UserPoolConfig;
-export declare function assertOAuthConfig(authConfig?: AuthConfig): asserts authConfig is UserPoolConfigAndIdentityPoolConfigWithOAuth | UserPoolConfigWithOAuth;
-export declare function assertIdentityPooIdConfig(authConfig: AuthConfig): asserts authConfig is IdentityPoolConfig;
-export declare function assertUserPoolAndIdentityPooConfig(authConfig: AuthConfig): asserts authConfig is UserPoolConfigAndIdentityPoolConfig;
+import { JWT, CognitoUserPoolWithOAuthConfig, CognitoUserPoolConfig, CognitoUserPoolAndIdentityPoolConfig, CognitoIdentityPoolConfig, StrictUnion } from '../types';
+export declare function assertTokenProviderConfig(cognitoConfig?: StrictUnion<CognitoUserPoolConfig | CognitoUserPoolAndIdentityPoolConfig | CognitoIdentityPoolConfig>): asserts cognitoConfig is CognitoUserPoolAndIdentityPoolConfig | CognitoUserPoolConfig;
+export declare function assertOAuthConfig(cognitoConfig?: CognitoUserPoolConfig | CognitoUserPoolAndIdentityPoolConfig): asserts cognitoConfig is CognitoUserPoolWithOAuthConfig;
+export declare function assertIdentityPooIdConfig(cognitoConfig?: StrictUnion<CognitoUserPoolConfig | CognitoUserPoolAndIdentityPoolConfig | CognitoIdentityPoolConfig>): asserts cognitoConfig is CognitoIdentityPoolConfig;
 export declare function decodeJWT(token: string): JWT;

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

@@ -1,25 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeJWT = exports.assertUserPoolAndIdentityPooConfig = exports.assertIdentityPooIdConfig = exports.assertOAuthConfig = exports.assertTokenProviderConfig = void 0;
+exports.decodeJWT = exports.assertIdentityPooIdConfig = exports.assertOAuthConfig = exports.assertTokenProviderConfig = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var AssertError_1 = require("../../../Util/errors/AssertError");
-function assertTokenProviderConfig(authConfig) {
-    var validConfig = !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.userPoolId) && !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.userPoolWebClientId);
-    return (0, AssertError_1.asserts)(validConfig, {
+function assertTokenProviderConfig(cognitoConfig) {
+    var assertionValid = true; // assume valid until otherwise proveed
+    if (!cognitoConfig) {
+        assertionValid = false;
+    }
+    else {
+        assertionValid =
+            !!cognitoConfig.userPoolClientId && !!cognitoConfig.userPoolClientId;
+    }
+    return (0, AssertError_1.asserts)(assertionValid, {
         name: 'AuthTokenConfigException',
         message: 'Auth Token Provider not configured',
         recoverySuggestion: 'Make sure to call Amplify.configure in your app',
     });
 }
 exports.assertTokenProviderConfig = assertTokenProviderConfig;
-function assertOAuthConfig(authConfig) {
-    var _a, _b, _c, _d;
-    assertTokenProviderConfig(authConfig);
-    var validOAuthConfig = !!((_a = authConfig.oauth) === null || _a === void 0 ? void 0 : _a.domain) &&
-        !!((_b = authConfig.oauth) === null || _b === void 0 ? void 0 : _b.redirectSignOut) &&
-        !!((_c = authConfig.oauth) === null || _c === void 0 ? void 0 : _c.redirectSignIn) &&
-        !!((_d = authConfig.oauth) === null || _d === void 0 ? void 0 : _d.responseType);
+function assertOAuthConfig(cognitoConfig) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var validOAuthConfig = !!((_b = (_a = cognitoConfig === null || cognitoConfig === void 0 ? void 0 : cognitoConfig.loginWith) === null || _a === void 0 ? void 0 : _a.oauth) === null || _b === void 0 ? void 0 : _b.domain) &&
+        !!((_d = (_c = cognitoConfig === null || cognitoConfig === void 0 ? void 0 : cognitoConfig.loginWith) === null || _c === void 0 ? void 0 : _c.oauth) === null || _d === void 0 ? void 0 : _d.redirectSignOut) &&
+        !!((_f = (_e = cognitoConfig === null || cognitoConfig === void 0 ? void 0 : cognitoConfig.loginWith) === null || _e === void 0 ? void 0 : _e.oauth) === null || _f === void 0 ? void 0 : _f.redirectSignIn) &&
+        !!((_h = (_g = cognitoConfig === null || cognitoConfig === void 0 ? void 0 : cognitoConfig.loginWith) === null || _g === void 0 ? void 0 : _g.oauth) === null || _h === void 0 ? void 0 : _h.responseType);
     return (0, AssertError_1.asserts)(validOAuthConfig, {
         name: 'OAuthNotConfigureException',
         message: 'oauth param not configured',
@@ -27,8 +33,8 @@ function assertOAuthConfig(authConfig) {
     });
 }
 exports.assertOAuthConfig = assertOAuthConfig;
-function assertIdentityPooIdConfig(authConfig) {
-    var validConfig = !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.identityPoolId);
+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',
@@ -37,14 +43,13 @@ function assertIdentityPooIdConfig(authConfig) {
 }
 exports.assertIdentityPooIdConfig = assertIdentityPooIdConfig;
 function assertUserPoolAndIdentityPooConfig(authConfig) {
-    var validConfig = !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.identityPoolId) && !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.userPoolId);
+    var validConfig = !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.Cognito.identityPoolId) && !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.Cognito.userPoolId);
     return (0, AssertError_1.asserts)(validConfig, {
         name: 'AuthUserPoolAndIdentityPoolException',
         message: 'Auth UserPool and IdentityPool not configured',
         recoverySuggestion: 'Make sure to call Amplify.configure in your app with UserPoolId and IdentityPoolId',
     });
 }
-exports.assertUserPoolAndIdentityPooConfig = assertUserPoolAndIdentityPooConfig;
 function decodeJWT(token) {
     var tokenSplitted = token.split('.');
     if (tokenSplitted.length !== 3) {

package/lib/singleton/Storage/types.d.ts

@@ -1,15 +1,17 @@
 export type StorageAccessLevel = 'guest' | 'protected' | 'private';
 export interface StorageConfig {
-    bucket?: string;
-    region?: string;
-    dangerouslyConnectToHttpEndpointForTesting?: string;
+    S3: {
+        bucket?: string;
+        region?: string;
+        dangerouslyConnectToHttpEndpointForTesting?: string;
+    };
 }
 type StoragePrefixResolver = (params: {
     accessLevel: StorageAccessLevel;
     targetIdentityId?: string;
 }) => Promise<string>;
 export interface LibraryStorageOptions {
-    AWSS3: {
+    S3: {
         prefixResolver?: StoragePrefixResolver;
         defaultAccessLevel?: StorageAccessLevel;
         isObjectLockEnabled?: boolean;

package/lib/singleton/types.d.ts

@@ -1,18 +1,9 @@
 import { AnalyticsConfig } from './Analytics/types';
-import { AuthConfig, LibraryAuthOptions, UserPoolConfig, IdentityPoolConfig, UserPoolConfigAndIdentityPoolConfig, GetCredentialsOptions } from './Auth/types';
+import { AuthConfig, LibraryAuthOptions, AuthUserPoolConfig, AuthIdentityPoolConfig, AuthUserPoolAndIdentityPoolConfig, GetCredentialsOptions, CognitoIdentityPoolConfig } from './Auth/types';
 import { LibraryStorageOptions, StorageAccessLevel, StorageConfig } from './Storage/types';
-import { CacheConfig } from '../Cache/types';
-import { I18nOptions } from '../I18n/types';
 export type ResourcesConfig = {
-    API?: {};
     Analytics?: AnalyticsConfig;
     Auth?: AuthConfig;
-    Cache?: CacheConfig;
-    DataStore?: {};
-    I18n?: I18nOptions;
-    Interactions?: {};
-    Notifications?: {};
-    Predictions?: {};
     Storage?: StorageConfig;
     ssr?: boolean;
 };
@@ -20,4 +11,4 @@ export type LibraryOptions = {
     Auth?: LibraryAuthOptions;
     Storage?: LibraryStorageOptions;
 };
-export { AuthConfig, UserPoolConfig, IdentityPoolConfig, UserPoolConfigAndIdentityPoolConfig, GetCredentialsOptions, StorageAccessLevel, StorageConfig, };
+export { AuthConfig, AuthUserPoolConfig, AuthIdentityPoolConfig, AuthUserPoolAndIdentityPoolConfig, GetCredentialsOptions, StorageAccessLevel, StorageConfig, AnalyticsConfig, CognitoIdentityPoolConfig, };