From 6589e208f891ad18be23bb62cd0ae7045a171a65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 7 Jun 2020 17:29:30 +0000 Subject: [PATCH 1/7] Bump websocket-extensions from 0.1.3 to 0.1.4 Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62fa1c7..c68537c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "assessment-uploader", - "version": "0.1.0", + "version": "0.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -14972,9 +14972,9 @@ } }, "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==" + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" }, "whatwg-fetch": { "version": "3.0.0", From 4b03f80d2f54666c780ed3ba0320e31dded261ab Mon Sep 17 00:00:00 2001 From: Hugh Wells Date: Thu, 25 Jun 2020 16:39:04 +0100 Subject: [PATCH 2/7] Move browserslist to correct file and update versions to align with apply, to work on IE --- .browserslistrc | 2 ++ package.json | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 .browserslistrc diff --git a/.browserslistrc b/.browserslistrc new file mode 100644 index 0000000..3a455dd --- /dev/null +++ b/.browserslistrc @@ -0,0 +1,2 @@ +> 1% +last 2 versions \ No newline at end of file diff --git a/package.json b/package.json index 28f1588..1a07984 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,5 @@ "sass": "^1.26.5", "sass-loader": "^8.0.2", "vue-template-compiler": "^2.6.11" - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ] + } } From 5c3ab5c6c09a835bdbe845bae2b9dc73e2451ee0 Mon Sep 17 00:00:00 2001 From: Hugh Wells Date: Fri, 26 Jun 2020 12:55:00 +0100 Subject: [PATCH 3/7] Update favicon to JAC as opposed to Vue default --- public/favicon.ico | Bin 4286 -> 1150 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index df36fcfb72584e00488330b560ebcf34a41c64c2..a8ef570924dc3f9dbe06c805e7284ab54444e4c6 100644 GIT binary patch literal 1150 zcmbtU%WD&15dQ>kUWy0L9{o!MZ@%!N;z{r>;ziRU^-){IDCFh?!3RY{1#1hfMO*E| zR-!dcQd`o{Hrc$5dF*@hb7qze5)f+LWp=)qZ)d*w{bqKR+Cz6wkD}*6bz!ek2b5BW zNXSJV-%m;@+S|X+7qRI9y4vkFtN*%oo5OKk)XFtjh6UI2U^@<+e-P8QP~0wH;=w5D zKkHyyH;f%itECI>*;gO%`p&SdTe=RzGWA(V1Ose$?AycX@b@cZMny}!nnCB9d`{oHKQbfuU3dte zy@8LzQ?!C#&*ubk>Fo{{=Fi6;LSd^Q=gdW?(fHNCW-^0;qgP;1&65w`3I?u`v6z-W zD*^vQr}~6HPO!F=!e%0a(fd(EZ#_k$-X#4@ax;f+cl}xk*A8Ej^SN)#(e(3o=s$89 znRr?-GY34Y%vpAQ%kL$vIbXF@#hdU;R0uv`5buqU{3 literal 4286 zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56 zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp= zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8 zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3 z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6 z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S From f813af0c45f2a4cdbb20448e736c97336277663f Mon Sep 17 00:00:00 2001 From: Hugh Wells Date: Mon, 29 Jun 2020 14:26:24 +0100 Subject: [PATCH 4/7] Added Sentry SDK --- package-lock.json | 69 ++++++++++++++++++++++++++++++++++++++++++++++- package.json | 2 ++ src/main.js | 11 +++++++- 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 62fa1c7..dfb3b67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "assessment-uploader", - "version": "0.1.0", + "version": "0.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1480,6 +1480,73 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" }, + "@sentry/browser": { + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.18.1.tgz", + "integrity": "sha512-U1w0d5kRMsfzMYwWn4+awDKfBEI5lxhHa0bMChSpj5z/dWiz/e0mikZ9gCoF+ZNqkXJ92l/3r9gRz+SIsn5ZoA==", + "requires": { + "@sentry/core": "5.18.1", + "@sentry/types": "5.18.1", + "@sentry/utils": "5.18.1", + "tslib": "^1.9.3" + } + }, + "@sentry/core": { + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.18.1.tgz", + "integrity": "sha512-nC2aK6gwVIBVysmtdFHxYJyuChIHtkv7TnvmwgA5788L/HWo7E3R+Rd8Tf2npvp/aP+kmNITNbc5CIIqwGPaqQ==", + "requires": { + "@sentry/hub": "5.18.1", + "@sentry/minimal": "5.18.1", + "@sentry/types": "5.18.1", + "@sentry/utils": "5.18.1", + "tslib": "^1.9.3" + } + }, + "@sentry/hub": { + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.18.1.tgz", + "integrity": "sha512-dFnaj1fQRT74EhoF8MXJ23K3svt11zEF6CS3cdMrkSzfRbAHjyza7KT2AJHUeF6gtH2BZzqsSw+FnfAke0HGIg==", + "requires": { + "@sentry/types": "5.18.1", + "@sentry/utils": "5.18.1", + "tslib": "^1.9.3" + } + }, + "@sentry/integrations": { + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.18.1.tgz", + "integrity": "sha512-REvnx8Ajib8bjoSEqCMsEH3UXTPRhNbh6P3E2zp1BS2cJx+nSIMKp6nSaXK0aeJmwJwIC7Ntkxs2xmYJXrYyFA==", + "requires": { + "@sentry/types": "5.18.1", + "@sentry/utils": "5.18.1", + "tslib": "^1.9.3" + } + }, + "@sentry/minimal": { + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.18.1.tgz", + "integrity": "sha512-St2bjcZ5FFiH+bYkWoEPlEb0w38YSvftnjJTvZyk05SCdsF7HkGfoBeFmztwBf1VLQPYt3ojny14L6KDAvOTpw==", + "requires": { + "@sentry/hub": "5.18.1", + "@sentry/types": "5.18.1", + "tslib": "^1.9.3" + } + }, + "@sentry/types": { + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.18.1.tgz", + "integrity": "sha512-y5YTkRFC4Y7r4GHrvin6aZLBpQIGdMZRq78f/s7IIEZrmWYbVKsK4dyJht6pOsUdEaxeYpsu3okIA0bqmthSJA==" + }, + "@sentry/utils": { + "version": "5.18.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.18.1.tgz", + "integrity": "sha512-P4lt6NauCBWASaP6R5kfOmc24imbD32G5FeWqK7vHftIphOJ0X7OZfh93DJPs3e5RIvW3YCywUsa7MpTH5/ClA==", + "requires": { + "@sentry/types": "5.18.1", + "tslib": "^1.9.3" + } + }, "@soda/friendly-errors-webpack-plugin": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz", diff --git a/package.json b/package.json index 28f1588..27c3307 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,8 @@ "dependencies": { "@firebase/app": "^0.6.2", "@firebase/storage": "^0.3.32", + "@sentry/browser": "^5.18.1", + "@sentry/integrations": "^5.18.1", "core-js": "^3.6.5", "firebase": "^7.14.2", "govuk-frontend": "^3.6.0", diff --git a/src/main.js b/src/main.js index 0b0dcc0..3e7e1fd 100644 --- a/src/main.js +++ b/src/main.js @@ -4,8 +4,17 @@ import * as filters from '@/filters'; import router from '@/router'; import store from '@/store'; import { auth } from '@/firebase'; -//import firebase from '@firebase'; +import * as Sentry from '@sentry/browser'; +import * as Integrations from '@sentry/integrations'; +if (process.env.NODE_ENV !== 'development') { + Sentry.init({ + dsn: 'https://23ac92825117451eb421535be7e4c334@o323827.ingest.sentry.io/5301649', + environment: process.env.NODE_ENV, + release: process.env.npm_package_version, + integrations: [new Integrations.Vue({ Vue, attachProps: true })], + }); +} Vue.config.productionTip = false; // Register global filters From afda7d5dc9a19caab7d351a365278a341735a981 Mon Sep 17 00:00:00 2001 From: Hugh Wells Date: Thu, 16 Jul 2020 16:17:54 +0100 Subject: [PATCH 5/7] Change for assesment buttons, and button classes --- src/views/Assessments.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/Assessments.vue b/src/views/Assessments.vue index 1459015..7372a35 100644 --- a/src/views/Assessments.vue +++ b/src/views/Assessments.vue @@ -72,17 +72,17 @@ - Upload + View Incomplete Assessment - Review + Review Completed Assessment From 6ad5728a81e544bb06ee6d3c6600a2218e65b73f Mon Sep 17 00:00:00 2001 From: Warren Searle Date: Fri, 17 Jul 2020 13:01:01 +0100 Subject: [PATCH 6/7] #34 Fix login issues: - Should not redirect to assessments - Ensure session updates correctly when logging in - Fix console error when signing out --- src/main.js | 5 ----- src/store/auth.js | 7 +++++++ src/views/Assessment/Edit.vue | 5 ++++- src/views/SignIn.vue | 2 ++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main.js b/src/main.js index 0b0dcc0..bbed0b6 100644 --- a/src/main.js +++ b/src/main.js @@ -19,11 +19,6 @@ let vueInstance = false; auth().onAuthStateChanged(async (user) => { // Bind Firebase auth state to the vuex auth state store await store.dispatch('auth/setCurrentUser', user); - if (store.getters['auth/isSignedIn']) { - if (window.location.pathname == '/sign-in') { - router.push('/assessments'); - } - } // Create the Vue instance, but only once if (!vueInstance) { vueInstance = new Vue({ diff --git a/src/store/auth.js b/src/store/auth.js index 1020824..51376ee 100644 --- a/src/store/auth.js +++ b/src/store/auth.js @@ -45,6 +45,13 @@ const module = { isSignedIn(state) { return (state.currentUser !== null); }, + currentUserId(state) { + if (state.currentUser !== null) { + return state.currentUser.uid; + } else { + return ''; + } + }, }, }; diff --git a/src/views/Assessment/Edit.vue b/src/views/Assessment/Edit.vue index 20b2d21..986acbd 100644 --- a/src/views/Assessment/Edit.vue +++ b/src/views/Assessment/Edit.vue @@ -117,10 +117,13 @@ export default { fileName() { return this.assessmentId; }, + assessorId() { + return this.$store.getters['auth/currentUserId']; + }, uploadPath() { const exerciseId = this.assessment.exercise.id; const applicationId = this.assessment.application.id; - const assessorId = this.$store.state.auth.currentUser.uid; + const assessorId = this.assessorId; return `/exercise/${exerciseId}/application/${applicationId}/assessor/${assessorId}`; }, }, diff --git a/src/views/SignIn.vue b/src/views/SignIn.vue index 11eb443..7962dd1 100644 --- a/src/views/SignIn.vue +++ b/src/views/SignIn.vue @@ -81,6 +81,8 @@ export default { window.localStorage.setItem('emailForSignIn', email); window.localStorage.setItem('signInDestination', ref + '/upload'); return window.location.replace(response.data.result); + } else { + // console.log('mal-formed request'); } } else if (this.$route.query.return) { // we have 'return' flag set so try to complete sign in From 05768a72f108d2e93f0b0fdbf60ba49faa2343fa Mon Sep 17 00:00:00 2001 From: Warren Searle Date: Fri, 17 Jul 2020 22:58:32 +0100 Subject: [PATCH 7/7] Bump version number to 0.3.0 Release notes: #19 Add sentry logging #26 Ensure login link takes user to assessment page #27 Rename "upload" button #34 Ensure following a log-in link ends & replaces previous session #35 Ensure mal-formed login links are rejected #39 Update favicon --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe5cee4..e565c97 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "assessment-uploader", - "version": "0.2.0", + "version": "0.3.0", "private": true, "scripts": { "serve": "vue-cli-service serve --mode develop",