Merge pull request #226 from little3201/develop

修改mock认证

Author: little3201

package.json

@@ -20,17 +20,17 @@
     "pinia": "^2.3.1",
     "quasar": "^2.18.1",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.1.2",
+    "vue-i18n": "^11.1.3",
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.23.0",
+    "@eslint/js": "^9.24.0",
     "@lottiefiles/dotlottie-web": "^0.38.2",
     "@quasar/app-vite": "^2.2.0",
-    "@types/node": "^20.17.28",
+    "@types/node": "^20.17.30",
     "@vue/eslint-config-typescript": "^14.5.0",
     "autoprefixer": "^10.4.21",
-    "eslint": "^9.23.0",
+    "eslint": "^9.24.0",
     "eslint-plugin-vue": "^9.33.0",
     "globals": "^15.15.0",
     "msw": "^2.7.3",
@@ -43,5 +43,5 @@
       "public"
     ]
   },
-  "packageManager": "pnpm@9.14.4"
+  "packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971"
 }

pnpm-lock.yaml

@@ -12,10 +12,10 @@ export default defineConfig((ctx) => {
     // --> boot files are part of "main.js"
     // https://v2.quasar.dev/quasar-cli-vite/boot-files
     boot: [
-      'i18n',
       'axios',
-      'msw-server',
-      'router'
+      'i18n',
+      'router',
+      'msw-server'
     ],
 
     // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
@@ -61,8 +61,7 @@ export default defineConfig((ctx) => {
       // analyze: true,
       env: {
         API: ctx.dev ? '/api' : 'https://101.42.255.156/api',
-        CLIENT_ID: 'pkce-client',
-        AUTHORITY_URL: 'http://127.0.0.1:8761'
+        CLIENT_ID: 'pkce-client'
       },
       // rawDefine: {},
       // ignorePublicFolder: true,

quasar.config.ts

@@ -4,8 +4,6 @@ import { getRandomString, generateVerifier, computeChallenge } from 'src/utils'
 
 
 const client_id = process.env.CLIENT_ID
-const authorityUrl = process.env.AUTHORITY_URL
-
 
 export async function signIn() {
   const state = getRandomString(16)
@@ -15,16 +13,22 @@ export async function signIn() {
   const codeChallenge = await computeChallenge(codeVerifier)
 
   const params = new URLSearchParams({
-    response_type: 'code',
     client_id: `${client_id}`,
     redirect_uri: `${window.location.origin}/callback`,
+    state: state,
     scope: 'openid profile',
+    response_type: 'code',
     code_challenge: codeChallenge,
-    state: state,
     code_challenge_method: 'S256'
   })
 
-  window.location.href = `${authorityUrl}/${SERVER_URL.AUTHORIZE}?${params}`
+  api.get(SERVER_URL.AUTHORIZE, { params }).then(res => {
+    window.location.replace(res.request.responseURL)
+  }).catch(error => {
+    if (error) {
+      window.location.replace('/login')
+    }
+  })
 }
 
 export function handleCallback() {
@@ -46,28 +50,29 @@ export function handleCallback() {
   }
 
   const params = new URLSearchParams({
-    grant_type: 'authorization_code',
     client_id: `${client_id}`,
-    code: code,
     redirect_uri: `${window.location.origin}/callback`,
+    state: state,
+    code: code,
     code_verifier: codeVerifier,
-    state: state
+    grant_type: 'authorization_code'
   })
   // Exchange authorization code for access token
-  return api.post(`${authorityUrl}/${SERVER_URL.TOKEN}`, params)
+  return api.post(SERVER_URL.TOKEN, params)
 }
 
 export function getSub() {
-  return api.get(`${authorityUrl}/${SERVER_URL.USERINFO}`)
+  return api.get(SERVER_URL.USERINFO)
 }
 
-export function signOut() {
-  const idTokenHint = localStorage.getItem('id_token_hint')
+export function signOut(idToken: string) {
   const params = new URLSearchParams({
-    id_token_hint: `${idTokenHint}`,
+    id_token_hint: idToken,
     client_id: `${client_id}`,
     post_logout_redirect_uri: `${window.location.origin}`
   })
 
-  window.location.href = `${authorityUrl}/${SERVER_URL.LOGOUT}?${params}`
+  api.post(SERVER_URL.LOGOUT, params).then(res => {
+    window.location.replace(res.request.responseURL)
+  })
 }

src/api/authentication.ts

@@ -65,3 +65,12 @@ export const modifyDictionary = (id: number, row: Dictionary) => {
 export const removeDictionary = (id: number) => {
   return api.delete(`${SERVER_URL.DICTIONARY}/${id}`)
 }
+
+/**
+ * Enable or Disable an existing row
+ * @param id Row ID
+ * @returns Enable or Disable result
+ */
+export const enableDictionary = (id: number) => {
+  return api.patch(`${SERVER_URL.DICTIONARY}/${id}`)
+}

src/api/dictionaries.ts

@@ -12,15 +12,6 @@ export const retrieveFiles = (pagination: Pagination, filters?: object) => {
   return api.get(SERVER_URL.FILE, { params: { ...pagination, page: pagination.page - 1, ...filters } })
 }
 
-/**
- * Fetch a specific row
- * @param id Row ID
- * @returns Row data
- */
-export const fetchFile = (id: number) => {
-  return api.get(`${SERVER_URL.FILE}/${id}`)
-}
-
 /**
  * Upload
  * @param row Row data

src/api/files.ts

@@ -74,6 +74,27 @@ export const removeGroup = (id: number) => {
   return api.delete(`${SERVER_URL.GROUP}/${id}`)
 }
 
+/**
+ * Relation members for a row
+ * @param id Row ID
+ * @param usernames usernames
+ * @returns Related status
+ */
+export const relationGroupMembers = (id: number, usernames: string[]) => {
+  return api.patch(`${SERVER_URL.GROUP}/${id}/members`, usernames)
+}
+
+/**
+ * Remove members for a row
+ * @param id Row ID
+ * @param usernames usernames
+ * @returns Deletion status
+ */
+export const removeGroupMembers = (id: number, usernames: number[]) => {
+  const params = usernames ? { privilegeIds: usernames.join(',') } : {}
+  return api.delete(`${SERVER_URL.GROUP}/${id}/members`, { params })
+}
+
 /**
  * Relation privileges for a row
  * @param id Row ID

src/api/groups.ts

@@ -1,6 +1,6 @@
 import { api } from 'boot/axios'
 import { SERVER_URL } from 'src/constants'
-import type { Pagination } from 'src/types'
+import type { Pagination, Privilege } from 'src/types'
 
 /**
  * Retrieve rows
@@ -38,3 +38,22 @@ export const retrievePrivilegeTree = () => {
 export const fetchPrivilege = (id: number) => {
   return api.get(`${SERVER_URL.PRIVILEGE}/${id}`)
 }
+
+/**
+ * Modify an existing row
+ * @param id Row ID
+ * @param data Updated row data
+ * @returns Modified row
+ */
+export const modifyPrivilege = (id: number, row: Privilege) => {
+  return api.put(`${SERVER_URL.PRIVILEGE}/${id}`, row)
+}
+
+/**
+ * Enable or Disable an existing row
+ * @param id Row ID
+ * @returns Enable or Disable result
+ */
+export const enablePrivilege = (id: number) => {
+  return api.patch(`${SERVER_URL.PRIVILEGE}/${id}`)
+}

src/api/privileges.ts

@@ -13,6 +13,15 @@ export const retrieveRegions = (pagination: Pagination, filters?: object) => {
   return api.get(SERVER_URL.REGION, { params: { ...pagination, page: pagination.page - 1, ...filters } })
 }
 
+/**
+ * Get row subset
+ * @param id Row ID
+ * @returns Subset data
+ */
+export const retrieveRegionSubset = (id: number) => {
+  return api.get(`${SERVER_URL.REGION}/${id}/subset`)
+}
+
 /**
  * Fetch a specific row
  * @param id Row ID
@@ -41,6 +50,15 @@ export const modifyRegion = (id: number, row: Region) => {
   return api.put(`${SERVER_URL.REGION}/${id}`, row)
 }
 
+/**
+ * Enable or Disable an existing row
+ * @param id Row ID
+ * @returns Enable or Disable result
+ */
+export const enableRegion = (id: number) => {
+  return api.patch(`${SERVER_URL.REGION}/${id}`)
+}
+
 /**
  * Remove a row
  * @param id Row ID

src/api/regions.ts

@@ -0,0 +1,20 @@
+import { api } from 'boot/axios'
+import { SERVER_URL } from 'src/constants'
+
+/**
+ * Retrieve rows
+ * @param filters Optional filter or sort parameters
+ * @returns Rows data
+ */
+export const retrieveScripts = () => {
+  return api.get(SERVER_URL.SCRIPT)
+}
+
+/**
+ * Fetch a specific row
+ * @param id Row ID
+ * @returns Row data
+ */
+export const fetchScript = (id: number) => {
+  return api.get(`${SERVER_URL.SCRIPT}/${id}`)
+}