Update: Use optional methods for auto 2fa

GunmaRamens · Nov 6, 2023 · 2196992 · 2196992
1 parent aea7b3a
commit 2196992
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/class/SSO/index.ts b/src/class/SSO/index.ts
@@ -4,13 +4,21 @@
 import changeQueryInnerHTML from "../../utils/changeQueryInnerHTML";
 import { GundaiWebSite } from "../UnivWebsite";
 
-export const SSO = new GundaiWebSite("sso");
+export const SSO = new GundaiWebSite<{
+    enableAuto2FA: () => void;
+    isAuto2FAEnabled: () => Promise<boolean>;
+}>("sso");
 export default SSO;
 
 SSO.rainbow.enable = function () {
     this.bg.apply(".input_form");
     changeQueryInnerHTML(".product", "群馬大学ゲーミングサインオンシステム");
-
+};
+SSO.options.isAuto2FAEnabled = async (): Promise<boolean> => {
+    const isAuto2FAEnabled = await SSO.storage.get("auto-2fa");
+    return isAuto2FAEnabled;
+};
+SSO.options.enableAuto2FA = () => {
     // 二段階認証の自動送信
     if (location.pathname == "/pub/allotplogin_force.cgi") {
         // 2段階認証のページ
@@ -24,3 +32,5 @@ SSO.rainbow.enable = function () {
         });
     }
 };
+
+SSO.addLoader(SSO.options.enableAuto2FA);
diff --git a/src/options/pages/Top.tsx b/src/options/pages/Top.tsx
@@ -63,13 +63,10 @@ export default function Top() {
                 <QuickSwitch className="child:m-2" />
             </ConfigSection>
 
-            <ConfigSection name="Detail" desc="ウェブサイトごとの詳細設定を行います">
-                <div className="flex flex-col">
-                    <Heading.h3>SSO</Heading.h3>
-                    <div className="flex">
-                        <p>二段階認証コードの自動送信を行うかどうか</p>
-                        <ToggleWithStorage section="sso" dataKey="auto-2fa" />
-                    </div>
+            <ConfigSection name="SSO">
+                <div className="flex">
+                    <p>二段階認証コードの自動送信</p>
+                    <ToggleWithStorage section="sso" dataKey="auto-2fa" />
                 </div>
             </ConfigSection>