Updating to latest phanpy

Author: HelgeKrueger

src/pages/login.jsx

@@ -72,7 +72,7 @@ function Login() {
       // WEB_DOMAIN vs LOCAL_DOMAIN negotiation time
       // https://docs.joinmastodon.org/admin/config/#web_domain
       try {
-        const res = await fetch(`https://${instanceURL}/.well-known/host-meta`); // returns XML
+        const res = await fetch(`${PHANPY_SCHEME}://${instanceURL}/.well-known/host-meta`); // returns XML
         const text = await res.text();
         // Parse XML
         const parser = new DOMParser();

src/utils/auth.js

@@ -1,12 +1,13 @@
-import { generateCodeChallenge, verifier } from './oauth-pkce';
+import { generateCodeChallenge, verifier } from "./oauth-pkce";
 
 const {
+  DEV,
   PHANPY_CLIENT_NAME: CLIENT_NAME,
   PHANPY_WEBSITE: WEBSITE,
-  PHANPY_SCHEME: SCHEME = 'https',
+  PHANPY_SCHEME: SCHEME = "https",
 } = import.meta.env;
 
-const SCOPES = 'read write follow push';
+const SCOPES = "read write follow push";
 
 /*
   PHANPY_WEBSITE is set to the default official site.
@@ -33,9 +34,9 @@ export async function registerApplication({ instanceURL }) {
   const registrationResponse = await fetch(
     `${SCHEME}://${instanceURL}/api/v1/apps`,
     {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
+        "Content-Type": "application/x-www-form-urlencoded",
       },
       body: registrationParams.toString(),
     },
@@ -54,13 +55,13 @@ export async function getPKCEAuthorizationURL({
   const codeChallenge = await generateCodeChallenge(codeVerifier);
   const params = new URLSearchParams({
     client_id,
-    code_challenge_method: 'S256',
+    code_challenge_method: "S256",
     code_challenge: codeChallenge,
     redirect_uri: REDIRECT_URI,
-    response_type: 'code',
+    response_type: "code",
     scope: SCOPES,
   });
-  if (forceLogin) params.append('force_login', true);
+  if (forceLogin) params.append("force_login", true);
   const authorizationURL = `https://${instanceURL}/oauth/authorize?${params.toString()}`;
   return [authorizationURL, codeVerifier];
 }
@@ -75,9 +76,9 @@ export async function getAuthorizationURL({
     scope: SCOPES,
     redirect_uri: REDIRECT_URI,
     // redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
-    response_type: 'code',
+    response_type: "code",
   });
-  if (forceLogin) authorizationParams.append('force_login', true);
+  if (forceLogin) authorizationParams.append("force_login", true);
   const authorizationURL = `${SCHEME}://${instanceURL}/oauth/authorize?${authorizationParams.toString()}`;
   return authorizationURL;
 }
@@ -92,22 +93,22 @@ export async function getAccessToken({
   const params = new URLSearchParams({
     client_id,
     redirect_uri: REDIRECT_URI,
-    grant_type: 'authorization_code',
+    grant_type: "authorization_code",
     code,
     // scope: SCOPES, // Not needed
     // client_secret,
     // code_verifier,
   });
   if (client_secret) {
-    params.append('client_secret', client_secret);
+    params.append("client_secret", client_secret);
   }
   if (code_verifier) {
-    params.append('code_verifier', code_verifier);
+    params.append("code_verifier", code_verifier);
   }
   const tokenResponse = await fetch(`${SCHEME}://${instanceURL}/oauth/token`, {
-    method: 'POST',
+    method: "POST",
     headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
+      "Content-Type": "application/x-www-form-urlencoded",
     },
     body: params.toString(),
   });
@@ -130,17 +131,17 @@ export async function revokeAccessToken({
     });
 
     const revokeResponse = await fetch(`https://${instanceURL}/oauth/revoke`, {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
+        "Content-Type": "application/x-www-form-urlencoded",
       },
       body: params.toString(),
       keepalive: true,
     });
 
     return revokeResponse.ok;
   } catch (error) {
-    console.erro('Error revoking token', error);
+    console.erro("Error revoking token", error);
     return false;
   }
 }