Merge branch 'develop' into remove-schema-from-source

This commit is contained in:
Clément Michaud 2017-10-15 22:31:06 +02:00 committed by GitHub
commit b6aca2619b
2 changed files with 9 additions and 5 deletions

View File

@ -2,12 +2,16 @@ import Express = require("express");
import Endpoints = require("../../../../../shared/api");
import FirstFactorBlocker from "../FirstFactorBlocker";
import BluebirdPromise = require("bluebird");
import AuthenticationSession = require("../../AuthenticationSession");
export default FirstFactorBlocker(handler);
function handler(req: Express.Request, res: Express.Response): BluebirdPromise<void> {
return AuthenticationSession.get(req)
.then(function (authSession) {
res.render("already-logged-in", {
logout_endpoint: Endpoints.LOGOUT_GET
logout_endpoint: Endpoints.LOGOUT_GET,
username: authSession.userid
});
});
return BluebirdPromise.resolve();
}

View File

@ -5,5 +5,5 @@ block form-header
<img class="header-img" src="/img/success.png" alt="">
block content
<p>You are already logged in.<br/>
<p>You are already logged in as <b>#{ username }</b>.<br/>
| Click <a href="#{ logout_endpoint }">here</a> to log off.<p>