@aws-amplify/core 6.0.1-console-preview.096eee3.0 → 6.0.1-console-preview.3b09ef9.0

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

@@ -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-esm/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-esm/singleton/Auth/utils/index.js

@@ -1,37 +1,43 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { asserts } from '../../../Util/errors/AssertError';
-export function assertTokenProviderConfig(authConfig) {
-    var validConfig = !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.userPoolId) && !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.userPoolWebClientId);
-    return asserts(validConfig, {
+export function assertTokenProviderConfig(cognitoConfig) {
+    var assertionValid = true; // assume valid until otherwise proveed
+    if (!cognitoConfig) {
+        assertionValid = false;
+    }
+    else {
+        assertionValid =
+            !!cognitoConfig.userPoolClientId && !!cognitoConfig.userPoolClientId;
+    }
+    return asserts(assertionValid, {
         name: 'AuthTokenConfigException',
         message: 'Auth Token Provider not configured',
         recoverySuggestion: 'Make sure to call Amplify.configure in your app',
     });
 }
-export 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);
+export 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 asserts(validOAuthConfig, {
         name: 'OAuthNotConfigureException',
         message: 'oauth param not configured',
         recoverySuggestion: 'Make sure to call Amplify.configure with oauth parameter in your app',
     });
 }
-export function assertIdentityPooIdConfig(authConfig) {
-    var validConfig = !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.identityPoolId);
+export function assertIdentityPooIdConfig(cognitoConfig) {
+    var validConfig = !!(cognitoConfig === null || cognitoConfig === void 0 ? void 0 : cognitoConfig.identityPoolId);
     return asserts(validConfig, {
         name: 'AuthIdentityPoolIdException',
         message: 'Auth IdentityPoolId not configured',
         recoverySuggestion: 'Make sure to call Amplify.configure in your app with a valid IdentityPoolId',
     });
 }
-export function assertUserPoolAndIdentityPooConfig(authConfig) {
-    var validConfig = !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.identityPoolId) && !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.userPoolId);
+function assertUserPoolAndIdentityPooConfig(authConfig) {
+    var validConfig = !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.Cognito.identityPoolId) && !!(authConfig === null || authConfig === void 0 ? void 0 : authConfig.Cognito.userPoolId);
     return asserts(validConfig, {
         name: 'AuthUserPoolAndIdentityPoolException',
         message: 'Auth UserPool and IdentityPool not configured',

package/lib-esm/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-esm/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 } 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 as UserPoolConfig, AuthIdentityPoolConfig as IdentityPoolConfig, AuthUserPoolAndIdentityPoolConfig as UserPoolConfigAndIdentityPoolConfig, GetCredentialsOptions, StorageAccessLevel, StorageConfig, AnalyticsConfig, };