@aws-amplify/core 6.0.17-unstable.e316a2e.0 → 6.0.17

package/src/providers/pinpoint/types/buffer.ts

@@ -2,14 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { AuthSession } from '../../../singleton/Auth/types';
+
 import { PinpointAnalyticsEvent, PinpointSession } from './pinpoint';
 
-export type EventBufferConfig = {
+export interface EventBufferConfig {
 	bufferSize: number;
 	flushInterval: number;
 	flushSize: number;
 	resendLimit: number;
-};
+}
 
 export type PinpointEventBufferConfig = EventBufferConfig & {
 	appId: string;
@@ -19,17 +20,15 @@ export type PinpointEventBufferConfig = EventBufferConfig & {
 	userAgentValue?: string;
 };
 
-export type BufferedEvent = {
+export interface BufferedEvent {
 	endpointId: string;
 	eventId: string;
 	event: PinpointAnalyticsEvent;
 	session: PinpointSession;
 	timestamp: string;
 	resendLimit: number;
-};
+}
 
-export type BufferedEventMap = {
-	[key: string]: BufferedEvent;
-};
+export type BufferedEventMap = Record<string, BufferedEvent>;
 
-export type EventBuffer = Array<BufferedEventMap>;
+export type EventBuffer = BufferedEventMap[];

package/src/providers/pinpoint/types/pinpoint.ts

@@ -3,6 +3,7 @@
 
 import { AuthSession } from '../../../singleton/Auth/types';
 import { UserProfile } from '../../../types';
+
 import { EventBufferConfig } from './buffer';
 
 export type SupportedCategory =
@@ -13,34 +14,34 @@ export type SupportedCategory =
 
 type SupportedChannelType = 'APNS' | 'APNS_SANDBOX' | 'GCM' | 'IN_APP';
 
-export type PinpointProviderConfig = {
+export interface PinpointProviderConfig {
 	Pinpoint: Partial<EventBufferConfig> & {
 		appId: string;
 		region: string;
 	};
-};
+}
 
-export type PinpointServiceOptions = {
+export interface PinpointServiceOptions {
 	address?: string;
 	optOut?: 'ALL' | 'NONE';
 	userAttributes?: Record<string, string[]>;
-};
+}
 
-export type PinpointSession = {
+export interface PinpointSession {
 	Id: string;
 	Duration?: number;
 	StartTimestamp: string;
 	StopTimestamp?: string;
-};
+}
 
-export type PinpointAnalyticsEvent = {
+export interface PinpointAnalyticsEvent {
 	name: string;
 	attributes?: Record<string, string>;
 	metrics?: Record<string, number>;
-};
+}
 
 // Common type that is required for operations that may trigger an endpoint update
-type PinpointCommonParameters = {
+interface PinpointCommonParameters {
 	appId: string;
 	category: SupportedCategory;
 	channelType?: SupportedChannelType;
@@ -48,7 +49,7 @@ type PinpointCommonParameters = {
 	identityId?: AuthSession['identityId'];
 	region: string;
 	userAgentValue?: string;
-};
+}
 
 export type PinpointUpdateEndpointInput = PinpointCommonParameters &
 	PinpointServiceOptions & {

package/src/providers/pinpoint/utils/PinpointEventBuffer.ts

@@ -4,17 +4,18 @@
 import { ConsoleLogger } from '../../../Logger';
 import {
 	EventsBatch,
-	putEvents,
 	PutEventsInput,
 	PutEventsOutput,
+	putEvents,
 } from '../../../awsClients/pinpoint';
 import {
-	PinpointEventBufferConfig,
 	BufferedEvent,
 	BufferedEventMap,
 	EventBuffer,
+	PinpointEventBufferConfig,
 } from '../types/buffer';
 import { AuthSession } from '../../../singleton/Auth/types';
+
 import { isAppInForeground } from './isAppInForeground';
 
 const logger = new ConsoleLogger('PinpointEventBuffer');
@@ -110,16 +111,16 @@ export class PinpointEventBuffer {
 					region,
 					userAgentValue,
 				},
-				batchEventParams
+				batchEventParams,
 			);
 			this._processPutEventsSuccessResponse(data, eventMap);
 		} catch (err) {
-			return this._handlePutEventsFailure(err, eventMap);
+			this._handlePutEventsFailure(err, eventMap);
 		}
 	}
 
 	private _generateBatchEventParams(
-		eventMap: BufferedEventMap
+		eventMap: BufferedEventMap,
 	): PutEventsInput {
 		const batchItem: Record<string, EventsBatch> = {};
 
@@ -159,18 +160,17 @@ export class PinpointEventBuffer {
 		if (RETRYABLE_CODES.includes(statusCode)) {
 			const retryableEvents = Object.values(eventMap);
 			this._retry(retryableEvents);
-			return;
 		}
 	}
 
 	private _processPutEventsSuccessResponse(
 		data: PutEventsOutput,
-		eventMap: BufferedEventMap
+		eventMap: BufferedEventMap,
 	) {
 		const { Results = {} } = data.EventsResponse ?? {};
 		const retryableEvents: BufferedEvent[] = [];
 
-		Object.entries(Results).forEach(([endpointId, endpointValues]) => {
+		Object.entries(Results).forEach(([_, endpointValues]) => {
 			const responses = endpointValues.EventsItemResponse ?? {};
 
 			Object.entries(responses).forEach(([eventId, eventValues]) => {
@@ -181,25 +181,13 @@ export class PinpointEventBuffer {
 
 				const { StatusCode, Message } = eventValues ?? {};
 
-				// manually crafting handlers response to keep API consistant
-				const response = {
-					EventsResponse: {
-						Results: {
-							[endpointId]: {
-								EventsItemResponse: {
-									[eventId]: { StatusCode, Message },
-								},
-							},
-						},
-					},
-				};
-
 				if (StatusCode && ACCEPTED_CODES.includes(StatusCode)) {
 					return;
 				}
 
 				if (StatusCode && RETRYABLE_CODES.includes(StatusCode)) {
 					retryableEvents.push(eventObject);
+
 					return;
 				}
 
@@ -233,6 +221,7 @@ export class PinpointEventBuffer {
 					remainingAttempts: bufferedEvent.resendLimit,
 				});
 				eligibleEvents.push({ [eventId!]: bufferedEvent });
+
 				return;
 			}
 
@@ -250,6 +239,7 @@ export class PinpointEventBuffer {
 		return buffer.reduce((acc, curVal) => {
 			const [[key, value]] = Object.entries(curVal);
 			acc[key] = value;
+
 			return acc;
 		}, {});
 	}

package/src/providers/pinpoint/utils/cacheEndpointId.ts

@@ -3,6 +3,7 @@
 
 import { Cache } from '../../../Cache';
 import { SupportedCategory } from '../types';
+
 import { getCacheKey } from './getCacheKey';
 
 /**
@@ -13,13 +14,14 @@ import { getCacheKey } from './getCacheKey';
 export const cacheEndpointId = async (
 	appId: string,
 	category: SupportedCategory,
-	endpointId: string
+	endpointId: string,
 ): Promise<void> => {
 	const cacheKey = getCacheKey(appId, category);
 	// Set a longer TTL to avoid endpoint id being deleted after the default TTL (3 days)
 	// Also set its priority to the highest to reduce its chance of being deleted when cache is full
 	const ttl = 1000 * 60 * 60 * 24 * 365 * 100; // 100 years
 	const expiration = new Date().getTime() + ttl;
+
 	return Cache.setItem(cacheKey, endpointId, {
 		expires: expiration,
 		priority: 1,

package/src/providers/pinpoint/utils/getCacheKey.ts

@@ -12,5 +12,5 @@ const PROVIDER_NAME = 'pinpoint';
  */
 export const getCacheKey = (
 	appId: string,
-	category: SupportedCategory
+	category: SupportedCategory,
 ): string => `${category}:${PROVIDER_NAME}:${appId}`;

package/src/providers/pinpoint/utils/getEndpointId.ts

@@ -3,6 +3,7 @@
 
 import { Cache } from '../../../Cache';
 import { SupportedCategory } from '../types';
+
 import { getCacheKey } from './getCacheKey';
 
 /**
@@ -12,9 +13,10 @@ import { getCacheKey } from './getCacheKey';
  */
 export const getEndpointId = async (
 	appId: string,
-	category: SupportedCategory
+	category: SupportedCategory,
 ): Promise<string | undefined> => {
 	const cacheKey = getCacheKey(appId, category);
 	const cachedEndpointId = await Cache.getItem(cacheKey);
+
 	return cachedEndpointId ?? undefined;
 };

package/src/providers/pinpoint/utils/getEventBuffer.ts

@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { EventBufferConfig } from '../types/buffer';
-import { PinpointEventBuffer } from './PinpointEventBuffer';
 import { AuthSession } from '../../../singleton/Auth/types';
 
+import { PinpointEventBuffer } from './PinpointEventBuffer';
+
 // Map of buffers by region -> appId
 const eventBufferMap: Record<string, Record<string, PinpointEventBuffer>> = {};
 

package/src/providers/pinpoint/utils/isAppInForeground.native.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-// @ts-ignore: missing type definition
 import { AppState } from 'react-native';
 
 export const isAppInForeground = () => AppState.currentState === 'active';

package/src/providers/pinpoint/utils/resolveEndpointId.ts

@@ -5,6 +5,7 @@ import { assert } from '../../../errors';
 import { AmplifyErrorCode } from '../../../types';
 import { updateEndpoint } from '../apis/updateEndpoint';
 import { PinpointUpdateEndpointInput } from '../types';
+
 import { getEndpointId } from './getEndpointId';
 
 /**

package/src/singleton/API/types.ts

@@ -3,22 +3,22 @@
 import { Headers } from '../../clients';
 import { AtLeastOne } from '../types';
 
-export type LibraryAPIOptions = {
+export interface LibraryAPIOptions {
 	GraphQL?: {
 		// custom headers for given GraphQL service. Will be applied to all operations.
-		headers?: (options?: {
+		headers?(options?: {
 			query?: string;
 			variables?: Record<string, DocumentType>;
-		}) => Promise<Headers | {}>;
+		}): Promise<Headers | Record<string, unknown>>;
 		withCredentials?: boolean;
 	};
 	REST?: {
 		// custom headers for given REST service. Will be applied to all operations.
-		headers?: (options: { apiName: string }) => Promise<Headers>;
+		headers?(options: { apiName: string }): Promise<Headers>;
 	};
-};
+}
 
-type APIGraphQLConfig = {
+interface APIGraphQLConfig {
 	/**
 	 * Required GraphQL endpoint, must be a valid URL string.
 	 */
@@ -45,9 +45,9 @@ type APIGraphQLConfig = {
 	 */
 	defaultAuthMode: GraphQLAuthMode;
 	modelIntrospection?: ModelIntrospectionSchema;
-};
+}
 
-type APIRestConfig = {
+interface APIRestConfig {
 	/**
 	 * Required REST endpoint, must be a valid URL string.
 	 */
@@ -65,15 +65,15 @@ type APIRestConfig = {
 	 * @default 'execute-api'
 	 */
 	service?: string;
-};
+}
 
-export type RESTProviderConfig = {
+export interface RESTProviderConfig {
 	REST: Record<string, APIRestConfig>;
-};
+}
 
-export type GraphQLProviderConfig = {
+export interface GraphQLProviderConfig {
 	GraphQL: APIGraphQLConfig;
-};
+}
 
 export type APIConfig = AtLeastOne<RESTProviderConfig & GraphQLProviderConfig>;
 
@@ -101,12 +101,12 @@ export type DocumentType =
  *
  * Borrowed from: https://github.com/aws-amplify/samsara-cli/pull/377/commits/c08ea2c1a43f36aafe63b6d14d03f884e9c0c671#diff-21ae6faa2f22c15bb25ff9b272eaab7846c0650e2d267ab720546c19559583d0R4-R108
  */
-export type ModelIntrospectionSchema = {
+export interface ModelIntrospectionSchema {
 	version: 1;
 	models: SchemaModels;
 	nonModels: SchemaNonModels;
 	enums: SchemaEnums;
-};
+}
 
 /**
  * Top-level Entities on a Schema
@@ -115,42 +115,42 @@ export type SchemaModels = Record<string, SchemaModel>;
 export type SchemaNonModels = Record<string, SchemaNonModel>;
 export type SchemaEnums = Record<string, SchemaEnum>;
 
-export type SchemaModel = {
+export interface SchemaModel {
 	name: string;
 	attributes?: ModelAttribute[];
 	fields: Fields;
 	pluralName: string;
 	syncable?: boolean;
 	primaryKeyInfo: PrimaryKeyInfo;
-};
-export type SchemaNonModel = {
+}
+export interface SchemaNonModel {
 	name: string;
 	fields: Fields;
-};
-export type SchemaEnum = {
+}
+export interface SchemaEnum {
 	name: string;
 	values: string[];
-};
+}
 
-export type ModelAttribute = {
+export interface ModelAttribute {
 	type: string;
-	properties?: { [key: string]: any };
-};
+	properties?: Record<string, any>;
+}
 
-export type SecondaryIndexAttribute = {
+export interface SecondaryIndexAttribute {
 	type: 'key';
 	properties: {
 		name: string;
 		queryField: string;
 		fields: string[];
 	};
-};
+}
 
 /**
  * Field Definition
  */
 export type Fields = Record<string, Field>;
-export type Field = {
+export interface Field {
 	name: string;
 	type: FieldType;
 	isArray: boolean;
@@ -159,9 +159,11 @@ export type Field = {
 	isArrayNullable?: boolean;
 	attributes?: FieldAttribute[];
 	association?: AssociationType;
-};
+}
 
-export type ModelFieldType = { model: string };
+export interface ModelFieldType {
+	model: string;
+}
 
 export type FieldType =
 	| 'ID'
@@ -191,9 +193,9 @@ export enum CodeGenConnectionType {
 	BELONGS_TO = 'BELONGS_TO',
 	HAS_MANY = 'HAS_MANY',
 }
-export type AssociationBaseType = {
+export interface AssociationBaseType {
 	connectionType: CodeGenConnectionType;
-};
+}
 
 export type AssociationHasMany = AssociationBaseType & {
 	connectionType: CodeGenConnectionType.HAS_MANY;
@@ -214,8 +216,8 @@ export type AssociationType =
 	| AssociationHasOne
 	| AssociationBelongsTo;
 
-export type PrimaryKeyInfo = {
+export interface PrimaryKeyInfo {
 	isCustomPrimaryKey: boolean;
 	primaryKeyFieldName: string;
 	sortKeyFieldNames: string[];
-};
+}

package/src/singleton/Amplify.ts

@@ -1,21 +1,23 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { AuthClass } from './Auth';
-import { Hub, AMPLIFY_SYMBOL } from '../Hub';
+import { AMPLIFY_SYMBOL, Hub } from '../Hub';
+import { parseAWSExports } from '../parseAWSExports';
+import { deepFreeze } from '../utils';
+
 import {
 	AuthConfig,
 	LegacyConfig,
 	LibraryOptions,
 	ResourcesConfig,
 } from './types';
-import { parseAWSExports } from '../parseAWSExports';
-import { deepFreeze } from '../utils';
+import { AuthClass } from './Auth';
 import { ADD_OAUTH_LISTENER } from './constants';
 
 export class AmplifyClass {
 	private oAuthListener:
 		| ((authConfig: AuthConfig['Cognito']) => void)
 		| undefined = undefined;
+
 	resourcesConfig: ResourcesConfig;
 	libraryOptions: LibraryOptions;
 
@@ -47,7 +49,7 @@ export class AmplifyClass {
 	 */
 	configure(
 		resourcesConfig: ResourcesConfig | LegacyConfig,
-		libraryOptions?: LibraryOptions
+		libraryOptions?: LibraryOptions,
 	): void {
 		let resolvedResourceConfig: ResourcesConfig;
 
@@ -75,7 +77,7 @@ export class AmplifyClass {
 				data: this.resourcesConfig,
 			},
 			'Configure',
-			AMPLIFY_SYMBOL
+			AMPLIFY_SYMBOL,
 		);
 
 		this.notifyOAuthListener();

package/src/singleton/Auth/index.ts

@@ -1,10 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import {
-	CredentialsAndIdentityId,
 	AuthConfig,
 	AuthSession,
 	AuthTokens,
+	CredentialsAndIdentityId,
 	FetchAuthSessionOptions,
 	LibraryAuthOptions,
 } from './types';
@@ -17,6 +17,7 @@ export function isTokenExpired({
 	clockDrift: number;
 }): boolean {
 	const currentTime = Date.now();
+
 	return currentTime + clockDrift > expiresAt;
 }
 
@@ -24,8 +25,6 @@ export class AuthClass {
 	private authConfig?: AuthConfig;
 	private authOptions?: LibraryAuthOptions;
 
-	constructor() {}
-
 	/**
 	 * Configure Auth category
 	 *
@@ -38,7 +37,7 @@ export class AuthClass {
 	 */
 	configure(
 		authResourcesConfig: AuthConfig,
-		authOptions?: LibraryAuthOptions
+		authOptions?: LibraryAuthOptions,
 	): void {
 		this.authConfig = authResourcesConfig;
 		this.authOptions = authOptions;
@@ -54,14 +53,13 @@ export class AuthClass {
 	 * @returns Promise of current auth session {@link AuthSession}.
 	 */
 	async fetchAuthSession(
-		options: FetchAuthSessionOptions = {}
+		options: FetchAuthSessionOptions = {},
 	): Promise<AuthSession> {
-		let tokens: AuthTokens | undefined;
 		let credentialsAndIdentityId: CredentialsAndIdentityId | undefined;
 		let userSub: string | undefined;
 
 		// Get tokens will throw if session cannot be refreshed (network or service error) or return null if not available
-		tokens = await this.getTokens(options);
+		const tokens = await this.getTokens(options);
 
 		if (tokens) {
 			userSub = tokens.accessToken?.payload?.sub;
@@ -74,7 +72,7 @@ export class AuthClass {
 						tokens,
 						authenticated: true,
 						forceRefresh: options.forceRefresh,
-					}
+					},
 				);
 		} else {
 			// getCredentialsAndIdentityId will throw if cannot get credentials (network or service error)
@@ -84,7 +82,7 @@ export class AuthClass {
 						authConfig: this.authConfig,
 						authenticated: false,
 						forceRefresh: options.forceRefresh,
-					}
+					},
 				);
 		}
 
@@ -97,13 +95,11 @@ export class AuthClass {
 	}
 
 	async clearCredentials(): Promise<void> {
-		if (this.authOptions?.credentialsProvider) {
-			return await this.authOptions.credentialsProvider.clearCredentialsAndIdentityId();
-		}
+		await this.authOptions?.credentialsProvider?.clearCredentialsAndIdentityId();
 	}
 
 	async getTokens(
-		options: FetchAuthSessionOptions
+		options: FetchAuthSessionOptions,
 	): Promise<AuthTokens | undefined> {
 		return (
 			(await this.authOptions?.tokenProvider?.getTokens(options)) ?? undefined