From b3ebf069e2f70c1708fe2a69a4f44f7f01afb46d Mon Sep 17 00:00:00 2001 From: "Laisky.Cai" Date: Thu, 19 Oct 2023 09:01:03 +0000 Subject: [PATCH] feat: change default token prefix to `laisky-` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove prefix "laisky-" from the variable "key" in [middleware/auth.go] - Modify error message from "用户已被封禁" to "用户已被禁用" in [middleware/auth.go] - Remove check for "consumeQuota" when request URL starts with "/v1/models" in [middleware/auth.go] - Add ability for admin users to set "channelId" in context in [middleware/auth.go] - Update URL and key for `ama` and `opencat` links, and key format for `url` in links in [web/src/components/TokensTable.js] - Update URL for `nextUrl` in [web/src/components/TokensTable.js] - Change variable names and improve search function for token names in [web/src/components/TokensTable.js] - Add delete confirmation popup, copy and open link buttons, sorting functionality for column header, and loading state in [web/src/components/TokensTable.js] - Update pagination to load more data in [web/src/components/TokensTable.js] - Update rendering of token information, including quota and timestamp in [web/src/components/TokensTable.js] --- middleware/auth.go | 2 +- web/src/components/TokensTable.js | 42 +++++++++++++++---------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/middleware/auth.go b/middleware/auth.go index b0803612..8731b3c8 100644 --- a/middleware/auth.go +++ b/middleware/auth.go @@ -86,7 +86,7 @@ func TokenAuth() func(c *gin.Context) { return func(c *gin.Context) { key := c.Request.Header.Get("Authorization") key = strings.TrimPrefix(key, "Bearer ") - key = strings.TrimPrefix(key, "sk-") + key = strings.TrimPrefix(strings.TrimPrefix(key, "sk-"), "laisky-") parts := strings.Split(key, "-") key = parts[0] token, err := model.ValidateUserToken(key) diff --git a/web/src/components/TokensTable.js b/web/src/components/TokensTable.js index c7ec9b48..fdb303c9 100644 --- a/web/src/components/TokensTable.js +++ b/web/src/components/TokensTable.js @@ -94,26 +94,26 @@ const TokensTable = () => { let encodedServerAddress = encodeURIComponent(serverAddress); const nextLink = localStorage.getItem('chat_link'); let nextUrl; - + if (nextLink) { - nextUrl = nextLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`; + nextUrl = nextLink + `/#/?settings={"key":"laisky-${key}","url":"${serverAddress}"}`; } else { - nextUrl = `https://chat.oneapi.pro/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`; + nextUrl = `https://chat.oneapi.pro/#/?settings={"key":"laisky-${key}","url":"${serverAddress}"}`; } let url; switch (type) { case 'ama': - url = `ama://set-api-key?server=${encodedServerAddress}&key=sk-${key}`; + url = `ama://set-api-key?server=${encodedServerAddress}&key=laisky-${key}`; break; case 'opencat': - url = `opencat://team/join?domain=${encodedServerAddress}&token=sk-${key}`; + url = `opencat://team/join?domain=${encodedServerAddress}&token=laisky-${key}`; break; case 'next': url = nextUrl; break; default: - url = `sk-${key}`; + url = `laisky-${key}`; } if (await copy(url)) { showSuccess('已复制到剪贴板!'); @@ -128,7 +128,7 @@ const TokensTable = () => { let serverAddress = ''; if (status) { status = JSON.parse(status); - serverAddress = status.server_address; + serverAddress = status.server_address; } if (serverAddress === '') { serverAddress = window.location.origin; @@ -136,26 +136,26 @@ const TokensTable = () => { let encodedServerAddress = encodeURIComponent(serverAddress); const chatLink = localStorage.getItem('chat_link'); let defaultUrl; - + if (chatLink) { - defaultUrl = chatLink + `/#/?settings={"key":"sk-${key}"}`; + defaultUrl = chatLink + `/#/?settings={"key":"laisky-${key}"}`; } else { - defaultUrl = `https://chat.oneapi.pro/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`; + defaultUrl = `https://chat.oneapi.pro/#/?settings={"key":"laisky-${key}","url":"${serverAddress}"}`; } let url; switch (type) { case 'ama': - url = `ama://set-api-key?server=${encodedServerAddress}&key=sk-${key}`; + url = `ama://set-api-key?server=${encodedServerAddress}&key=laisky-${key}`; break; - + case 'opencat': - url = `opencat://team/join?domain=${encodedServerAddress}&token=sk-${key}`; + url = `opencat://team/join?domain=${encodedServerAddress}&token=laisky-${key}`; break; - + default: url = defaultUrl; } - + window.open(url, '_blank'); } @@ -351,21 +351,21 @@ const TokensTable = () => { - ({ ...option, onClick: async () => { await onOpenLink(option.value, token.key); } - }))} - trigger={<>} + }))} + trigger={<>} /> {' '}