Merge branch 'master' into feature-dockercompose

.npmignore

@@ -0,0 +1,17 @@
+src/
+test/
+doc/
+scripts/
+images/
+example/
+dist/test/
+
+.travis.yml
+config.test.yml
+Dockerfile
+docker-compose.*
+Gruntfile.js
+tslint.json
+tsconfig.json
+
+*.tgz

.travis.yml

@@ -41,6 +41,7 @@ after_success:
 deploy:
   provider: npm
   email: clement.michaud34@gmail.com
+  skip_cleanup: true
   api_key:
     secure: Hj09zw6uHWWRm9WtVSluy1XdISQGQWC3QElT03EuOfn6Mw/4A4Lj5pkvas+cb5y4aGdhQwaldYtKMMQKQ2ASCHcwHF780fkr+bmUjQr3BwrnJn/HsWrg1Q3jcRfY2GmI+hrDlP0/G534132EKxwDGusNSd6atDsQkkCfWDLuRZxkIqYazpanRBUI2jro65f4xX0X1mRgsBEp0gx+m0rFx/yuCkjoDoSlseEJ/NuyaR5N+JervKdrE6K3TrzJ1trnI5L00dwtgiYqlqyXaV8NMR2AOTr/vQlnnjZvkdTZGcKAFMWv3vjTecfp/Z3RW4saRR4CIJKC4JozE70+WMLqmo11br9q58zSrmKjOfkhf6FXaNHIJc/eQr3+PFzhW9DCVcNfcBh5wTVgTlLEp9845FaBdzjH40K0J4OrSnBhWDW14S7fXurTJafR6Ycxhi17vN2oEsT8XcTg2kcrnplMtt5Ylnkb4kYeVIk9cpeTvYtFjlzWPsxZhtURReY+Inbtt8nYThicqjBHHuDpBmyb0aafTYF5qQLx343KBfwFrDHPZXbglZ8Q97OAS9G0LzxkmYf+pIgW7inGsuB4CW6TPNCTZmVo6O2Ov9S4J/aXRfQSbmZa7e3gHP9pbMPhfw4P0ecpbCzRJzXrQXZcet6oIHMCqLB4qOB8KR4/IHplbaE=
   on:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "authelia",
-  "version": "3.3.2",
+  "version": "3.3.19",
   "description": "2FA Single Sign-On server for nginx using LDAP, TOTP and U2F",
   "bin": {
     "authelia": "./dist/src/server/index.js"

scripts/npm-deployment-test.sh

@@ -10,6 +10,8 @@ npm pack
 AUTHELIA_PACKAGE=`ls | grep "authelia-\([0-9]\+.\)\{2\}[0-9]\+.tgz"`
 echo "--- Authelia package is ${AUTHELIA_PACKAGE}"
 
+tar -tzvf ${AUTHELIA_PACKAGE}
+
 echo "--- Copy package into "${NPM_UNPACK_DIR}" to test unpacking"
 mkdir -p ${NPM_UNPACK_DIR}
 cp ${AUTHELIA_PACKAGE} ${NPM_UNPACK_DIR}

test/features/step_definitions/hooks.ts

@@ -3,6 +3,10 @@ import fs = require("fs");
 import BluebirdPromise = require("bluebird");
 import ChildProcess = require("child_process");
 
+Cucumber.defineSupportCode(function({ setDefaultTimeout }) {
+  setDefaultTimeout(20 * 1000);
+});
+
 Cucumber.defineSupportCode(function({ After, Before }) {
   const exec = BluebirdPromise.promisify(ChildProcess.exec);
 

test/features/step_definitions/redirection.ts

@@ -12,6 +12,6 @@ Cucumber.defineSupportCode(function ({ Given, When, Then }) {
   });
 
   Then("I'm redirected to {stringInDoubleQuotes}", function (link: string) {
-    return this.driver.wait(seleniumWebdriver.until.urlContains(link), 5000);
+    return this.driver.wait(seleniumWebdriver.until.urlContains(link), 15000);
   });
 });