@aws-amplify/analytics 7.0.1-console-preview.a1c533e.0 → 7.0.1-console-preview.f7f118b.0

package/lib-esm/utils/resolveCredentials.d.ts

@@ -1,9 +1,4 @@
 export declare const resolveCredentials: () => Promise<{
-    credentials: {
-        accessKeyId: string;
-        secretAccessKey: string;
-        sessionToken?: string | undefined;
-        expiration?: Date | undefined;
-    };
+    credentials: import("@aws-amplify/core/lib-esm/libraryUtils").AWSCredentials;
     identityId: string | undefined;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/analytics",
-  "version": "7.0.1-console-preview.a1c533e.0+a1c533e",
+  "version": "7.0.1-console-preview.f7f118b.0+f7f118b",
   "description": "Analytics category of aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -96,16 +96,14 @@
     "@aws-sdk/client-kinesis": "3.398.0",
     "@aws-sdk/client-personalize-events": "3.398.0",
     "@smithy/util-utf8": "2.0.0",
-    "tslib": "^2.5.0",
-    "uuid": "^9.0.0"
+    "tslib": "^2.5.0"
   },
   "peerDependencies": {
-    "@aws-amplify/core": "6.0.1-console-preview.a1c533e.0+a1c533e"
+    "@aws-amplify/core": "6.0.1-console-preview.f7f118b.0+f7f118b"
   },
   "devDependencies": {
-    "@aws-amplify/core": "6.0.1-console-preview.a1c533e.0+a1c533e",
+    "@aws-amplify/core": "6.0.1-console-preview.f7f118b.0+f7f118b",
     "@aws-sdk/types": "3.398.0",
-    "@types/uuid": "^9.0.0",
     "typescript": "5.0.2"
   },
   "jest": {
@@ -152,5 +150,5 @@
       "<rootDir>/src/setupTests.ts"
     ]
   },
-  "gitHead": "a1c533eae82c5386864fb15fc101bb3cb9bd93ae"
+  "gitHead": "f7f118b047bb772ef12531eab78e059a6a1442f1"
 }

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

@@ -1,8 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { AWSCredentials } from '@aws-amplify/core/internals/utils';
 import { EventBufferConfig } from '../../../utils';
-import { Credentials } from '@aws-sdk/types';
 import { KinesisShard } from '../../../types';
 
 export type KinesisBufferEvent = KinesisShard & {
@@ -13,7 +13,7 @@ export type KinesisBufferEvent = KinesisShard & {
 
 export type KinesisEventBufferConfig = EventBufferConfig & {
 	region: string;
-	credentials: Credentials;
+	credentials: AWSCredentials;
 	identityId?: string;
 	resendLimit?: number;
 	userAgentValue?: string;

package/src/providers/kinesis-firehose/types/buffer.ts

@@ -3,7 +3,7 @@
 
 import { EventBufferConfig } from '../../../utils';
 import { KinesisStream } from '../../../types';
-import { Credentials } from '@aws-sdk/types';
+import { AWSCredentials } from '@aws-amplify/core/internals/utils';
 
 export type KinesisFirehoseBufferEvent = KinesisStream & {
 	event: Uint8Array;
@@ -13,7 +13,7 @@ export type KinesisFirehoseBufferEvent = KinesisStream & {
 
 export type KinesisFirehoseEventBufferConfig = EventBufferConfig & {
 	region: string;
-	credentials: Credentials;
+	credentials: AWSCredentials;
 	identityId?: string;
 	resendLimit?: number;
 	userAgentValue?: string;

package/src/providers/personalize/apis/record.ts

@@ -39,10 +39,10 @@ export const record = ({
 	const { region, trackingId, bufferSize, flushSize, flushInterval } =
 		resolveConfig();
 	resolveCredentials()
-		.then(({ credentials, identityId }) => {
+		.then(async ({ credentials, identityId }) => {
 			const timestamp = Date.now();
 			const { sessionId: cachedSessionId, userId: cachedUserId } =
-				resolveCachedSession(trackingId);
+				await resolveCachedSession();
 			if (eventType === IDENTIFY_EVENT_TYPE) {
 				updateCachedSession(
 					typeof properties.userId === 'string' ? properties.userId : '',
@@ -54,7 +54,7 @@ export const record = ({
 			}
 
 			const { sessionId: updatedSessionId, userId: updatedUserId } =
-				resolveCachedSession(trackingId);
+				await resolveCachedSession();
 
 			const eventBuffer = getEventBuffer({
 				region,

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

@@ -3,7 +3,7 @@
 
 import { PersonalizeEvent } from './';
 import { EventBufferConfig } from '../../../utils';
-import { Credentials } from '@aws-sdk/types';
+import { AWSCredentials } from '@aws-amplify/core/internals/utils';
 
 export type PersonalizeBufferEvent = {
 	trackingId: string;
@@ -15,7 +15,7 @@ export type PersonalizeBufferEvent = {
 
 export type PersonalizeBufferConfig = EventBufferConfig & {
 	region: string;
-	credentials: Credentials;
+	credentials: AWSCredentials;
 	identityId?: string;
 	userAgentValue?: string;
 };

package/src/providers/personalize/utils/cachedSession.ts

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Cache } from '@aws-amplify/core';
-import { isBrowser } from '@aws-amplify/core/internals/utils';
-import { v4 as uuid } from 'uuid';
+import { isBrowser, amplifyUuid } from '@aws-amplify/core/internals/utils';
 
 const PERSONALIZE_CACHE_USERID = '_awsct_uid';
 const PERSONALIZE_CACHE_SESSIONID = '_awsct_sid';
@@ -27,14 +26,16 @@ const setCache = (key: string, value: unknown) => {
 	});
 };
 
-export const resolveCachedSession = (trackingId: string) => {
-	let sessionId: string | undefined = getCache(PERSONALIZE_CACHE_SESSIONID);
+export const resolveCachedSession = async () => {
+	let sessionId: string | undefined = await getCache(
+		PERSONALIZE_CACHE_SESSIONID
+	);
 	if (!sessionId) {
-		sessionId = uuid();
+		sessionId = amplifyUuid();
 		setCache(PERSONALIZE_CACHE_SESSIONID, sessionId);
 	}
 
-	const userId: string | undefined = getCache(PERSONALIZE_CACHE_USERID);
+	const userId: string | undefined = await getCache(PERSONALIZE_CACHE_USERID);
 
 	return {
 		sessionId,
@@ -58,7 +59,7 @@ export const updateCachedSession = (
 		!!currentSessionId && !currentUserId && !!newUserId;
 
 	if (isRequireNewSession) {
-		const newSessionId = uuid();
+		const newSessionId = amplifyUuid();
 		setCache(PERSONALIZE_CACHE_SESSIONID, newSessionId);
 		setCache(PERSONALIZE_CACHE_USERID, newUserId);
 	} else if (isRequireUpdateSession) {