[CORL-1148] Chrome Local Storage Issues (#2994)

* fix: moved storage access inside try/catch

* chore: version bump

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "6.2.0",
+  "version": "6.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -31137,7 +31137,7 @@
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "6.2.0",
+  "version": "6.2.2",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

src/core/client/admin/local/__snapshots__/initLocalState.spec.ts.snap

@@ -5,6 +5,7 @@ exports[`get access token from url 1`] = `
   \\"__id\\": \\"client:root.local\\",
   \\"__typename\\": \\"Local\\",
   \\"accessToken\\": \\"eyJraWQiOiI5NmM4MDY2YS1kOTg3LTQyODItODNmOS1kYTUxNjc5N2Y5ZmMiLCJhbGciOiJIUzI1NiJ9.eyJqdGkiOiIzMWIyNjU5MS00ZTlhLTQzODgtYTdmZi1lMWJkYzVkOTdjY2UifQ==.\\",
+  \\"accessTokenExp\\": null,
   \\"accessTokenJTI\\": \\"31b26591-4e9a-4388-a7ff-e1bdc5d97cce\\",
   \\"redirectPath\\": null,
   \\"authView\\": \\"SIGN_IN\\",
@@ -24,6 +25,9 @@ exports[`init local state 1`] = `
   \\"client:root.local\\": {
     \\"__id\\": \\"client:root.local\\",
     \\"__typename\\": \\"Local\\",
+    \\"accessToken\\": null,
+    \\"accessTokenExp\\": null,
+    \\"accessTokenJTI\\": null,
     \\"redirectPath\\": null,
     \\"authView\\": \\"SIGN_IN\\",
     \\"authError\\": null

src/core/client/auth/local/__snapshots__/initLocalState.spec.ts.snap

@@ -5,6 +5,7 @@ exports[`get access token from url 1`] = `
   \\"__id\\": \\"client:root.local\\",
   \\"__typename\\": \\"Local\\",
   \\"accessToken\\": \\"eyJraWQiOiI5NmM4MDY2YS1kOTg3LTQyODItODNmOS1kYTUxNjc5N2Y5ZmMiLCJhbGciOiJIUzI1NiJ9.eyJqdGkiOiIzMWIyNjU5MS00ZTlhLTQzODgtYTdmZi1lMWJkYzVkOTdjY2UifQ==.\\",
+  \\"accessTokenExp\\": null,
   \\"accessTokenJTI\\": \\"31b26591-4e9a-4388-a7ff-e1bdc5d97cce\\",
   \\"view\\": \\"SIGN_IN\\",
   \\"error\\": null
@@ -23,6 +24,9 @@ exports[`init local state 1`] = `
   \\"client:root.local\\": {
     \\"__id\\": \\"client:root.local\\",
     \\"__typename\\": \\"Local\\",
+    \\"accessToken\\": null,
+    \\"accessTokenExp\\": null,
+    \\"accessTokenJTI\\": null,
     \\"view\\": \\"SIGN_IN\\",
     \\"error\\": null
   }

src/core/client/framework/lib/auth/auth.ts

@@ -5,11 +5,6 @@ import { Claims, computeExpiresIn, parseAccessTokenClaims } from "./helpers";
  */
 const ACCESS_TOKEN_KEY = "coral:v1:accessToken";
 
-/**
- * storage is the Storage used to retrieve/update/delete access tokens on.
- */
-const storage = localStorage;
-
 export interface AuthState {
   /**
    * accessToken is the access token issued by the server.
@@ -46,7 +41,7 @@ function parseAccessToken(accessToken: string) {
 export function retrieveAccessToken() {
   try {
     // Get the access token from storage.
-    const accessToken = storage.getItem(ACCESS_TOKEN_KEY);
+    const accessToken = localStorage.getItem(ACCESS_TOKEN_KEY);
     if (!accessToken) {
       // Looks like the access token wasn't in storage.
       return;
@@ -66,7 +61,7 @@ export function retrieveAccessToken() {
 export function storeAccessToken(accessToken: string) {
   try {
     // Update the access token in storage.
-    storage.setItem(ACCESS_TOKEN_KEY, accessToken);
+    localStorage.setItem(ACCESS_TOKEN_KEY, accessToken);
   } catch (err) {
     // TODO: (wyattjoh) add error reporting around this error
     // eslint-disable-next-line no-console
@@ -79,7 +74,7 @@ export function storeAccessToken(accessToken: string) {
 
 export function deleteAccessToken() {
   try {
-    storage.removeItem(ACCESS_TOKEN_KEY);
+    localStorage.removeItem(ACCESS_TOKEN_KEY);
   } catch (err) {
     // TODO: (wyattjoh) add error reporting around this error
     // eslint-disable-next-line no-console

src/core/client/framework/lib/relay/localState.ts

@@ -38,10 +38,10 @@ export function initLocalBaseState(
     root.setLinkedRecord(local, "local");
 
     // Update the access token properties.
-    local.setValue(auth?.accessToken, "accessToken");
+    local.setValue(auth?.accessToken || null, "accessToken");
 
     // Update the claims.
-    local.setValue(auth?.claims.exp, "accessTokenExp");
-    local.setValue(auth?.claims.jti, "accessTokenJTI");
+    local.setValue(auth?.claims.exp || null, "accessTokenExp");
+    local.setValue(auth?.claims.jti || null, "accessTokenJTI");
   });
 }

src/core/client/stream/local/__snapshots__/initLocalState.spec.ts.snap

@@ -12,6 +12,9 @@ exports[`init local state 1`] = `
   \\"client:root.local\\": {
     \\"__id\\": \\"client:root.local\\",
     \\"__typename\\": \\"Local\\",
+    \\"accessToken\\": null,
+    \\"accessTokenExp\\": null,
+    \\"accessTokenJTI\\": null,
     \\"commentsOrderBy\\": \\"CREATED_AT_DESC\\",
     \\"authPopup\\": {
       \\"__ref\\": \\"client:root.local.authPopup\\"