address nits and add logger

packages/core/__tests__/storage/DefaultStorage.test.ts

@@ -1,4 +1,5 @@
 import { DefaultStorage } from '../../src/storage/DefaultStorage';
+import { InMemoryStorage } from '../../src/storage/InMemoryStorage';
 
 const key = 'k';
 const value = 'value';
@@ -45,14 +46,13 @@ describe('DefaultStorage', () => {
 			},
 		});
 
-		console.error = jest.fn(); // Mock console.error
+		jest.mock('../../src/Logger/ConsoleLogger');
 
 		// Create a new DefaultStorage instance to trigger the fallback
 		const fallbackStorage = new DefaultStorage();
 
 		// Verify that the storage still works as expected
-		await fallbackStorage.setItem(key, value);
-		expect(await fallbackStorage.getItem(key)).toEqual(value);
+		expect(fallbackStorage instanceof InMemoryStorage).toEqual(true);
 
 		// Verify that the error was logged
 		expect(console.error).toHaveBeenCalledWith(

packages/core/__tests__/storage/SessionStorage.test.ts

@@ -1,3 +1,4 @@
+import { InMemoryStorage } from '../../src/storage/InMemoryStorage';
 import { SessionStorage } from '../../src/storage/SessionStorage';
 
 const key = 'k';
@@ -53,8 +54,7 @@ describe('SessionStorage', () => {
 		const fallbackStorage = new SessionStorage();
 
 		// Verify that the storage still works as expected
-		await fallbackStorage.setItem(key, value);
-		expect(await fallbackStorage.getItem(key)).toEqual(value);
+		expect(fallbackStorage).toBeInstanceOf(InMemoryStorage);
 
 		// Verify that the error was logged
 		expect(console.error).toHaveBeenCalledWith(

packages/core/src/storage/utils.ts

@@ -1,12 +1,17 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import { ConsoleLogger } from '../Logger';
+
 import { InMemoryStorage } from './InMemoryStorage';
 
 /**
  * @internal
  * @returns Either a reference to window.localStorage or an in-memory storage as fallback
  */
+
+const logger = new ConsoleLogger('CoreStorageUtils');
+
 export const getLocalStorageWithFallback = (): Storage => {
 	try {
 		// Attempt to use localStorage directly
@@ -30,13 +35,17 @@ export const getSessionStorageWithFallback = (): Storage => {
 	try {
 		// Attempt to use sessionStorage directly
 		if (typeof window !== 'undefined' && window.sessionStorage) {
+			// Verify we can actually use it by testing access
+			window.sessionStorage.getItem('test');
+
 			return window.sessionStorage;
 		}
+
+		throw new Error('sessionStorage is not defined');
 	} catch (e) {
 		// Handle any errors related to sessionStorage access
-		console.error('SessionStorage access failed:', e);
-	}
+		logger.error('SessionStorage access failed:', e);
 
-	// Return in-memory storage as a fallback if sessionStorage is not accessible
-	return new InMemoryStorage();
+		return new InMemoryStorage();
+	}
 };