Merge branch 'main' into refactor-remove-routing.transition-methods-d…

…eprecation
eclipse-pass · Jun 27, 2024 · 9d5c2a3 · 9d5c2a3
2 parents 85d88dc + 7a83889
commit 9d5c2a3
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 11 deletions.
diff --git a/app/adapters/application.js b/app/adapters/application.js
@@ -11,9 +11,12 @@ export default class ApplicationAdapter extends JSONAPIAdapter {
 
   namespace = ENV.passApi.namespace;
 
-  headers = {
-    withCredentials: true,
-  };
+  get headers() {
+    return {
+      withCredentials: true,
+      'X-XSRF-TOKEN': document.cookie.match(/XSRF-TOKEN\=([^;]*)/)['1'],
+    };
+  }
 
   // Camel case instead of pluralize model types for our API
   pathForType(type) {

diff --git a/app/adapters/file.js b/app/adapters/file.js
@@ -22,6 +22,10 @@ export default class FileAdapter extends ApplicationAdapter {
     }
     return fetch(url, {
       method: 'DELETE',
+      credentials: 'same-origin',
+      headers: {
+        'X-XSRF-TOKEN': document.cookie.match(/XSRF-TOKEN\=([^;]*)/)['1'],
+      },
     }).then((response) => {
       if (!response.ok) {
         throw new Error('Delete request to the file service failed');

diff --git a/app/components/workflow-files/index.js b/app/components/workflow-files/index.js
@@ -97,7 +97,12 @@ export default class WorkflowFiles extends Component {
   @action
   async uploadFile(FileUpload) {
     try {
-      const response = await FileUpload.upload(ENV.fileServicePath);
+      const response = await FileUpload.upload(ENV.fileServicePath, {
+        withCredentials: true,
+        headers: {
+          'X-XSRF-TOKEN': document.cookie.match(/XSRF-TOKEN\=([^;]*)/)['1'],
+        },
+      });
 
       const file = await response.json();
 

diff --git a/app/controllers/grants/detail.js b/app/controllers/grants/detail.js
@@ -40,7 +40,7 @@ export default class GrantDetailsController extends Controller {
       propertyName: 'submittedDate',
       title: 'Submitted Date',
       className: 'date-column',
-      component: 'date-cell',
+      component: 'dateCell',
     },
     {
       propertyName: 'submissionStatus',

diff --git a/app/controllers/grants/index.js b/app/controllers/grants/index.js
@@ -51,14 +51,14 @@ export default class GrantsIndexController extends Controller {
       title: 'Start',
       disableFiltering: true,
       className: 'date-column',
-      component: 'date-cell',
+      component: 'dateCell',
     },
     {
       propertyName: 'grant.endDate',
       title: 'End',
       disableFiltering: true,
       className: 'date-column',
-      component: 'date-cell',
+      component: 'dateCell',
     },
     {
       propertyName: 'grant.awardStatus',
@@ -100,7 +100,7 @@ export default class GrantsIndexController extends Controller {
       title: 'End Date',
       disableFiltering: true,
       className: 'date-column',
-      component: 'date-cell',
+      component: 'dateCell',
     },
     {
       propertyName: 'submissions.length',

diff --git a/app/controllers/submissions/index.js b/app/controllers/submissions/index.js
@@ -66,7 +66,7 @@ export default class SubmissionsIndex extends Controller {
           propertyName: 'submittedDate',
           title: 'Submitted Date',
           className: 'date-column',
-          component: 'date-cell',
+          component: 'dateCell',
         },
         {
           propertyName: 'submissionStatus',
@@ -107,7 +107,7 @@ export default class SubmissionsIndex extends Controller {
           propertyName: 'submittedDate',
           title: 'Submitted Date',
           className: 'date-column',
-          component: 'date-cell',
+          component: 'dateCell',
         },
         {
           propertyName: 'submissionStatus',

diff --git a/app/services/doi.js b/app/services/doi.js
@@ -32,6 +32,7 @@ export default class DoiService extends Service {
       headers: {
         Accept: 'application/json; charset=utf-8',
         withCredentials: 'include',
+        'X-XSRF-TOKEN': document.cookie.match(/XSRF-TOKEN\=([^;]*)/)['1'],
       },
     });
 

diff --git a/app/templates/grants/detail.hbs b/app/templates/grants/detail.hbs
@@ -94,6 +94,7 @@
           submissionsStatusCell=(component "submissions-status-cell")
           submissionsRepoidCell=(component "submissions-repoid-cell")
           submissionActionCell=(component "submission-action-cell")
+          dateCell=(component "date-cell")
         }}
         @themeInstance={{this.themeInstance}}
         @showColumnsDropdown={{false}}

diff --git a/app/templates/grants/index.hbs b/app/templates/grants/index.hbs
@@ -25,6 +25,7 @@
           piListCell=(component "pi-list-cell")
           grantSubmissionCell=(component "grant-submission-cell")
           grantActionCell=(component "grant-action-cell")
+          dateCell=(component "date-cell")
         }}
         @themeInstance={{this.themeInstance}}
         @showColumnsDropdown={{false}}

diff --git a/app/templates/submissions/index.hbs b/app/templates/submissions/index.hbs
@@ -34,6 +34,7 @@
           submissionsStatusCell=(component "submissions-status-cell")
           submissionsRepoidCell=(component "submissions-repoid-cell")
           submissionActionCell=(component "submission-action-cell")
+          dateCell=(component "date-cell")
         }}
         @themeInstance={{this.themeInstance}}
         @showColumnsDropdown={{false}}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pass-ui",
-  "version": "1.7.0-SNAPSHOT",
+  "version": "1.8.0-SNAPSHOT",
   "private": true,
   "description": "The user interface for the eclipse-pass project",
   "license": "MIT",

diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -15,3 +15,6 @@ setupSinon();
 setup(QUnit.assert);
 
 start();
+
+// Set a fake CSRF token
+document.cookie = 'XSRF-TOKEN=moo';