Remove unused git token and use access token instead (#300)

* Fetch access token from api for initialize guide * Do not pass user token to repo any more, get it through api instead * Bug fix * Bug fix: missing ref * Bug fix
OpenCSGs · Jul 15, 2024 · abd23b9 · abd23b9
1 parent 7978c79
commit abd23b9
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 21 deletions.
diff --git a/app/javascript/components/application_spaces/ApplicationSpaceDetail.vue b/app/javascript/components/application_spaces/ApplicationSpaceDetail.vue
@@ -40,7 +40,6 @@
       :can-write="canWrite"
       repo-type="space"
       :user-name="userName"
-      :user-token="userToken"
       :commitId="commitId"
       @toggleSpaceLogsDrawer="toggleSpaceLogsDrawer"
     />
@@ -121,7 +120,6 @@
     ownerUrl: String,
     canWrite: Boolean,
     userName: String,
-    userToken: String,
     commitId: String
   })
 

diff --git a/app/javascript/components/application_spaces/InitializeGuide.vue b/app/javascript/components/application_spaces/InitializeGuide.vue
@@ -3,26 +3,57 @@
                          :http-clone-url="httpCloneUrl"
                          :ssh-clone-url="sshCloneUrl"
                          :user-name="userName"
-                         :user-token="userToken"
+                         :user-token="accessToken"
                          :sdk="sdk" />
 
   <StreamlitInitializeGuide v-show="sdk == 'streamlit'"
                             :http-clone-url="httpCloneUrl"
                             :ssh-clone-url="sshCloneUrl"
                             :user-name="userName"
-                            :user-token="userToken"
-                            :sdk="sdk" /> 
+                            :user-token="accessToken"
+                            :sdk="sdk" />
 </template>
 
 <script setup>
   import GradioInitializeGuide from './GradioInitializeGuide.vue'
   import StreamlitInitializeGuide from './StreamlitInitializeGuide.vue'
+  import jwtFetch from '../../packs/jwtFetch'
+  import { useCookies } from 'vue3-cookies'
+  import { ref, onMounted, inject } from 'vue'
 
   const props = defineProps({
     httpCloneUrl: String,
     sshCloneUrl: String,
     sdk: String,
-    userName: String,
-    userToken: String,
+    userName: String
+  })
+
+  const { cookies } = useCookies()
+  const csghubServer = inject('csghubServer')
+
+  const currentUser = ref(cookies.get('current_user'))
+  const accessToken = ref('')
+
+  const fetchUserToken = async () => {
+    const res = await jwtFetch(
+      `${csghubServer}/api/v1/user/${currentUser}/tokens?app=git`
+    )
+    if (!res.ok) {
+      res.json().then((error) => {
+        ElMessage({ message: error.msg, type: 'warning' })
+      })
+    } else {
+      res.json().then((body) => {
+        if (body.data) {
+          accessToken.value = body.data[0].token
+        }
+      })
+    }
+  }
+
+  onMounted(() => {
+    if (currentUser.value) {
+      fetchUserToken()
+    }
   })
 </script>
diff --git a/app/javascript/components/codes/CodeDetail.vue b/app/javascript/components/codes/CodeDetail.vue
@@ -32,7 +32,6 @@
       :settingsVisibility="settingsVisibility"
       :can-write="canWrite"
       :userName="userName"
-      :userToken="userToken"
       repo-type="code"
       :commitId="commitId"
     />
@@ -60,7 +59,6 @@
     ownerUrl: String,
     canWrite: Boolean,
     userName: String,
-    userToken: String,
     commitId: String
   })
   const repoDetailStore = useRepoDetailStore()

diff --git a/app/javascript/components/datasets/DatasetDetail.vue b/app/javascript/components/datasets/DatasetDetail.vue
@@ -34,7 +34,6 @@
       :tags="tags"
       :tag-list="tagList"
       :userName="userName"
