Implement currentUser() and tests

Author: dmitrizagidulin

demo/index.html

@@ -62,15 +62,37 @@ <h5>App body</h5>
   //  (equivalent to jQuery's $(document).ready())
   // Trigger a login() check on page load, in case user is logged in already
   document.addEventListener('DOMContentLoaded', function () {
-    SolidClient.auth.login()
-      .then(function (webId, accessToken) {
-        loginSuccess(webId, accessToken)
+    window.addEventListener('message', onMessage)
+    init()
+    SolidClient.auth.currentUser()
+      .then(function (webId) {
+        loginSuccess(webId)
+      })
+  })
+
+  function onMessage (event) {
+    console.log('Auth client received event: ', event)
+    if (!event || !event.data) { return }
+    switch (event.data.event_type) {
+      case 'providerSelected':
+        console.log('Provider selected: ', event.data.value)
+        loginTo(event.data.value)
+        break
+      default:
+        console.error('onMessage - unknown event type: ', event)
+        break
+    }
+  }
+
+  function loginTo (providerUri) {
+    SolidClient.auth.login(providerUri)
+      .then(function (webId) {
+        loginSuccess(webId)
       })
       .catch(function (error) {
         console.error('Error logging in:', error)
       })
-    init()
-  })
+  }
 
   function init () {
     initButton('getRootAcl', getRootAcl)

src/index.js

@@ -42,8 +42,8 @@ class ClientAuthOIDC {
    * @param [options.localStorage=localStorage] Optionally inject localStorage
    */
   constructor (options = {}) {
-    this.window = options.window || window
-    this.localStorage = options.localStorage || localStorage
+    this.window = options.window || global.window
+    this.localStorage = options.localStorage || global.localStorage
     this.currentClient = null
     this.providerUri = null
     this.webId = null
@@ -65,6 +65,19 @@ class ClientAuthOIDC {
     return window.location.href
   }
 
+  currentUser () {
+    if (this.webId) {
+      return Promise.resolve(this.webId)
+    }
+    // Attempt to find a provider based on the 'state' param of the current URI
+    let providerUri = this.providerFromCurrentUri()
+    if (providerUri) {
+      return this.login(providerUri)
+    } else {
+      return Promise.resolve(null)
+    }
+  }
+
   /**
    * Extracts and returns the `state` query or hash fragment param from a uri
    * @param uri {string}
@@ -102,11 +115,14 @@ class ClientAuthOIDC {
    * @return {Promise<RelyingParty>}
    */
   loadOrRegisterClient (providerUri) {
+    this.currentClient = null
     return this.loadClient(providerUri)
       .then(loadedClient => {
         if (loadedClient) {
+          this.currentClient = loadedClient
           return loadedClient
         } else {
+          this.currentClient = null
           return this.registerClient(providerUri)
         }
       })
@@ -159,6 +175,7 @@ class ClientAuthOIDC {
    * @return {Promise<string>} Resolves to the logged in user's WebID URI
    */
   login (providerUri) {
+    this.clearCurrentUser()
     let selectProvider = this.selectProvider.bind(this)
     let loadOrRegisterClient = this.loadOrRegisterClient.bind(this)
     let validateOrSendAuthRequest = this.validateOrSendAuthRequest.bind(this)
@@ -169,6 +186,12 @@ class ClientAuthOIDC {
       .then(validateOrSendAuthRequest)
   }
 
+  clearCurrentUser () {
+    this.webId = null
+    this.accessToken = null
+    this.idToken = null
+  }
+
   /**
    * Resolves to the URI of an OIDC identity provider, from one of the following:
    *
@@ -313,6 +336,7 @@ class ClientAuthOIDC {
    */
   extractAndValidateWebId (idToken) {
     let webId = idToken.payload.sub
+    this.webId = webId
     return webId
   }
 

test/unit/auth-test.js

@@ -337,6 +337,52 @@ describe('SolidAuthOIDC', () => {
           expect(auth.window.location).to.equal(authUri)
           done()
         })
+        .catch(err => { console.error(err.message) })
+    })
+  })
+
+  describe('currentUser()', () => {
+    it('should return cached webId if present', done => {
+      let aliceWebId = 'https://alice.example.com'
+      let auth = new SolidAuthOIDC()
+      auth.webId = aliceWebId
+
+      auth.currentUser()
+        .then(webId => {
+          expect(webId).to.equal(aliceWebId)
+          done()
+        })
+        .catch(err => { console.error(err.message) })
+    })
+
+    it('should return null if no cached webId and no current state param', done => {
+      let auth = new SolidAuthOIDC({ window: { location: {} } })
+      auth.currentUser()
+        .then(webId => {
+          expect(webId).to.not.exist
+          done()
+        })
+        .catch(err => { console.error(err.message) })
+    })
+
+    it('should automatically login if current uri has state param', done => {
+      let state = 'abcd'
+      let providerUri = 'https://provider.example.com'
+      let auth = new SolidAuthOIDC({ window: { location: {} } })
+      auth.saveProviderByState(state, providerUri)
+
+      auth.window.location.href = `https://client-app.example.com#state=${state}`
+      let aliceWebId = 'https://alice.example.com/'
+      let loginStub = sinon.stub().returns(Promise.resolve(aliceWebId))
+      auth.login = loginStub
+
+      auth.currentUser()
+        .then(webId => {
+          expect(webId).to.equal(aliceWebId)
+          expect(loginStub).to.have.been.calledWith(providerUri)
+          done()
+        })
+        .catch(err => { console.error(err.message) })
     })
   })
 })