Add tests

Author: dmitrizagidulin

lib/create-app.js

@@ -242,13 +242,13 @@ function initAuthentication (argv, app) {
       let oidc = OidcManager.fromServerConfig(argv)
       app.locals.oidc = oidc
 
+      oidc.initialize()
+
       // Initialize the WebId-OIDC authentication routes/api, including:
       // user-facing Solid endpoints (/login, /logout, /api/auth/select-provider)
       // and OIDC-specific ones
       app.use('/', API.oidc.middleware(oidc))
 
-      oidc.initialize()
-
       // Enforce authentication with WebID-OIDC on all LDP routes
       app.use('/', oidc.rs.authenticate())
       break

lib/models/oidc-manager.js

@@ -2,7 +2,7 @@
 
 const url = require('url')
 const path = require('path')
-const debug = require('./../debug').authentication
+const debug = require('../debug').authentication
 
 const OidcManager = require('oidc-auth-manager')
 
@@ -25,17 +25,15 @@ const OidcManager = require('oidc-auth-manager')
  */
 function fromServerConfig (argv) {
   let providerUri = argv.host.serverUri
-  if (!providerUri) {
-    throw new Error('Host with serverUri required for auth initialization')
-  }
-
   let authCallbackUri = url.resolve(providerUri, '/api/oidc/rp')
   let postLogoutUri = url.resolve(providerUri, '/goodbye')
 
+  let dbPath = path.join(argv.dbPath, 'oidc')
+
   let options = {
     debug,
     providerUri,
-    dbPath: path.join(argv.dbPath, 'oidc') || './db/oidc',
+    dbPath,
     authCallbackUri,
     postLogoutUri,
     saltRounds: argv.saltRounds,

lib/requests/login-request.js

@@ -15,7 +15,7 @@ const UserAccount = require('../models/user-account')
 class LoginByPasswordRequest {
   /**
    * @constructor
-   * @param [options={}] {Object}
+   * @param options {Object}
    *
    * @param [options.username] {string} Unique identifier submitted by user
    *   from the Login form. Can be one of:
@@ -31,7 +31,7 @@ class LoginByPasswordRequest {
    * @param [options.authQueryParams] {Object} Key/value hashmap of parsed query
    *   parameters that will be passed through to the /authorize endpoint.
    */
-  constructor (options = {}) {
+  constructor (options) {
     this.username = options.username
     this.password = options.password
     this.response = options.response
@@ -82,12 +82,12 @@ class LoginByPasswordRequest {
    * Factory method, returns an initialized instance of LoginByPasswordRequest
    * from an incoming http request.
    *
-   * @param [req={}] {IncomingRequest}
-   * @param [res={}] {ServerResponse}
+   * @param req {IncomingRequest}
+   * @param res {ServerResponse}
    *
    * @return {LoginByPasswordRequest}
    */
-  static fromParams (req = {}, res = {}) {
+  static fromParams (req, res) {
     let body = req.body || {}
 
     let userStore, accountManager
@@ -299,9 +299,6 @@ class LoginByPasswordRequest {
     } else if (validUser) {
       // Login request is a user going to /login in browser
       uri = this.accountManager.accountUriFor(validUser.username)
-    } else {
-      let host = this.accountManager.host
-      uri = host.serverUri
     }
 
     return uri
@@ -314,6 +311,7 @@ class LoginByPasswordRequest {
       // Login/register request is part of an app's auth flow
       uri = this.authorizeUrl()
     } else {
+      // User went to /register directly, not part of an auth flow
       let host = this.accountManager.host
       uri = host.serverUri
     }

test/integration/authentication-oidc.js

@@ -122,7 +122,14 @@ describe('Authentication API (OIDC)', () => {
     })
   })
 
-  describe('Login by Username and Password (POST /login)', done => {
+  describe('Login page (GET /login)', () => {
+    it('should load the user login form', () => {
+      return alice.get('/login')
+        .expect(200)
+    })
+  })
+
+  describe('Login by Username and Password (POST /login)', () => {
     // Logging in as alice, to alice's pod
     let aliceAccount = UserAccount.from({ webId: aliceWebId })
     let alicePassword = '12345'
@@ -204,4 +211,11 @@ describe('Authentication API (OIDC)', () => {
 
     it('At /login, enter WebID & password -> redirect back to /foo')
   })
+
+  describe('Post-logout page (GET /goodbye)', () => {
+    it('should load the post-logout page', () => {
+      return alice.get('/goodbye')
+        .expect(200)
+    })
+  })
 })

test/unit/login-by-password-request.js

@@ -454,4 +454,36 @@ describe('LoginByPasswordRequest', () => {
     expect(res.statusCode).to.equal(302)
     expect(res._getRedirectUrl()).to.equal(expectedUri)
   })
+
+  describe('postRegisterUrl', () => {
+    it('should return encoded /authorize url if redirect_uri is present', () => {
+      let res = HttpMocks.createResponse()
+      let authUrl = 'https://localhost/authorize?client_id=123'
+
+      let authQueryParams = {
+        redirect_uri: 'https://app.example.com/callback'
+      }
+
+      let options = { accountManager, authQueryParams, response: res }
+      let request = new LoginByPasswordRequest(options)
+
+      request.authorizeUrl = sinon.stub().returns(authUrl)
+
+      let expectedAuthUrl = encodeURIComponent(authUrl)
+
+      expect(request.postRegisterUrl()).to.equal(expectedAuthUrl)
+    })
+
+    it('should return encoded serverUri if not part of auth workflow', () => {
+      let res = HttpMocks.createResponse()
+
+      let options = { accountManager, response: res }
+      let request = new LoginByPasswordRequest(options)
+
+      let serverUri = 'https://localhost:8443'
+      let encodedServerUri = encodeURIComponent(serverUri)
+
+      expect(request.postRegisterUrl()).to.equal(encodedServerUri)
+    })
+  })
 })

test/unit/oidc-manager.js

@@ -9,6 +9,10 @@ const SolidHost = require('../../lib/models/solid-host')
 
 describe('OidcManager', () => {
   describe('fromServerConfig()', () => {
+    it('should error if no serverUri is provided in argv', () => {
+
+    })
+
     it('should result in an initialized oidc object', () => {
       let serverUri = 'https://localhost:8443'
       let host = SolidHost.from({ serverUri })