Update src/addons/addons/save-to-google/userscript.js

src/addons/addons/save-to-google/userscript.js

@@ -30,16 +30,28 @@ export default async ({ addon, console, msg }) => {
 
         const loginButton = modal.content.querySelector("#google-login-button");
         if (loginButton) {
-          loginButton.addEventListener("click", async () => {
-            try {
-              const token = await authenticateWithGoogle();
-              if (token) {
-                await saveToGoogleDrive(token, modal.remove);
+          loginButton.addEventListener("click", () => {
+            // メッセージイベントリスナーを追加
+            const messageListener = (event) => {
+              if (event.origin === "https://soiz1-penguin-upload.hf.space" && event.data.token) {
+                window.removeEventListener("message", messageListener);
+                saveToGoogleDrive(event.data.token, modal.remove)
+                  .catch(error => {
+                    console.error("保存エラー:", error);
+                    addon.tab.showAlert("Googleドライブへの保存に失敗しました", { type: "error" });
+                  });
               }
-            } catch (error) {
-              console.error("認証エラー:", error);
-              addon.tab.showAlert("Googleドライブへの保存に失敗しました", { type: "error" });
-            }
+            };
+            window.addEventListener("message", messageListener);
+
+            // OAuthポップアップを開く
+            const authUrl = `https://accounts.google.com/o/oauth2/auth?` +
+              `client_id=${CLIENT_ID}` +
+              `&redirect_uri=${encodeURIComponent(REDIRECT_URI)}` +
+              `&response_type=token` +
+              `&scope=${encodeURIComponent(SCOPES)}`;
+            
+            window.open(authUrl, "_blank", "width=500,height=600");
           });
         }
 
@@ -51,35 +63,6 @@ export default async ({ addon, console, msg }) => {
     }
   }
 
-  async function authenticateWithGoogle() {
-    return new Promise((resolve) => {
-      const authUrl = `https://accounts.google.com/o/oauth2/auth?` +
-        `client_id=${CLIENT_ID}` +
-        `&redirect_uri=${encodeURIComponent(REDIRECT_URI)}` +
-        `&response_type=token` +
-        `&scope=${encodeURIComponent(SCOPES)}`;
-      
-      const authWindow = window.open(authUrl, "_blank", "width=500,height=600");
-
-      const checkAuth = setInterval(() => {
-        try {
-          if (authWindow.closed) {
-            clearInterval(checkAuth);
-            const token = getAccessTokenFromUrl();
-            if (token) {
-              resolve(token);
-            } else {
-              resolve(null);
-            }
-          }
-        } catch (error) {
-          clearInterval(checkAuth);
-          resolve(null);
-        }
-      }, 500);
-    });
-  }
-
   async function saveToGoogleDrive(accessToken, onSuccess) {
     try {
       const blob = await window.vm.saveProjectSb3();
@@ -116,11 +99,4 @@ export default async ({ addon, console, msg }) => {
       throw error;
     }
   }
-
-  function getAccessTokenFromUrl() {
-    // リダイレクトURIからトークンを取得するロジックを実装
-    // 実際にはこの方法は推奨されませんが、元の機能を維持するために残しています
-    const params = new URLSearchParams(window.location.hash.substring(1));
-    return params.get("access_token");
-  }
 };