Add db configs to speed up integration tests

Author: dmitrizagidulin

lib/models/oidc-manager.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const url = require('url')
+const path = require('path')
 const debug = require('./../debug').authentication
 
 const OidcManager = require('oidc-auth-manager')
@@ -34,7 +35,7 @@ function fromServerConfig (argv) {
   let options = {
     debug,
     providerUri,
-    dbPath: argv.dbPath || './db/oidc',
+    dbPath: path.join(argv.dbPath, 'oidc') || './db/oidc',
     authCallbackUri,
     postLogoutUri,
     saltRounds: argv.saltRounds,

test/integration/account-creation-oidc.js

@@ -8,13 +8,12 @@ const path = require('path')
 const fs = require('fs-extra')
 
 describe('AccountManager (OIDC account creation tests)', function () {
-  this.timeout(10000)
   process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 
   var serverUri = 'https://localhost:3457'
   var host = 'localhost:3457'
   var ldpHttpsServer
-  let dbPath = path.join(__dirname, '../resources/.db')
+  let dbPath = path.join(__dirname, '../resources/accounts/db')
 
   var ldp = ldnode.createServer({
     root: path.join(__dirname, '../resources/accounts/'),
@@ -34,7 +33,7 @@ describe('AccountManager (OIDC account creation tests)', function () {
 
   after(function () {
     if (ldpHttpsServer) ldpHttpsServer.close()
-    fs.removeSync(dbPath)
+    fs.removeSync(path.join(dbPath, 'oidc/users/users'))
   })
 
   var server = supertest(serverUri)

test/integration/authentication-oidc.js

@@ -17,14 +17,14 @@ describe('Authentication API (OIDC)', () => {
   let aliceWebId = 'https://localhost:7000/profile/card#me'
   let configPath = path.join(__dirname, '../../config')
   let aliceDbPath = path.join(__dirname,
-    '../resources/accounts-scenario/alice/db/oidc')
-  let userStorePath = path.join(aliceDbPath, 'users')
+    '../resources/accounts-scenario/alice/db')
+  let userStorePath = path.join(aliceDbPath, 'oidc/users')
   let aliceUserStore = UserStore.from({ path: userStorePath, saltRounds: 1 })
   aliceUserStore.initCollections()
 
   let bobServerUri = 'https://localhost:7001'
   let bobDbPath = path.join(__dirname,
-    '../resources/accounts-scenario/bob/db/oidc')
+    '../resources/accounts-scenario/bob/db')
 
   const serverConfig = {
     sslKey: path.join(__dirname, '../keys/key.pem'),
@@ -71,6 +71,7 @@ describe('Authentication API (OIDC)', () => {
   after(() => {
     if (aliceServer) aliceServer.close()
     if (bobServer) bobServer.close()
+    fs.removeSync(path.join(aliceDbPath, 'oidc/users'))
   })
 
   describe('Provider Discovery (POST /api/auth/select-provider)', () => {
@@ -128,7 +129,7 @@ describe('Authentication API (OIDC)', () => {
     })
 
     afterEach(() => {
-      fs.removeSync(path.join(aliceDbPath, 'users/*'))
+      fs.removeSync(path.join(aliceDbPath, 'users/users'))
     })
 
     it('should login and be redirected to /authorize', (done) => {

test/integration/capability-discovery.js

@@ -5,24 +5,44 @@ const expect = require('chai').expect
 // In this test we always assume that we are Alice
 
 describe('API', () => {
-  let aliceServer
-  let alice
-  let serverUri = 'https://localhost:5000'
+  let alice, aliceServer
 
-  const alicePod = Solid.createServer({
-    root: path.join(__dirname, '../resources/accounts-scenario/alice'),
+  let aliceServerUri = 'https://localhost:5000'
+  let configPath = path.join(__dirname, '../../config')
+  let aliceDbPath = path.join(__dirname,
+    '../resources/accounts-scenario/alice/db')
+
+  const serverConfig = {
     sslKey: path.join(__dirname, '../keys/key.pem'),
     sslCert: path.join(__dirname, '../keys/cert.pem'),
     auth: 'oidc',
-    serverUri,
     dataBrowser: false,
     fileBrowser: false,
-    webid: true
-  })
+    webid: true,
+    idp: false,
+    configPath
+  }
+
+  const alicePod = Solid.createServer(
+    Object.assign({
+      root: path.join(__dirname, '../resources/accounts-scenario/alice'),
+      serverUri: aliceServerUri,
+      dbPath: aliceDbPath
+    }, serverConfig)
+  )
 
-  before((done) => {
-    aliceServer = alicePod.listen(5000, done)
-    alice = supertest(serverUri)
+  function startServer (pod, port) {
+    return new Promise((resolve) => {
+      pod.listen(port, () => { resolve() })
+    })
+  }
+
+  before(() => {
+    return Promise.all([
+      startServer(alicePod, 5000)
+    ]).then(() => {
+      alice = supertest(aliceServerUri)
+    })
   })
 
   after(() => {

test/resources/accounts-scenario/alice/db/oidc/op/clients/_key_2d7c299a1aa8e8cadb6a0bb93b6e7873.json

@@ -0,0 +1 @@
+{"client_id":"2d7c299a1aa8e8cadb6a0bb93b6e7873","client_secret":"b2926a0f21cec49c906b7b7956cc44ce","redirect_uris":["https://localhost:7000/api/oidc/rp/https%3A%2F%2Flocalhost%3A7000"],"response_types":["code","id_token token","code id_token token"],"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"application_type":"web","client_name":"Solid OIDC RP for https://localhost:7000","id_token_signed_response_alg":"RS256","token_endpoint_auth_method":"client_secret_basic","default_max_age":86400,"post_logout_redirect_uris":["https://localhost:7000/goodbye"],"frontchannel_logout_session_required":false}

test/resources/accounts-scenario/alice/db/oidc/op/clients/_key_370f34992ebf2d00bc6b4a2bd3dd77fd.json

@@ -0,0 +1 @@
+{"client_id":"370f34992ebf2d00bc6b4a2bd3dd77fd","client_secret":"1fbd9aa5561f242e7f9b1f95910a722d","redirect_uris":["https://localhost:7001/api/oidc/rp/https%3A%2F%2Flocalhost%3A7000"],"response_types":["code","id_token token","code id_token token"],"grant_types":["authorization_code","implicit","refresh_token","client_credentials"],"application_type":"web","client_name":"Solid OIDC RP for https://localhost:7000","id_token_signed_response_alg":"RS256","token_endpoint_auth_method":"client_secret_basic","default_max_age":86400,"post_logout_redirect_uris":["https://localhost:7001/goodbye"],"frontchannel_logout_session_required":false}