From 0f4e9141f292f4f1b09a13c2aff55f386fd58035 Mon Sep 17 00:00:00 2001
From: LiuShen <3162475700@qq.com>
Date: Sun, 12 Oct 2025 18:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=A3=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=BA=E6=96=B0=E7=89=88=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tinyauth/4.0.0/data.yml           | 21 +++++++--------------
 tinyauth/4.0.0/docker-compose.yml | 25 +++++++++++++------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/tinyauth/4.0.0/data.yml b/tinyauth/4.0.0/data.yml
index 2638871fa..8079423e8 100644
--- a/tinyauth/4.0.0/data.yml
+++ b/tinyauth/4.0.0/data.yml
@@ -137,13 +137,6 @@ additionalProperties:
       required: false
       type: password
 
-    - default: ""
-      envKey: PANEL_TINYAUTH_GITHUB_REDIRECT_URI
-      labelEn: GitHub Redirect URI
-      labelZh: GitHub 回调地址
-      required: false
-      type: text
-
     # Google
     - default: ""
       envKey: PANEL_TINYAUTH_GOOGLE_CLIENT_ID
@@ -159,13 +152,6 @@ additionalProperties:
       required: false
       type: password
 
-    - default: ""
-      envKey: PANEL_TINYAUTH_GOOGLE_REDIRECT_URI
-      labelEn: Google Redirect URI
-      labelZh: Google 回调地址
-      required: false
-      type: text
-
     # Generic
     - default: ""
       envKey: PANEL_TINYAUTH_GENERIC_NAME
@@ -208,3 +194,10 @@ additionalProperties:
       labelZh: 通用用户信息地址
       required: false
       type: text
+
+    - default: ""
+      envKey: PANEL_TINYAUTH_GENERIC_SCOPES
+      labelEn: Generic Scopes
+      labelZh: 通用范围
+      required: false
+      type: text
diff --git a/tinyauth/4.0.0/docker-compose.yml b/tinyauth/4.0.0/docker-compose.yml
index febbabf38..e4f52e2f1 100644
--- a/tinyauth/4.0.0/docker-compose.yml
+++ b/tinyauth/4.0.0/docker-compose.yml
@@ -12,22 +12,23 @@ services:
       - BACKGROUND_IMAGE=${PANEL_TINYAUTH_BACKGROUND_IMAGE}
 
       # ---- GitHub ----
-      - GITHUB_CLIENT_ID=${PANEL_TINYAUTH_GITHUB_CLIENT_ID}
-      - GITHUB_CLIENT_SECRET=${PANEL_TINYAUTH_GITHUB_CLIENT_SECRET}
-      - GITHUB_REDIRECT_URI=${PANEL_TINYAUTH_GITHUB_REDIRECT_URI}
+      - PROVIDERS_GITHUB_CLIENT_ID=${PANEL_TINYAUTH_GITHUB_CLIENT_ID}
+      - PROVIDERS_GITHUB_CLIENT_SECRET=${PANEL_TINYAUTH_GITHUB_CLIENT_SECRET}
+      # - PROVIDERS_GITHUB_REDIRECT_URI=${PANEL_TINYAUTH_GITHUB_REDIRECT_URI}
 
       # ---- Google ----
-      - GOOGLE_CLIENT_ID=${PANEL_TINYAUTH_GOOGLE_CLIENT_ID}
-      - GOOGLE_CLIENT_SECRET=${PANEL_TINYAUTH_GOOGLE_CLIENT_SECRET}
-      - GOOGLE_REDIRECT_URI=${PANEL_TINYAUTH_GOOGLE_REDIRECT_URI}
+      - PROVIDERS_GOOGLE_CLIENT_ID=${PANEL_TINYAUTH_GOOGLE_CLIENT_ID}
+      - PROVIDERS_GOOGLE_CLIENT_SECRET=${PANEL_TINYAUTH_GOOGLE_CLIENT_SECRET}
+      # - PROVIDERS_GOOGLE_REDIRECT_URI=${PANEL_TINYAUTH_GOOGLE_REDIRECT_URI}
 
       # ---- Generic (示例 Linux.Do) ----
-      - GENERIC_NAME=${PANEL_TINYAUTH_GENERIC_NAME}
-      - GENERIC_CLIENT_ID=${PANEL_TINYAUTH_GENERIC_CLIENT_ID}
-      - GENERIC_CLIENT_SECRET=${PANEL_TINYAUTH_GENERIC_CLIENT_SECRET}
-      - GENERIC_AUTH_URL=${PANEL_TINYAUTH_GENERIC_AUTH_URL}
-      - GENERIC_TOKEN_URL=${PANEL_TINYAUTH_GENERIC_TOKEN_URL}
-      - GENERIC_USER_URL=${PANEL_TINYAUTH_GENERIC_USER_URL}
+      - PROVIDERS_GENERIC_NAME=${PANEL_TINYAUTH_GENERIC_NAME}
+      - PROVIDERS_GENERIC_CLIENT_ID=${PANEL_TINYAUTH_GENERIC_CLIENT_ID}
+      - PROVIDERS_GENERIC_CLIENT_SECRET=${PANEL_TINYAUTH_GENERIC_CLIENT_SECRET}
+      - PROVIDERS_GENERIC_AUTH_URL=${PANEL_TINYAUTH_GENERIC_AUTH_URL}
+      - PROVIDERS_GENERIC_TOKEN_URL=${PANEL_TINYAUTH_GENERIC_TOKEN_URL}
+      - PROVIDERS_GENERIC_USER_INFO_URL=${PANEL_TINYAUTH_GENERIC_USER_URL}
+      - PROVIDERS_GENERIC_SCOPES=${PANEL_TINYAUTH_GENERIC_SCOPES}
 
     ports:
       - "${PANEL_APP_PORT_HTTP}:3000"