Remove cookie admin_user and get user roles from userStore (#833)

OpenCSGs · Dec 3, 2024 · c7166f2 · c7166f2
1 parent baab464
commit c7166f2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/frontend/src/components/application_spaces/NewApplicationSpace.vue b/frontend/src/components/application_spaces/NewApplicationSpace.vue
@@ -210,7 +210,7 @@
               <p class="font-semibold text-md">Streamlit</p>
             </el-radio>
             <el-radio
-              v-if="isAdmin"
+              v-if="userStore.isAdmin"
               class="rounded-md !border-[2px] !h-[120px] flex justify-center"
               size="large"
               label="nginx"
@@ -225,7 +225,7 @@
               <p class="font-semibold text-md">Nginx</p>
             </el-radio>
             <el-radio
-              v-if="!isAdmin"
+              v-if="!userStore.isAdmin"
               class="rounded-md !border-[2px] !h-[120px] flex justify-center"
               size="large"
               label="docker"
@@ -338,22 +338,18 @@
   import { useI18n } from 'vue-i18n'
   import useFetchApi from '../../packs/useFetchApi'
   import useUserStore from '../../stores/UserStore'
-  import { useCookies } from 'vue3-cookies'
   import PublicAndPrivateRadioGroup from '../shared/form/PublicAndPrivateRadioGroup.vue'
 
-  const userStore = useUserStore()
+  const props = defineProps({
+    licenses: Array
+  })
 
-  const { cookies } = useCookies()
+  const userStore = useUserStore()
   const dataFormRef = ref(null)
   const imageUploaded = ref(false)
   const images = ref([])
   const { t } = useI18n()
   const nameRule = inject('nameRule')
-  const isAdmin = cookies.isKey('admin_user')
-
-  const props = defineProps({
-    licenses: Array
-  })
 
   const dataForm = ref({
     owner: '',

diff --git a/frontend/src/stores/UserStore.js b/frontend/src/stores/UserStore.js
@@ -10,12 +10,14 @@ const useUserStore = defineStore('User', () => {
   const uuid = ref('')
   const homepage = ref('')
   const bio = ref('')
-  const roles = ref('')
+  const roles = ref([])
   const orgs = ref([])
   const lastLoginTime = ref('')
   const initialized = ref(false)
 
   const isLoggedIn = computed(() => username.value !== '')
+  const isAdmin = computed(() => roles.value.includes('admin') || roles.value.includes('super_user'))
+  const isSuperUser = computed(() => roles.value.includes('super_user'))
 
   async function initialize(initialData) {
     username.value = initialData.username || ''
@@ -48,7 +50,9 @@ const useUserStore = defineStore('User', () => {
     roles,
     orgs,
     lastLoginTime,
-    initialized
+    initialized,
+    isAdmin,
+    isSuperUser
   }
 })
 

diff --git a/internal/handlers/render/session.go b/internal/handlers/render/session.go
@@ -135,7 +135,6 @@ func (i *SessionHandlerImpl) Create(ctx *gin.Context) {
 
 	ctx.SetCookie("login_identity", user.LoginIdentity, cookieMaxAge, "/", "", false, false)
 	ctx.SetCookie("current_user", userResp.Username, cookieMaxAge, "/", "", false, false)
-	ctx.SetCookie("admin_user", fmt.Sprintf("%t", user.IsAdmin()), cookieMaxAge, "/", "", false, false)
 
 	user.SessionIP = ctx.ClientIP()
 	err = i.userModel.Update(ctx, user)