RPJosh
/
authelia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into bootstrap_loading_spinner

pull/246/head
Clément Michaud 2018-07-25 21:31:11 +02:00 committed by GitHub
parent a1233e5437 5208c287be
commit a8dbf27faf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/lib/authentication/totp/TotpHandler.ts
View File

@ -15,7 +15,7 @@ export class TotpHandler implements ITotpHandler {
generate(label: string, issuer: string): TOTPSecret { generate(label: string, issuer: string): TOTPSecret {
const secret = this.speakeasy.generateSecret({ const secret = this.speakeasy.generateSecret({
otpauth_url: false otpauth_url: false
}); }) as TOTPSecret;
secret.otpauth_url = this.speakeasy.otpauthURL({ secret.otpauth_url = this.speakeasy.otpauthURL({
secret: secret.ascii, secret: secret.ascii,
@ -33,4 +33,4 @@ export class TotpHandler implements ITotpHandler {
window: WINDOW window: WINDOW
}); });
} }
} }

3
server/src/lib/routes/firstfactor/get.ts
View File

@ -1,7 +1,6 @@
import express = require("express"); import express = require("express");
import objectPath = require("object-path"); import objectPath = require("object-path");
import winston = require("winston");
import Endpoints = require("../../../../../shared/api"); import Endpoints = require("../../../../../shared/api");
import BluebirdPromise = require("bluebird"); import BluebirdPromise = require("bluebird");
import { AuthenticationSessionHandler } from "../../AuthenticationSessionHandler"; import { AuthenticationSessionHandler } from "../../AuthenticationSessionHandler";
@ -56,4 +55,4 @@ export default function (vars: ServerVariables) {
resolve(); resolve();
}); });
}; };
} }

3
server/src/lib/routes/secondfactor/redirect.ts
View File

@ -1,7 +1,6 @@
import express = require("express"); import express = require("express");
import objectPath = require("object-path"); import objectPath = require("object-path");
import winston = require("winston");
import Endpoints = require("../../../../../shared/api"); import Endpoints = require("../../../../../shared/api");
import { ServerVariables } from "../../ServerVariables"; import { ServerVariables } from "../../ServerVariables";
import BluebirdPromise = require("bluebird"); import BluebirdPromise = require("bluebird");
@ -28,4 +27,4 @@ export default function (vars: ServerVariables) {
.catch(ErrorReplies.replyWithError200(req, res, vars.logger, .catch(ErrorReplies.replyWithError200(req, res, vars.logger,
UserMessages.OPERATION_FAILED)); UserMessages.OPERATION_FAILED));
}; };
} }

7
server/test/storage/mongo/MongoCollection.test.ts
View File

@ -6,7 +6,7 @@ import { MongoClientStub } from "../../mocks/connectors/mongo/MongoClientStub";
import { MongoCollection } from "../../../src/lib/storage/mongo/MongoCollection"; import { MongoCollection } from "../../../src/lib/storage/mongo/MongoCollection";
describe("MongoCollection", function () { describe("MongoCollection", function () {
let mongoCollectionStub: MongoDB.Collection<any>; let mongoCollectionStub: any;
let findStub: Sinon.SinonStub; let findStub: Sinon.SinonStub;
let findOneStub: Sinon.SinonStub; let findOneStub: Sinon.SinonStub;
let insertStub: Sinon.SinonStub; let insertStub: Sinon.SinonStub;
@ -15,8 +15,7 @@ describe("MongoCollection", function () {
let countStub: Sinon.SinonStub; let countStub: Sinon.SinonStub;
before(function () { before(function () {
const Collection = require("mongodb").Collection; mongoCollectionStub = Sinon.createStubInstance(require("mongodb").Collection as any);
mongoCollectionStub = Sinon.createStubInstance(Collection);
findStub = mongoCollectionStub.find as Sinon.SinonStub; findStub = mongoCollectionStub.find as Sinon.SinonStub;
findOneStub = mongoCollectionStub.findOne as Sinon.SinonStub; findOneStub = mongoCollectionStub.findOne as Sinon.SinonStub;
insertStub = mongoCollectionStub.insert as Sinon.SinonStub; insertStub = mongoCollectionStub.insert as Sinon.SinonStub;
@ -102,4 +101,4 @@ describe("MongoCollection", function () {
}); });
}); });
}); });
}); });

2
test/features/step_definitions/authentication.ts
View File

@ -64,7 +64,7 @@ When("I visit {string} and get redirected {string}",
const that = this; const that = this;
return this.driver.get(url) return this.driver.get(url)
.then(function () { .then(function () {
return that.driver.wait(seleniumWebdriver.until.urlIs(redirectUrl), 2000); return that.driver.wait(seleniumWebdriver.until.urlIs(redirectUrl), 6000);
}); });
}); });

4
test/features/step_definitions/hooks.ts
View File

@ -60,14 +60,14 @@ function declareNeedsConfiguration(tag: string, cb: () => BluebirdPromise<void>)
.then(function () { .then(function () {
return exec("./scripts/example-commit/dc-example.sh -f " + return exec("./scripts/example-commit/dc-example.sh -f " +
"./example/compose/authelia/docker-compose.test.yml up -d authelia &&" + "./example/compose/authelia/docker-compose.test.yml up -d authelia &&" +
" sleep 1"); " sleep 3");
}) })
}); });
After({ tags: "@needs-" + tag + "-config", timeout: 20 * 1000 }, function () { After({ tags: "@needs-" + tag + "-config", timeout: 20 * 1000 }, function () {
return exec("rm config.test.yml") return exec("rm config.test.yml")
.then(function () { .then(function () {
return exec("./scripts/example-commit/dc-example.sh up -d authelia && sleep 1"); return exec("./scripts/example-commit/dc-example.sh up -d authelia && sleep 3");
}); });
}); });
} }

2
test/features/step_definitions/resilience.ts
View File

@ -6,5 +6,5 @@ import BluebirdPromise = require("bluebird");
When(/^the application restarts$/, {timeout: 15 * 1000}, function () { When(/^the application restarts$/, {timeout: 15 * 1000}, function () {
const exec = BluebirdPromise.promisify(ChildProcess.exec); const exec = BluebirdPromise.promisify(ChildProcess.exec);
return exec("./scripts/example-commit/dc-example.sh restart authelia && sleep 1"); return exec("./scripts/example-commit/dc-example.sh restart authelia && sleep 3");
}); });