feat: sso compatibility mode (#113)

alist-org · Sep 22, 2023 · 6eb8ffd · 6eb8ffd
1 parent 57df6c4
commit 6eb8ffd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/src/lang/en/settings.json b/src/lang/en/settings.json
@@ -80,6 +80,7 @@
     "OIDC": "OIDC"
   },
   "sso_organization_name": "Sso organization name",
+  "sso_compatibility_mode": "Sso compatibility mode (Use redirect instead of popup to support certain services)",
   "text_types": "Text types",
   "token": "Token",
   "version": "Version",

diff --git a/src/pages/login/SSOLogin.tsx b/src/pages/login/SSOLogin.tsx
@@ -10,7 +10,13 @@ import { onCleanup } from "solid-js"
 const SSOLogin = () => {
   const ssoSignEnabled = getSettingBool("sso_login_enabled")
   const loginPlatform = getSetting("sso_login_platform")
+  const usecompatibility = getSettingBool("sso_compatibility_mode")
   const { searchParams, to } = useRouter()
+  const token = searchParams["token"]
+  if (token != undefined && token != "") {
+    changeToken(token)
+    to(decodeURIComponent(searchParams.redirect || base_path || "/"), true)
+  }
   function messageEvent(event: MessageEvent) {
     const data = event.data
     if (data.token) {
@@ -25,7 +31,11 @@ const SSOLogin = () => {
   if (ssoSignEnabled) {
     const login = () => {
       const url = r.getUri() + "/auth/sso?method=sso_get_token"
-      const popup = window.open(url, "authPopup", "width=500,height=600")
+      if (usecompatibility) {
+        window.location.href = url
+        return
+      }
+      window.open(url, "authPopup", "width=500,height=600")
     }
     let icon
     switch (loginPlatform) {

diff --git a/src/pages/manage/users/Profile.tsx b/src/pages/manage/users/Profile.tsx
@@ -41,10 +41,11 @@ const PermissionBadge = (props: { can: boolean; children: JSXElement }) => {
 const Profile = () => {
   const t = useT()
   useManageTitle("manage.sidemenu.profile")
-  const { to } = useRouter()
+  const { searchParams, to } = useRouter()
   const [username, setUsername] = createSignal(me().username)
   const [password, setPassword] = createSignal("")
   const [confirmPassword, setConfirmPassword] = createSignal("")
+  const usecompatibility = getSettingBool("sso_compatibility_mode")
   const [loading, save] = useFetch(
     (ssoID?: boolean): PEmptyResp =>
       r.post("/me/update", {
@@ -101,6 +102,11 @@ const Profile = () => {
       }
     })
   }
+  const ssoID = searchParams["sso_id"]
+  if (ssoID) {
+    setMe({ ...me(), sso_id: ssoID })
+    saveMe(true)
+  }
   function messageEvent(event: MessageEvent) {
     const data = event.data
     if (data.sso_id) {
@@ -228,11 +234,11 @@ const Profile = () => {
               <Button
                 onClick={() => {
                   const url = r.getUri() + "/auth/sso?method=get_sso_id"
-                  const popup = window.open(
-                    url,
-                    "authPopup",
-                    "width=500,height=600",
-                  )
+                  if (usecompatibility) {
+                    window.location.href = url
+                    return
+                  }
+                  window.open(url, "authPopup", "width=500,height=600")
                 }}
               >
                 {t("users.connect_sso")}