TlsAuthenticator - minor refactor/cleanup

Author: dmitrizagidulin

lib/models/account-manager.js

@@ -350,11 +350,11 @@ class AccountManager {
         this.accountWebIdFor(userData.username)
     }
 
-    if (!userConfig.webId && !userConfig.username) {
-      throw new Error('Username or web id is required')
-    }
+    if (!userConfig.username) {
+      if (!userConfig.webId) {
+        throw new Error('Username or web id is required')
+      }
 
-    if (userConfig.webId && !userConfig.username) {
       userConfig.username = this.usernameFromWebId(userConfig.webId)
     }
 
@@ -393,14 +393,6 @@ class AccountManager {
       })
   }
 
-  externalAccount (webId) {
-    let webIdHostname = url.parse(webId).hostname
-
-    let serverHostname = this.host.hostname
-
-    return !webIdHostname.endsWith(serverHostname)
-  }
-
   /**
    * Generates an expiring one-time-use token for password reset purposes
    * (the user's Web ID is saved in the token service).

lib/models/authenticator.js

@@ -312,7 +312,6 @@ class TlsAuthenticator extends Authenticator {
   ensureLocalUser (webId) {
     const serverUri = this.accountManager.host.serverUri
 
-    // if (this.accountManager.externalAccount(webId)) {
     if (domainMatches(serverUri, webId)) {
       // This is a locally hosted Web ID
       return Promise.resolve(this.accountManager.userAccountFrom({ webId }))
@@ -321,16 +320,15 @@ class TlsAuthenticator extends Authenticator {
     debug(`WebID URI ${JSON.stringify(webId)} is not a local account, verifying preferred provider`)
 
     return this.discoverProviderFor(webId)
-      .then(preferredProvider => {
-        debug(`Preferred provider for ${webId} is ${preferredProvider}`)
+      .then(authorizedProvider => {
+        debug(`Authorized provider for ${webId} is ${authorizedProvider}`)
 
-        if (preferredProvider === serverUri) {  // everything checks out
+        if (authorizedProvider === serverUri) {  // everything checks out
           return this.accountManager.userAccountFrom({ webId, username: webId, externalWebId: true })
         }
 
-        throw new Error(`This server is not the preferred provider for Web ID ${webId}`)
+        throw new Error(`This server is not the authorized provider for Web ID ${webId}`)
       })
-    // return Promise.reject(new Error('Cannot login: Selected Web ID is not hosted on this server'))
   }
 }
 

test/unit/account-manager-test.js

@@ -455,26 +455,4 @@ describe('AccountManager', () => {
         })
     })
   })
-
-  describe('externalAccount()', () => {
-    it('should return true if account is a subdomain of the local server url', () => {
-      let options = { host }
-
-      let accountManager = AccountManager.from(options)
-
-      let webId = 'https://alice.example.com/#me'
-
-      expect(accountManager.externalAccount(webId)).to.be.false()
-    })
-
-    it('should return false if account does not match the local server url', () => {
-      let options = { host }
-
-      let accountManager = AccountManager.from(options)
-
-      let webId = 'https://alice.databox.me/#me'
-
-      expect(accountManager.externalAccount(webId)).to.be.true()
-    })
-  })
 })

test/unit/tls-authenticator-test.js

@@ -134,7 +134,7 @@ describe('TlsAuthenticator', () => {
   })
 
   describe('ensureLocalUser()', () => {
-    it('should throw an error if external user and this server not the preferred provider', done => {
+    it('should throw an error if external user and this server not the authorized provider', done => {
       let tlsAuth = new TlsAuthenticator({ accountManager })
 
       let externalWebId = 'https://alice.someothersite.com#me'
@@ -143,7 +143,7 @@ describe('TlsAuthenticator', () => {
 
       tlsAuth.ensureLocalUser(externalWebId)
         .catch(err => {
-          expect(err.message).to.match(/This server is not the preferred provider for Web ID https:\/\/alice.someothersite.com#me/)
+          expect(err.message).to.match(/This server is not the authorized provider for Web ID https:\/\/alice.someothersite.com#me/)
           done()
         })
     })
@@ -160,7 +160,7 @@ describe('TlsAuthenticator', () => {
         })
     })
 
-    it('should return a user instance if external user and this server is preferred provider', () => {
+    it('should return a user instance if external user and this server is authorized provider', () => {
       let tlsAuth = new TlsAuthenticator({ accountManager })
 
       let externalWebId = 'https://alice.someothersite.com#me'