Remove local storage. (#4)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspace-client",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "description": "CollectionSpace client for browsers and Node.js",
   "author": "Ray Lee <ray.lee@lyrasis.org>",
   "license": "ECL-2.0",

src/session.js

@@ -1,6 +1,5 @@
 import cspace from 'cspace-api';
 import urljoin from 'url-join';
-import tokenStore from './tokenStore';
 import { parseJwt } from './tokenHelpers';
 
 const defaultSessionConfig = {
@@ -15,17 +14,9 @@ export default function session(sessionConfig) {
     ...sessionConfig,
   };
 
-  const authStore = tokenStore(config.clientId, config.url);
-
   let authRequestPending = null;
   let auth = {};
 
-  if (!config.authCode) {
-    // The auth code for this session wasn't specified. Use the stored auth, if any.
-
-    auth = authStore.fetch() || {};
-  }
-
   const cs = cspace({
     url: urljoin(config.url, 'cspace-services'),
   });
@@ -57,8 +48,6 @@ export default function session(sessionConfig) {
       refreshToken,
     };
 
-    authStore.store(auth);
-
     // We have tokens, so the authoriztion code, code verifier, and client secret can be discarded.
 
     delete config.authCode;
@@ -105,7 +94,6 @@ export default function session(sessionConfig) {
     return serviceLogoutPromise
       .finally(() => {
         auth = {};
-        authStore.clear();
 
         resolve({});
       });

src/tokenHelpers.js

@@ -2,23 +2,6 @@
 
 export const storageKey = 'cspace-client';
 
-export const isLocalStorageAvailable = () => {
-  // Taken from
-  // https://developer.mozilla.org/en-US/docs/Web/API/Web_Storage_API/Using_the_Web_Storage_API
-
-  try {
-    const storage = window.localStorage;
-    const x = '__storage_test__';
-
-    storage.setItem(x, x);
-    storage.removeItem(x);
-
-    return true;
-  } catch (error) {
-    return false;
-  }
-};
-
 const base64Decode = (encoded) => {
   if (typeof window !== 'undefined') {
     // We're in a browser.

test/integration/crud.test.js

@@ -13,6 +13,8 @@ import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import client from '../../src/client';
 
+const { expect } = chai;
+
 chai.use(chaiAsPromised);
 chai.should();
 
@@ -59,6 +61,11 @@ describe.skip(`crud operations on ${clientConfig.url}`, function suite() {
 
   let objectCsid = '';
 
+  it('reports null logged in username before logging in', () => {
+    expect(adminSession.username()).to.equal(null);
+    expect(readerSession.username()).to.equal(null);
+  });
+
   it('cannot list records as admin before logging in', () => (
     adminSession.read('collectionobjects').should.eventually
       .be.rejected
@@ -93,6 +100,11 @@ describe.skip(`crud operations on ${clientConfig.url}`, function suite() {
       })
   ));
 
+  it('reports the logged in username', () => {
+    adminSession.username().should.equal('admin@core.collectionspace.org');
+    readerSession.username().should.equal('reader@core.collectionspace.org');
+  });
+
   it('can create an object record as admin', function test() {
     if (!adminLoggedIn) {
       this.skip();
@@ -333,6 +345,11 @@ describe.skip(`crud operations on ${clientConfig.url}`, function suite() {
       .and.be.an('object')
   ));
 
+  it('reports null logged in username after logging out', () => {
+    expect(adminSession.username()).to.equal(null);
+    expect(readerSession.username()).to.equal(null);
+  });
+
   it('can log out multiple times', () => (
     readerSession.logout().should.eventually
       .be.fulfilled