From 301c88f2ea9dd0b430e982f11adcf6fd29d74096 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 1 Feb 2020 16:55:09 +0100 Subject: [PATCH] fix(storage-manager): post salt and timestamp only when fetching key --- frontend/src/lib/storage-manager/storage-manager.js | 8 +++++--- frontend/src/utils/exam-correct/exam-correct.js | 1 + frontend/src/utils/exam-correct/exam-correct.sass | 6 ++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js index ed8ad7511..d93b6efd2 100644 --- a/frontend/src/lib/storage-manager/storage-manager.js +++ b/frontend/src/lib/storage-manager/storage-manager.js @@ -320,10 +320,12 @@ export class StorageManager { if (!(options && options.location && options.encryption)) throw new Error('Storage Manager cannot request storage key with unsupported options!'); + const enc = this.load('encryption', { ...options, encryption: false }); const requestBody = { - type : options.encryption, - length : 42, - ...this.load('encryption', { ...options, encryption: false }), + type : options.encryption, + length : 42, + salt : enc.salt, + timestamp : enc.timestamp, }; this._global.App.httpClient.post({ diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js index d802fd60a..d231dc79d 100644 --- a/frontend/src/utils/exam-correct/exam-correct.js +++ b/frontend/src/utils/exam-correct/exam-correct.js @@ -433,6 +433,7 @@ export class ExamCorrect { const cells = new Map(); const dateCell = document.createElement('TD'); + dateCell.classList.add('uw-exam-correct--date-cell'); const date = moment(rowInfo.date); dateCell.appendChild(document.createTextNode(date.format(this._dateFormat))); dateCell.setAttribute('date', date.utc().format()); diff --git a/frontend/src/utils/exam-correct/exam-correct.sass b/frontend/src/utils/exam-correct/exam-correct.sass index d807ee0fc..ab6ca571a 100644 --- a/frontend/src/utils/exam-correct/exam-correct.sass +++ b/frontend/src/utils/exam-correct/exam-correct.sass @@ -3,6 +3,11 @@ $exam-correct--input-status-margin: 10px table[uw-exam-correct] table-layout: fixed + td.uw-exam-correct--date-cell + text-align: right + td.uw-exam-correct--part-cell + text-align: right + th.uw-exam-correct--user-cell, td.uw-exam-correct--user-cell min-width: 200px th.uw-exam-correct--part-cell, td.uw-exam-correct--part-cell @@ -11,6 +16,7 @@ table[uw-exam-correct] width: 70px padding: 4px 8px + [uw-exam-correct] input:invalid:not(.no-value) border: 2px solid var(--color-error)