up web client v2

src/utils/auth.js

@@ -1,3 +1,5 @@
+import {setToken as setWCToken} from '@/utils/webclient'
+
 const TokenKey = 'access_token'
 const OidcCode = 'oidc_code'
 const OidcCodeExpiry = 'oidc_code_expiry';
@@ -7,6 +9,7 @@ export function getToken () {
 }
 
 export function setToken (token) {
+  setWCToken(token)
   return localStorage.setItem(TokenKey, token)
 }
 
@@ -40,4 +43,4 @@ export function getCode() {
 export function removeCode() {
   localStorage.removeItem(OidcCode);
   localStorage.removeItem(OidcCodeExpiry);
-}
+}

src/utils/webclient.js

@@ -6,30 +6,37 @@ import * as message from '@/utils/webclient/message'
 import { ElMessageBox } from 'element-plus'
 import { T } from '@/utils/i18n'
 
-export const toWebClientLink = (row) => {
-  window.open(`${rustdeskConfig.value.api_server}/webclient/#/?id=${row.id}`)
+const prefix = 'wc-'
+
+export function setToken (token) {
+  localStorage.setItem(`${prefix}option:local:access_token`, token)
 }
 
-export function loadRustdeskConfig () {
-  const rustdeskConfig = ref({})
-  const fetchConfig = async () => {
+export const toWebClientLink = (row) => {
+  //v2
+  window.open(`${rustdeskConfig.value.api_server}/webclient2/#/${row.id}`)
+  // window.open(`${rustdeskConfig.value.api_server}/webclient/#/?id=${row.id}`)
+}
+
+export const rustdeskConfig = ref({})
+
+export async function loadRustdeskConfig () {
+  console.log('loadRustdeskConfig')
+  if (rustdeskConfig.value.id_server === undefined || rustdeskConfig.value.key === undefined) {
     const res = await server().catch(_ => false)
     if (res) {
       rustdeskConfig.value = res.data
-      localStorage.setItem('custom-rendezvous-server', res.data.id_server)
-      localStorage.setItem('key', res.data.key)
-      localStorage.setItem('api-server', res.data.api_server)
+      localStorage.setItem(`${prefix}custom-rendezvous-server`, res.data.id_server)
+      localStorage.setItem(`${prefix}key`, res.data.key)
+      localStorage.setItem(`${prefix}api-server`, res.data.api_server)
     }
   }
-  if (rustdeskConfig.value.id_server === undefined || rustdeskConfig.value.key === undefined) {
-    fetchConfig()
-  }
   return {
     rustdeskConfig,
   }
 }
 
-export const { rustdeskConfig } = loadRustdeskConfig()
+
 export async function getPeerSlat (id) {
   const [addr, port] = rustdeskConfig.value.id_server.split(':')
   if (!addr) {
@@ -107,3 +114,7 @@ export async function getPeerSlat (id) {
   }
 
 }
+
+export function getV2ShareUrl (token) {
+  return `${rustdeskConfig.value.api_server}/webclient2/#/?share_token=${token}`
+}