Merge branch 'subsetter_front_clean' into develop_v2

CUAHSI · Nov 27, 2023 · 786fc8e · 786fc8e
2 parents c19f7d0 + e82e607
commit 786fc8e
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/app/frontend/src/components/SubmitButton.vue b/app/frontend/src/components/SubmitButton.vue
@@ -4,13 +4,15 @@
 
 <script setup>
 import { useModelsStore } from '@/stores/models'
+import { useAuthStore } from '@/stores/auth'
 import { ENDPOINTS } from '@/constants'
 import { useMapStore } from '@/stores/map'
 
 const mapStore = useMapStore()
 const Map = mapStore.mapObject
 
 const modelsStore = useModelsStore();
+const authStore = useAuthStore();
 
 function submit() {
   const model = modelsStore.selectedModel
@@ -19,16 +21,18 @@ function submit() {
 }
 async function submitHucs(selected_hucs, model) {
   selected_hucs = selected_hucs.map(a => a.hucid);
-  console.log(selected_hucs)
   const hucs = selected_hucs.join(",")
-  
+
+  const jwt = authStore.getToken()
   alert(`Submitting hucs: ${hucs} for ${model} subsetting`)
-    const parResp = await fetch(`${ENDPOINTS.submit}/${model}?hucs=${hucs}`, {
-        method: "POST",
-        credentials: 'include',
-        mode: 'cors'
-    })
-    const parJson = await parResp.json()
-    alert(`Submitted ${parJson.workflow_name} workflow. Workflow_id: ${parJson.workflow_id}`)
+  const parResp = await fetch(`${ENDPOINTS.submit}/${model}?hucs=${hucs}`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${jwt}`,
+    }
+  })
+  const parJson = await parResp.json()
+  alert(`Submitted ${parJson.workflow_name} workflow. Workflow_id: ${parJson.workflow_id}`)
 }
 </script>
diff --git a/app/frontend/src/stores/auth.js b/app/frontend/src/stores/auth.js
@@ -5,18 +5,21 @@ export const useAuthStore = defineStore('auth', () => {
     const user = useStorage('user', {})
     const isLoggedIn = useStorage('isLoggedIn', false)
 
-    let storeToken = useStorage('storeToken', {})
+    const storeToken = useStorage('storeToken', {})
 
     async function login(token) {
-        // update pinia state
-        this.storeToken = token;
+        storeToken.value = token;
     }
 
     async function logout() {
-        this.user = {}
-        this.isLoggedIn = false;
-        this.storeToken = {};
+        user.value = {}
+        isLoggedIn.value = false;
+        storeToken.value = {};
+    }
+
+    function getToken(){
+        return storeToken.value.access_token
     }
 
-    return { isLoggedIn, user, login, logout }
+    return { isLoggedIn, user, login, logout, getToken, storeToken}
   })
diff --git a/app/frontend/src/stores/submissions.js b/app/frontend/src/stores/submissions.js
@@ -1,14 +1,20 @@
 import { defineStore } from 'pinia'
 import { ENDPOINTS } from '../constants'
 import { ref } from 'vue'
+import { useAuthStore } from '@/stores/auth'
+
+const authStore = useAuthStore();
+const jwt = authStore.getToken()
 
 export const useSubmissionsStore = defineStore('submissions', () => {
   const submissions = ref([])
 
   async function getSubmissions() {
     const submissionResp = await fetch(`${ENDPOINTS.submissions}`, {
-      credentials: 'include',
-      mode: 'cors'
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${jwt}`,
+      }
     })
     const submissionsObj = await submissionResp.json()
     let submissions = submissionsObj.submissions