@aws-amplify/core 6.0.1-console-preview.2f5ba46.0 → 6.0.1-console-preview.9e7dd78.0

package/lib/Hub/types/AuthTypes.d.ts

@@ -1,11 +1,17 @@
-export type AuthHubEventData = {
+export type AuthHubEventData = 
+/** Dispatched when a user signs in with an oauth provider such as Google.*/
+{
     event: 'signInWithRedirect';
-} | {
+}
+/** Dispatched when there is an error in the oauth flow process.*/
+ | {
+    event: 'signInWithRedirect_failure';
+}
+/** Dispatched when auth tokens are successfully refreshed.*/
+ | {
     event: 'tokenRefresh';
-} | {
+}
+/** Dispatched when there is an error in the refresh of tokens.*/
+ | {
     event: 'tokenRefresh_failure';
-} | {
-    event: 'customOAuthState';
-} | {
-    event: 'customState_failure';
 };

package/lib/Platform/index.d.ts

@@ -1,5 +1,5 @@
 import { CustomUserAgentDetails, Framework } from './types';
-import type { UserAgent as AWSUserAgent } from '@aws-sdk/types';
+import { UserAgent as AWSUserAgent } from '@aws-sdk/types';
 declare class PlatformBuilder {
     userAgent: string;
     get framework(): Framework;
@@ -7,6 +7,6 @@ declare class PlatformBuilder {
     observeFrameworkChanges(fcn: () => void): void;
 }
 export declare const Platform: PlatformBuilder;
-export declare const getAmplifyUserAgentObject: ({ category, action, framework, additionalInfo, }?: CustomUserAgentDetails) => AWSUserAgent;
+export declare const getAmplifyUserAgentObject: ({ category, action, framework, }?: CustomUserAgentDetails) => AWSUserAgent;
 export declare const getAmplifyUserAgent: (customUserAgentDetails?: CustomUserAgentDetails) => string;
 export {};

package/lib/Platform/index.js

@@ -49,15 +49,12 @@ var PlatformBuilder = /** @class */ (function () {
 }());
 exports.Platform = new PlatformBuilder();
 var getAmplifyUserAgentObject = function (_a) {
-    var _b = _a === void 0 ? {} : _a, category = _b.category, action = _b.action, framework = _b.framework, additionalInfo = _b.additionalInfo;
+    var _b = _a === void 0 ? {} : _a, category = _b.category, action = _b.action, framework = _b.framework;
     var userAgent = [[BASE_USER_AGENT, version_1.version]];
     if (category) {
         userAgent.push([category, action]);
     }
-    userAgent.push(['framework', framework || (0, detectFramework_1.detectFramework)()]);
-    if (additionalInfo) {
-        userAgent = userAgent.concat(additionalInfo);
-    }
+    userAgent.push(['framework', (0, detectFramework_1.detectFramework)()]);
     return userAgent;
 };
 exports.getAmplifyUserAgentObject = getAmplifyUserAgentObject;

package/lib/Platform/types.d.ts

@@ -1,4 +1,3 @@
-import type { UserAgent as AWSUserAgent } from '@aws-sdk/types';
 export declare enum Framework {
     WebUnknown = "0",
     React = "1",
@@ -44,63 +43,17 @@ export declare enum ApiAction {
     Head = "7"
 }
 export declare enum AuthAction {
-    SignUp = "1",
-    ConfirmSignUp = "2",
-    ResendSignUp = "3",
-    SignIn = "4",
-    GetMFAOptions = "5",
-    GetPreferredMFA = "6",
-    SetPreferredMFA = "7",
-    DisableSMS = "8",
-    EnableSMS = "9",
-    SetupTOTP = "10",
-    VerifyTotpToken = "11",
-    ConfirmSignIn = "12",
-    CompleteNewPassword = "13",
-    SendCustomChallengeAnswer = "14",
-    DeleteUserAttributes = "15",
-    DeleteUser = "16",
-    UpdateUserAttributes = "17",
-    UserAttributes = "18",
-    CurrentUserPoolUser = "19",
-    CurrentAuthenticatedUser = "20",
-    CurrentSession = "21",
-    VerifyUserAttribute = "22",
-    VerifyUserAttributeSubmit = "23",
-    VerifyCurrentUserAttribute = "24",
-    VerifyCurrentUserAttributeSubmit = "25",
-    SignOut = "26",
-    ChangePassword = "27",
-    ForgotPassword = "28",
-    ForgotPasswordSubmit = "29",
-    FederatedSignIn = "30",
-    VerifiedContact = "31",
-    UserSession = "32",
-    CurrentUserCredentials = "33",
-    CurrentCredentials = "34",
-    CurrentUserInfo = "35",
-    RememberDevice = "36",
-    ForgetDevice = "37",
-    FetchDevices = "38"
+    FederatedSignIn = "30"
 }
 export declare enum DataStoreAction {
     Subscribe = "1",
     GraphQl = "2"
 }
 export declare enum GeoAction {
-    SearchByText = "1",
-    SearchForSuggestions = "2",
-    SearchByPlaceId = "3",
-    SearchByCoordinates = "4",
-    SaveGeofences = "5",
-    GetGeofence = "6",
-    ListGeofences = "7",
-    DeleteGeofences = "8"
+    None = "0"
 }
 export declare enum InAppMessagingAction {
-    None = "0",
-    SyncMessages = "1",
-    IdentifyUser = "2"
+    None = "0"
 }
 export declare enum InteractionsAction {
     None = "0"
@@ -122,8 +75,7 @@ export declare enum StorageAction {
     List = "3",
     Copy = "4",
     Remove = "5",
-    GetProperties = "6",
-    Cancel = "7"
+    GetProperties = "6"
 }
 type ActionMap = {
     [Category.Auth]: AuthAction;
@@ -144,9 +96,6 @@ type UserAgentDetailsWithCategory<T extends Category> = CustomUserAgentDetailsBa
 };
 type CustomUserAgentDetailsBase = {
     framework?: Framework;
-    /** Accepts an array of arrays with exactly 1 or 2 values and translates
-    those arrays to "item" or "item1/item2" strings on the custom user agent */
-    additionalInfo?: AWSUserAgent;
 };
 export type CustomUserAgentDetails = (CustomUserAgentDetailsBase & {
     category?: never;

package/lib/Platform/types.js

@@ -1,4 +1,6 @@
 "use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageAction = exports.PushNotificationAction = exports.PubSubAction = exports.PredictionsAction = exports.InteractionsAction = exports.InAppMessagingAction = exports.GeoAction = exports.DataStoreAction = exports.AuthAction = exports.ApiAction = exports.AnalyticsAction = exports.Category = exports.Framework = void 0;
 var Framework;
@@ -54,44 +56,40 @@ var ApiAction;
 })(ApiAction = exports.ApiAction || (exports.ApiAction = {}));
 var AuthAction;
 (function (AuthAction) {
-    AuthAction["SignUp"] = "1";
-    AuthAction["ConfirmSignUp"] = "2";
-    AuthAction["ResendSignUp"] = "3";
-    AuthAction["SignIn"] = "4";
-    AuthAction["GetMFAOptions"] = "5";
-    AuthAction["GetPreferredMFA"] = "6";
-    AuthAction["SetPreferredMFA"] = "7";
-    AuthAction["DisableSMS"] = "8";
-    AuthAction["EnableSMS"] = "9";
-    AuthAction["SetupTOTP"] = "10";
-    AuthAction["VerifyTotpToken"] = "11";
-    AuthAction["ConfirmSignIn"] = "12";
-    AuthAction["CompleteNewPassword"] = "13";
-    AuthAction["SendCustomChallengeAnswer"] = "14";
-    AuthAction["DeleteUserAttributes"] = "15";
-    AuthAction["DeleteUser"] = "16";
-    AuthAction["UpdateUserAttributes"] = "17";
-    AuthAction["UserAttributes"] = "18";
-    AuthAction["CurrentUserPoolUser"] = "19";
-    AuthAction["CurrentAuthenticatedUser"] = "20";
-    AuthAction["CurrentSession"] = "21";
-    AuthAction["VerifyUserAttribute"] = "22";
-    AuthAction["VerifyUserAttributeSubmit"] = "23";
-    AuthAction["VerifyCurrentUserAttribute"] = "24";
-    AuthAction["VerifyCurrentUserAttributeSubmit"] = "25";
-    AuthAction["SignOut"] = "26";
-    AuthAction["ChangePassword"] = "27";
-    AuthAction["ForgotPassword"] = "28";
-    AuthAction["ForgotPasswordSubmit"] = "29";
+    // SignUp = '1',
+    // ConfirmSignUp = '2',
+    // ResendSignUp = '3',
+    // SignIn = '4',
+    // GetMFAOptions = '5',
+    // GetPreferredMFA = '6',
+    // SetPreferredMFA = '7',
+    // DisableSMS = '8',
+    // EnableSMS = '9',
+    // SetupTOTP = '10',
+    // VerifyTotpToken = '11',
+    // ConfirmSignIn = '12',
+    // CompleteNewPassword = '13',
+    // SendCustomChallengeAnswer = '14',
+    // DeleteUserAttributes = '15',
+    // DeleteUser = '16',
+    // UpdateUserAttributes = '17',
+    // UserAttributes = '18',
+    // CurrentUserPoolUser = '19',
+    // CurrentAuthenticatedUser = '20',
+    // CurrentSession = '21',
+    // VerifyUserAttribute = '22',
+    // VerifyUserAttributeSubmit = '23',
+    // VerifyCurrentUserAttribute = '24',
+    // VerifyCurrentUserAttributeSubmit = '25',
+    // SignOut = '26',
+    // ChangePassword = '27',
+    // ForgotPassword = '28',
+    // ForgotPasswordSubmit = '29',
     AuthAction["FederatedSignIn"] = "30";
-    AuthAction["VerifiedContact"] = "31";
-    AuthAction["UserSession"] = "32";
-    AuthAction["CurrentUserCredentials"] = "33";
-    AuthAction["CurrentCredentials"] = "34";
-    AuthAction["CurrentUserInfo"] = "35";
-    AuthAction["RememberDevice"] = "36";
-    AuthAction["ForgetDevice"] = "37";
-    AuthAction["FetchDevices"] = "38";
+    // CurrentUserInfo = '31',
+    // RememberDevice = '32',
+    // ForgetDevice = '33',
+    // FetchDevices = '34',
 })(AuthAction = exports.AuthAction || (exports.AuthAction = {}));
 var DataStoreAction;
 (function (DataStoreAction) {
@@ -100,20 +98,11 @@ var DataStoreAction;
 })(DataStoreAction = exports.DataStoreAction || (exports.DataStoreAction = {}));
 var GeoAction;
 (function (GeoAction) {
-    GeoAction["SearchByText"] = "1";
-    GeoAction["SearchForSuggestions"] = "2";
-    GeoAction["SearchByPlaceId"] = "3";
-    GeoAction["SearchByCoordinates"] = "4";
-    GeoAction["SaveGeofences"] = "5";
-    GeoAction["GetGeofence"] = "6";
-    GeoAction["ListGeofences"] = "7";
-    GeoAction["DeleteGeofences"] = "8";
+    GeoAction["None"] = "0";
 })(GeoAction = exports.GeoAction || (exports.GeoAction = {}));
 var InAppMessagingAction;
 (function (InAppMessagingAction) {
     InAppMessagingAction["None"] = "0";
-    InAppMessagingAction["SyncMessages"] = "1";
-    InAppMessagingAction["IdentifyUser"] = "2";
 })(InAppMessagingAction = exports.InAppMessagingAction || (exports.InAppMessagingAction = {}));
 var InteractionsAction;
 (function (InteractionsAction) {
@@ -141,5 +130,4 @@ var StorageAction;
     StorageAction["Copy"] = "4";
     StorageAction["Remove"] = "5";
     StorageAction["GetProperties"] = "6";
-    StorageAction["Cancel"] = "7";
 })(StorageAction = exports.StorageAction || (exports.StorageAction = {}));

package/lib/Platform/version.d.ts

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

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

package/lib/index.d.ts

@@ -1,11 +1,5 @@
-export { ClientDevice } from './ClientDevice';
-export { ConsoleLogger, ConsoleLogger as Logger } from './Logger';
 export { Hub } from './Hub';
 export { HubCapsule, HubCallback, HubPayload } from './Hub/types';
-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, 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';

package/lib/index.js

@@ -2,28 +2,13 @@
 // 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.UniversalStorage = 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.CredentialsClass = exports.Credentials = exports.Linking = exports.AsyncStorage = exports.AppState = exports.GoogleOAuth = exports.FacebookOAuth = exports.Hub = exports.Logger = exports.ConsoleLogger = exports.ClientDevice = void 0;
+exports.parseAWSExports = exports.I18n = exports.Cache = exports.BrowserStorageCache = exports.InMemoryCache = exports.UniversalStorage = 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.
 */
-// TODO Remove these
-var ClientDevice_1 = require("./ClientDevice");
-Object.defineProperty(exports, "ClientDevice", { enumerable: true, get: function () { return ClientDevice_1.ClientDevice; } });
-var Logger_1 = require("./Logger");
-Object.defineProperty(exports, "ConsoleLogger", { enumerable: true, get: function () { return Logger_1.ConsoleLogger; } });
-Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return Logger_1.ConsoleLogger; } });
+// Hub exports
 var Hub_1 = require("./Hub");
 Object.defineProperty(exports, "Hub", { enumerable: true, get: function () { return Hub_1.Hub; } });
-var OAuthHelper_1 = require("./OAuthHelper");
-Object.defineProperty(exports, "FacebookOAuth", { enumerable: true, get: function () { return OAuthHelper_1.FacebookOAuth; } });
-Object.defineProperty(exports, "GoogleOAuth", { enumerable: true, get: function () { return OAuthHelper_1.GoogleOAuth; } });
-var RNComponents_1 = require("./RNComponents");
-Object.defineProperty(exports, "AppState", { enumerable: true, get: function () { return RNComponents_1.AppState; } });
-Object.defineProperty(exports, "AsyncStorage", { enumerable: true, get: function () { return RNComponents_1.AsyncStorage; } });
-Object.defineProperty(exports, "Linking", { enumerable: true, get: function () { return RNComponents_1.Linking; } });
-var Credentials_1 = require("./Credentials");
-Object.defineProperty(exports, "Credentials", { enumerable: true, get: function () { return Credentials_1.Credentials; } });
-Object.defineProperty(exports, "CredentialsClass", { enumerable: true, get: function () { return Credentials_1.CredentialsClass; } });
 var singleton_1 = require("./singleton");
 Object.defineProperty(exports, "Amplify", { enumerable: true, get: function () { return singleton_1.Amplify; } });
 Object.defineProperty(exports, "fetchAuthSession", { enumerable: true, get: function () { return singleton_1.fetchAuthSession; } });

package/lib/parseAWSExports.d.ts

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

package/lib/parseAWSExports.js

@@ -12,71 +12,65 @@ var __assign = (this && this.__assign) || function () {
 };
 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.
+ * This utility converts the `aws-exports.js` file generated by the Amplify CLI into a {@link ResourcesConfig} object
+ * consumable by Amplify.
  *
  * @param config A configuration object from `aws-exports.js`.
  *
- * @returns An AmplifyConfig object.
+ * @returns A {@link ResourcesConfig} object.
  */
 var parseAWSExports = function (config) {
+    if (config === void 0) { config = {}; }
+    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 (config['aws_mobile_analytics_app_id']) {
-        var Analytics = {
+    if (aws_mobile_analytics_app_id) {
+        amplifyConfig.Analytics = {
             Pinpoint: {
-                appId: config['aws_mobile_analytics_app_id'],
-                region: config['aws_mobile_analytics_app_region'],
+                appId: aws_mobile_analytics_app_id,
+                region: aws_mobile_analytics_app_region,
             },
         };
-        amplifyConfig.Analytics = Analytics;
     }
     // Auth
-    if (config['aws_cognito_identity_pool_id'] || config['aws_user_pools_id']) {
+    if (aws_cognito_identity_pool_id || aws_user_pools_id) {
         amplifyConfig.Auth = {
-            userPoolId: config['aws_user_pools_id'],
-            userPoolWebClientId: config['aws_user_pools_web_client_id'],
-            region: config['aws_cognito_region'],
-            identityPoolId: config['aws_cognito_identity_pool_id'],
-            identityPoolRegion: config['aws_cognito_region'],
-            mandatorySignIn: config['aws_mandatory_sign_in'] === 'enable',
-            signUpVerificationMethod: config['aws_cognito_sign_up_verification_method'] || 'code',
+            Cognito: __assign({ identityPoolId: aws_cognito_identity_pool_id, allowGuestAccess: aws_mandatory_sign_in !== 'enable', signUpVerificationMethod: aws_cognito_sign_up_verification_method, userPoolClientId: aws_user_pools_web_client_id, userPoolId: aws_user_pools_id }, (oauth && { loginWith: getOAuthConfig(oauth) })),
         };
     }
     // Storage
-    var storageConfig;
-    if (config['aws_user_files_s3_bucket']) {
-        storageConfig = {
-            AWSS3: {
-                bucket: config['aws_user_files_s3_bucket'],
-                region: config['aws_user_files_s3_bucket_region'],
-                dangerouslyConnectToHttpEndpointForTesting: config['aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing'],
+    if (aws_user_files_s3_bucket) {
+        amplifyConfig.Storage = {
+            S3: {
+                bucket: aws_user_files_s3_bucket,
+                region: aws_user_files_s3_bucket_region,
+                dangerouslyConnectToHttpEndpointForTesting: aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing,
             },
         };
     }
-    else {
-        storageConfig = config ? config.Storage || config : {};
-    }
-    // Logging
-    if (config['Logging']) {
-        amplifyConfig.Logging = __assign(__assign({}, config['Logging']), { region: config['aws_project_region'] });
-    }
     // Geo
-    if (config['geo']) {
-        amplifyConfig.Geo = Object.assign({}, config.geo);
-        if (config.geo['amazon_location_service']) {
-            amplifyConfig.Geo = {
-                AmazonLocationService: config.geo['amazon_location_service'],
-            };
-        }
+    if (geo) {
+        var amazon_location_service = geo.amazon_location_service;
+        amplifyConfig.Geo = amazon_location_service
+            ? { AmazonLocationService: amazon_location_service }
+            : __assign({}, geo);
     }
-    amplifyConfig.Analytics = Object.assign({}, amplifyConfig.Analytics, config.Analytics);
-    amplifyConfig.Auth = Object.assign({}, amplifyConfig.Auth, config.Auth);
-    amplifyConfig.Storage = Object.assign({}, storageConfig);
-    amplifyConfig.Logging = Object.assign({}, amplifyConfig.Logging, config.Logging);
-    logger.debug('parse config', config, 'to amplifyconfig', amplifyConfig);
     return amplifyConfig;
 };
 exports.parseAWSExports = parseAWSExports;
+var getRedirectUrl = function (redirectStr) {
+    return redirectStr.split(',');
+};
+var getOAuthConfig = function (_a) {
+    var domain = _a.domain, scope = _a.scope, redirectSignIn = _a.redirectSignIn, redirectSignOut = _a.redirectSignOut, responseType = _a.responseType;
+    return ({
+        oauth: {
+            domain: domain,
+            scopes: scope,
+            redirectSignIn: getRedirectUrl(redirectSignIn),
+            redirectSignOut: getRedirectUrl(redirectSignOut),
+            responseType: responseType,
+        },
+    });
+};

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

@@ -35,7 +35,7 @@ export type Identity = {
     type: 'guest' | 'primary';
 };
 export interface AWSCredentialsAndIdentityIdProvider {
-    getCredentialsAndIdentityId: (getCredentialsOptions: GetCredentialsOptions) => Promise<AWSCredentialsAndIdentityId>;
+    getCredentialsAndIdentityId: (getCredentialsOptions: GetCredentialsOptions) => Promise<AWSCredentialsAndIdentityId | undefined>;
     clearCredentialsAndIdentityId: () => void;
 }
 export type TokenProvider = {