diff --git a/core/auth.js b/core/auth.js index befd13a2..489810b9 100644 --- a/core/auth.js +++ b/core/auth.js @@ -54,30 +54,8 @@ function makeJwt(payload) { id = ssb.createIdentity(':auth'); } - const final_payload = b64url( - base64Encode( - JSON.stringify( - Object.assign({}, payload, {exp: (new Date().valueOf()) + kRefreshInterval} - ) - ) - ) - ); - - const jwt = [ - b64url( - base64Encode( - JSON.stringify({ - alg: 'HS256', - typ: 'JWT' - }) - ) - ), - final_payload, - b64url( - ssb.hmacsha256sign(final_payload, ':auth', id) - ) - ].join('.'); - + let final_payload = b64url(base64Encode(JSON.stringify(Object.assign({}, payload, {exp: (new Date().valueOf()) + kRefreshInterval})))); + let jwt = [b64url(base64Encode(JSON.stringify({alg: 'HS256', typ: 'JWT'}))), final_payload, b64url(ssb.hmacsha256sign(final_payload, ':auth', id))].join('.'); return jwt; } @@ -141,9 +119,7 @@ function hashPassword(password) { * @returns TODOC */ function noAdministrator() { - return !core.globalSettings || - !core.globalSettings.permissions || - !Object.keys(core.globalSettings.permissions).some(function(name) { + return !core.globalSettings || !core.globalSettings.permissions || !Object.keys(core.globalSettings.permissions).some(function(name) { return core.globalSettings.permissions[name].indexOf("administration") != -1; }); } @@ -207,7 +183,6 @@ function isNameValid(name) { function handler(request, response) { // TODO(tasiaiso): split this function let session = getCookies(request.headers).session; - if (request.uri == "/login") { let formData = form.decodeForm(request.query); if (query(request.headers)?.permissions?.authenticated) {