Reconciled lerna package split

.gitignore

@@ -3,7 +3,7 @@
 .DS_Store
 
 *.log
-docs/coverage.html
+coverage.html
 sqlmap
 
 node_modules

.travis.yml

@@ -20,6 +20,7 @@ services:
 
 before_script:
   - psql -c 'create database "authorization";' -U postgres
+  - lerna bootstrap
 
 script:
   - npm run test:commit-check

CHANGES.md

@@ -1,21 +1,21 @@
 
 ## 3.0.0 - January 22, 2018
 Features, enhancements:
-- Shared policies [commit](https://github.com/nearform/udaru/pull/437)
-- Policy templates [commit](https://github.com/nearform/udaru/pull/435)
-- Multi variable policies [commit](https://github.com/nearform/udaru/pull/441)
-- Create Udaru instance only on demand [commit](https://github.com/nearform/udaru/pull/440)
-- Explicitely add org header for CORS [commit](https://github.com/nearform/udaru/pull/434)
-- Remove core instance dependency at plugin level [commit](https://github.com/nearform/udaru/pull/433)
-- Enhanced configuring, extract DB pool creation [commit](https://github.com/nearform/udaru/pull/427)
-- Endpoint for listing allowed actions on multiple resources [commit](https://github.com/nearform/udaru/pull/418)
-- Updated dependencies
-- Documentation udpates
+-   Shared policies [commit](https://github.com/nearform/udaru/pull/437)
+-   Policy templates [commit](https://github.com/nearform/udaru/pull/435)
+-   Multi variable policies [commit](https://github.com/nearform/udaru/pull/441)
+-   Create Udaru instance only on demand [commit](https://github.com/nearform/udaru/pull/440)
+-   Explicitely add org header for CORS [commit](https://github.com/nearform/udaru/pull/434)
+-   Remove core instance dependency at plugin level [commit](https://github.com/nearform/udaru/pull/433)
+-   Enhanced configuring, extract DB pool creation [commit](https://github.com/nearform/udaru/pull/427)
+-   Endpoint for listing allowed actions on multiple resources [commit](https://github.com/nearform/udaru/pull/418)
+-   Updated dependencies
+-   Documentation udpates
 
 Fixes:
-- **Breaking change: solutions using 2.0 can't migrate DB to 3.0**: Fix migration issue [commit](https://github.com/nearform/udaru/pull/438)
-- Fix not existing user got authorized [commit](https://github.com/nearform/udaru/pull/429)
-- Fix db init script [commit](https://github.com/nearform/udaru/pull/432)
+-   **Breaking change: solutions using 2.0 can't migrate DB to 3.0**: Fix migration issue [commit](https://github.com/nearform/udaru/pull/438)
+-   Fix not existing user got authorized [commit](https://github.com/nearform/udaru/pull/429)
+-   Fix db init script [commit](https://github.com/nearform/udaru/pull/432)
 
 ## 2.0.3 - August 24, 2017
 Fixed Udaru plugin registration [commit](https://github.com/nearform/udaru/commit/c893346c026d6f87873685b70b2e0e63f475978a)

README.md

@@ -5,7 +5,7 @@
 [![snyk][snyk-badge]][snyk-url]
 
 ![Udaru](./docs/logo.jpg)
-Udaru is an Policy Based Access Control (PBAC) authorization module. It supports Organizations, Teams and User entities that are used to build the access model. The policies attached to these entities define the 'Actions' that can be performed by an entity on various 'Resources'.
+Udaru is a Policy Based Access Control (PBAC) authorization module. It supports Organizations, Teams and User entities that are used to build the access model. The policies attached to these entities define the 'Actions' that can be performed by an entity on various 'Resources'.
 
 See the Udaru [website](https://nearform.github.io/udaru/) for complete documentation on Udaru.
 
@@ -33,7 +33,7 @@ npm run start
 ### Hapi plugin
 ```js
 const Hapi = require('hapi')
-const UdaruPlugin = require('udaru/plugin')
+const UdaruPlugin = require('udaru-hapi-plugin')
 
 ...
 
@@ -143,7 +143,7 @@ and then go to [`http://localhost:8080/documentation`][swagger-link]
 The Swagger documentation also gives the ability to execute calls to the API and see their results. If you're using the test database, you can use 'ROOTid' as the required authorization parameter and 'WONKA' as the organisation.
 
 ### ENV variables to set configuration options
-There are three default configuration files, one per "level": [`lib/config/default.core.js`][core-config], [`lib/config/default.plugin.js`][plugin-config] and [`lib/config/default.server.js`][server-config].
+There are three default configuration files, one per "level": [`packages/udaru/config.js`][core-config], [`packages/udaru-hapi-plugin/config.js`][plugin-config] and [`packages/udaru-server/config.js`][server-config].
 
 They are cumulative: when running udaru as a standalone server all the three files will be loaded; when using it as an Hapi plugin, plugin and core will be loaded.
 
@@ -169,7 +169,7 @@ const udaru = buildUdaru(dbPool, {
 **Hapi plugin**
 ```js
 const Hapi = require('hapi')
-const UdaruPlugin = require('udaru/plugin')
+const UdaruPlugin = require('udaru-hapi-plugin')
 const server = new Hapi.server()
 server.register({
   register: UdaruPlugin,
@@ -247,7 +247,7 @@ To run a bench test on a given route:
 npm run bench -- "METHOD swagger/route/template/path"
 ```
 
-To obtain a coverage report:
+To create coverage reports:
 
 ```
 npm run coverage
@@ -277,9 +277,9 @@ See the [sqlmap][] repository for more details.
 
 Copyright nearForm Ltd 2017. Licensed under [MIT][license].
 
-[core-config]: https://github.com/nearform/udaru/blob/master/lib/config/default.core.js
-[plugin-config]: https://github.com/nearform/udaru/blob/master/lib/config/default.plugin.js
-[server-config]: https://github.com/nearform/udaru/blob/master/lib/config/default.server.js
+[core-config]: https://github.com/nearform/udaru/blob/master/packages/udaru/config.js
+[plugin-config]: https://github.com/nearform/udaru/blob/master/packages/udaru-hapi-plugin/config.js
+[server-config]: https://github.com/nearform/udaru/blob/master/packages/udaru-server/config.js
 [license]: ./LICENSE.md
 [postgrator]: https://github.com/rickbergfalk/postgrator
 [prefix-link]: https://github.com/nearform/udaru/blob/master/lib/core/config.js#L100

database/init.js

@@ -3,7 +3,7 @@
 const _ = require('lodash')
 const async = require('async')
 const pg = require('pg')
-const config = require('../lib/config/build-all')()
+const config = require('../packages/udaru/config')()
 
 if (!config.get('local')) {
   console.error('ERROR: You are trying to init the database while not in local environment.')

database/loadTestData.js

@@ -3,7 +3,7 @@
 const path = require('path')
 const pg = require('pg')
 const fs = require('fs')
-const config = require('../lib/config/build-all')()
+const config = require('../packages/udaru/config')()
 
 if (!config.get('local')) {
   console.error('ERROR: You are trying to load test data in the database while not in local environment.')

database/migrate.js

@@ -3,7 +3,7 @@
 const postgrator = require('postgrator')
 const path = require('path')
 const minimist = require('minimist')
-const config = require('../lib/config/build-all')()
+const config = require('../packages/udaru/config')()
 
 postgrator.setConfig({
   migrationDirectory: path.join(__dirname, '/migrations'),

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   database:
-    build: ./database
+    image: postgres:10
     ports:
       - 5432:5432
     volumes_from:
@@ -17,4 +17,4 @@ services:
     command: "true"
 volumes:
   psqlvolumes:
-    driver: local
+    driver: local

docs/contributing.md

@@ -4,7 +4,7 @@ Udaru is open source (MIT License) sponsored by [nearForm](https://www.nearform.
 
 Please see the [README](<https://github.com/nearform/udaru>) for how to get started, running Udaru, testing Udaru, etc. Use [GitHub](<https://github.com/nearform/udaru/issues>) for any bugs, issues, or feature requests.
 
-For general documentation, see the [Udaru Website](<https://nearform.github.io/udaru/>). If you have any feedback on Udaru, [please get in touch](<https://github.com/nearform/udaru/issues>). 
+For general documentation, see the [Udaru Website](<https://nearform.github.io/udaru/>). If you have any feedback on Udaru, [please get in touch](<https://github.com/nearform/udaru/issues>).
 
 ## Core committers - how to release
 
@@ -14,25 +14,23 @@ We are currently supporting node 6.
 
 1.  Review github issues, triage, close and merge issues related to the release.
 2.  Update the CHANGES.md file.
-3.  Navigate to the [Test Rig][Test] and ensure all test are passing.
+3.  Navigate to the [Test Rig][Test] and ensure all tests are passing.
 4.  Pull down the repository locally on the master branch.
 5.  Ensure there are no outstanding commits and the branch is clean.
-6.  Run `npm install` and ensure all dependencies correctly install.
-7.  Run `npm outdated` to and review all dependencies.
-8.  Run `npm update` to get all non breaking updates. We have a policy of using '^' for all dependencies in the package.json and using npm shrinkwrap for each release.
-9.  Run `npm outdated` again to review possible breaking and major revision updates.
-10. Create a github issue for any major update were appropriate.
-11. Run `npm run test` and ensure testing and linting passes.
+6.  Run `npm install` and verify that root level and package dependencies correctly install.
+7.  Run `npm run outdated:all` and review all dependencies.
+8.  Run `npm run update:all` to get all non breaking updates. We have a policy of using '^' for all dependencies in the package.json and using npm shrinkwrap for each release.
+9.  Run `npm run outdated:all` again to review possible breaking and major revision updates.
+10. Create a github issue for any major update where appropriate.
+11. Run `npm test` and ensure testing and linting passes.
 12. Run `npm shrinkwrap`.
 13. Run `npm run swagger-gen` to regenerate the Swagger documentation for the Udaru [documentation site][docs-site].
 14. Run `git add` and `git commit` to commit any version and documentation changes if there are any.
-15. Run `npm version x.x.x -m "version x.x.x"` where `x.x.x` is the version.
-16. Run `git push upstream master --tags`
-17. Run `npm publish`
-18. Go to the [Github release page][Releases] and hit 'Draft a new release'.
-19. Paste the Changelog content for this release and add additional release notes.
-20. Choose the tag version and a title matching the release and publish.
-21. Notify core maintainers of the release via email.
+15. Run `lerna publish` and choose the approriate version change type.  This will update each  package.json of modified packages as appropriate, create a new git commit and tag, and publish updated packages to npm.
+16. Go to the [Github release page][Releases] and hit 'Draft a new release'.
+17. Paste the Changelog content for this release and add additional release notes.
+18. Choose the tag version and a title matching the release and publish.
+19. Notify core maintainers of the release via email.
 
 [Test]: https://travis-ci.org/nearform/udaru
 [Releases]: https://github.com/nearform/udaru/releases

docs/swagger/oauth2-redirect.html

@@ -11,7 +11,11 @@
         var redirectUrl = oauth2.redirectUrl;
         var isValid, qp, arr;
 
-        qp = (window.location.hash || location.search).substring(1);
+        if (/code|token|error/.test(window.location.hash)) {
+            qp = window.location.hash.substring(1);
+        } else {
+            qp = location.search.substring(1);
+        }
 
         arr = qp.split("&")
         arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
@@ -23,7 +27,10 @@
 
         isValid = qp.state === sentState
 
-        if (oauth2.auth.schema.get("flow") === "accessCode" && !oauth2.auth.code) {
+        if ((
+          oauth2.auth.schema.get("flow") === "accessCode"||
+          oauth2.auth.schema.get("flow") === "authorizationCode"
+        ) && !oauth2.auth.code) {
             if (!isValid) {
                 oauth2.errCb({
                     authId: oauth2.auth.name,