-      :userToken="userToken"
       repo-type="dataset"
       :commitId="commitId"
     />
@@ -64,7 +63,6 @@
     ownerUrl: String,
     canWrite: Boolean,
     userName: String,
-    userToken: String,
     commitId: String
   })
   const repoDetailStore = useRepoDetailStore()

diff --git a/app/javascript/components/models/ModelDetail.vue b/app/javascript/components/models/ModelDetail.vue
@@ -33,7 +33,6 @@
       :tags="tags"
       :tag-list="tagList"
       :userName="userName"
-      :userToken="userToken"
       :commitId="commitId"
       repo-type="model"
       :admin="admin"
@@ -64,7 +63,6 @@
     ownerUrl: String,
     canWrite: Boolean,
     userName: String,
-    userToken: String,
     commitId: String,
     admin: Boolean
   })

diff --git a/app/javascript/components/shared/RepoClone.vue b/app/javascript/components/shared/RepoClone.vue
@@ -124,7 +124,6 @@
     sshCloneUrl: String,
     repoType: String,
     userName: String,
-    userToken: String,
     namespacePath: String,
     admin: Boolean,
     repo: Object,

diff --git a/app/javascript/components/shared/RepoTabs.vue b/app/javascript/components/shared/RepoTabs.vue
@@ -6,7 +6,6 @@
       :httpCloneUrl="repoDetail.repository.http_clone_url"
       :sshCloneUrl="repoDetail.repository.ssh_clone_url"
       :userName="userName"
-      :userToken="userToken"
       :namespacePath="repoDetail.path"
       :admin="admin"
       :repo="repoDetail"
@@ -31,7 +30,6 @@
           :ssh-clone-url="repoDetail.repository.ssh_clone_url"
           :sdk="sdk"
           :user-name="userName"
-          :user-token="userToken"
         />
         <ApplicationPage
           v-else-if="repoType === 'space' && appStatus === 'Running'"
@@ -298,7 +296,6 @@
     appEndpoint: String,
     sdk: String,
     userName: String,
-    userToken: String,
     commitId: String,
     hardware: String,
     modelId: String,

diff --git a/app/views/application_spaces/show.html.erb b/app/views/application_spaces/show.html.erb
@@ -15,7 +15,6 @@
     avatar="<%= @avatar_url %>"
     :can-write="<%= !!(@local_application_space && current_user&.can_write?(@local_application_space)) %>"
     user-name="<%= current_user&.name %>"
-    user-token="<%= current_user&.git_token %>"
     commit-id="<%= @commit_id %>"
   >
   </application-space-detail>

diff --git a/app/views/codes/show.html.erb b/app/views/codes/show.html.erb
@@ -15,7 +15,6 @@
     avatar="<%= @avatar_url %>"
     :can-write="<%= !!(@local_code && current_user&.can_write?(@local_code)) %>"
     user-name="<%= current_user&.name %>"
-    user-token="<%= current_user&.git_token %>"
     commit-id="<%= @commit_id %>"
   ></code-detail>
 </div>
diff --git a/app/views/datasets/show.html.erb b/app/views/datasets/show.html.erb
@@ -16,7 +16,6 @@
     avatar="<%= @avatar_url %>"
     :can-write="<%= !!(@local_dataset && current_user&.can_write?(@local_dataset)) %>"
     user-name="<%= current_user&.name %>"
-    user-token="<%= current_user&.git_token %>"
     commit-id="<%= @commit_id %>"
   >
   </dataset-detail>

diff --git a/app/views/models/show.html.erb b/app/views/models/show.html.erb
@@ -16,7 +16,6 @@
     avatar="<%= @avatar_url %>"
     :can-write="<%= !!(@local_model && current_user&.can_write?(@local_model)) %>"
     user-name="<%= current_user&.name %>"
-    user-token="<%= current_user&.git_token %>"
     commit-id="<%= @commit_id %>"
     :admin="<%= current_user&.admin? %>"
   ></model-detail>