PWA-2571: Regression fix disabled TTL support in BrowserPersistence (#…

…3729)

* PWA-2571: Regression fix disabled TTL support in BrowserPersistence

- Reverted ttl support for getItem

* PWA-2571: Regression fix disabled TTL support in BrowserPersistence

- Updated user reducers to not use the ttl checking getItem to let user component validate.

Co-authored-by: Tommy Wiebell <twiebell@adobe.com>

packages/peregrine/lib/store/reducers/user.js

@@ -7,7 +7,17 @@ import actions from '../actions/user';
 
 export const name = 'user';
 
-const isSignedIn = () => !!storage.getItem('signin_token');
+const rawSignInToken = storage.getRawItem('signin_token');
+
+const isSignedIn = () => !!rawSignInToken;
+
+const getToken = () => {
+    if (!rawSignInToken) {
+        return undefined;
+    }
+    const { value } = JSON.parse(rawSignInToken);
+    return value;
+};
 
 const initialState = {
     currentUser: {
@@ -20,7 +30,7 @@ const initialState = {
     isResettingPassword: false,
     isSignedIn: isSignedIn(),
     resetPasswordError: null,
-    token: storage.getItem('signin_token')
+    token: getToken()
 };
 
 const reducerMap = {

packages/peregrine/lib/util/__mocks__/simplePersistence.js

@@ -1,9 +1,11 @@
 export const mockGetItem = jest.fn();
+export const mockGetRawItem = jest.fn();
 export const mockRemoveItem = jest.fn();
 export const mockSetItem = jest.fn();
 
 export const BrowserPersistence = jest.fn().mockImplementation(() => ({
     getItem: mockGetItem,
+    getRawItem: mockGetRawItem,
     removeItem: mockRemoveItem,
     setItem: mockSetItem
 }));

packages/peregrine/lib/util/__tests__/simplePersistence.spec.js

@@ -59,6 +59,24 @@ describe('getItem', () => {
     });
 });
 
+test('it removes the item and returns undefined if the item has expired', () => {
+    // Test setup: an expired item.
+    mockGetItem.mockImplementationOnce(() =>
+        shape({
+            value: MOCK_VALUE,
+            timeStored: 0,
+            ttl: 1
+        })
+    );
+
+    // Call the function.
+    const result = instance.getItem(NAME);
+
+    // Make assertions.
+    expect(mockRemoveItem).toHaveBeenCalledWith(KEY);
+    expect(result).toBeUndefined();
+});
+
 describe('setItem', () => {
     test('it puts the item in storage with the correct values', () => {
         // Call the function.

packages/peregrine/lib/util/simplePersistence.js

@@ -42,11 +42,17 @@ export default class BrowserPersistence {
         return this.storage.getItem(name);
     }
     getItem(name) {
+        const now = Date.now();
         const item = this.storage.getItem(name);
         if (!item) {
             return undefined;
         }
-        const { value } = JSON.parse(item);
+        const { value, ttl, timeStored } = JSON.parse(item);
+
+        if (ttl && now - timeStored > ttl * 1000) {
+            this.storage.removeItem(name);
+            return undefined;
+        }
 
         return JSON.parse(value);
     }