Merge 99e5c1036d into 7376cb1e99

src/pages/login.jsx

@@ -12,7 +12,7 @@ import { getAuthorizationURL, registerApplication } from '../utils/auth';
 import store from '../utils/store';
 import useTitle from '../utils/useTitle';
 
-const { PHANPY_DEFAULT_INSTANCE: DEFAULT_INSTANCE } = import.meta.env;
+const { PHANPY_DEFAULT_INSTANCE: DEFAULT_INSTANCE, PHANPY_SCHEME: SCHEME = 'https' } = import.meta.env;
 
 function Login() {
   useTitle('Log in');
@@ -85,9 +85,11 @@ function Login() {
         .replace(/^@?[^@]+@/, '') // Remove @?acct@
         .trim()
     : null;
-  const instanceTextLooksLikeDomain =
-    /[^\s\r\n\t\/\\]+\.[^\s\r\n\t\/\\]+/.test(cleanInstanceText) &&
-    !/[\s\/\\@]/.test(cleanInstanceText);
+  const instanceTextLooksLikeDomain = 
+    (/[^\s\r\n\t\/\\]+\.[^\s\r\n\t\/\\]+/.test(cleanInstanceText) &&
+    !/[\s\/\\@]/.test(cleanInstanceText)) || SCHEME === "http";
+
+  console.log(SCHEME)
 
   const instancesSuggestions = cleanInstanceText
     ? instancesList

src/utils/api.js

@@ -10,6 +10,8 @@ import {
   setCurrentAccountID,
 } from './store-utils';
 
+const { PHANPY_SCHEME: SCHEME = 'https' } = import.meta.env;
+
 // Default *fallback* instance
 const DEFAULT_INSTANCE = 'mastodon.social';
 
@@ -37,7 +39,9 @@ export function initClient({ instance, accessToken }) {
       .replace(/\/+$/, '')
       .toLowerCase();
   }
-  const url = instance ? `https://${instance}` : `https://${DEFAULT_INSTANCE}`;
+  const url = instance
+    ? `${SCHEME}://${instance}`
+    : `${SCHEME}://${DEFAULT_INSTANCE}`;
 
   const masto = createRestAPIClient({
     url,

src/utils/auth.js

@@ -1,5 +1,8 @@
-const { PHANPY_CLIENT_NAME: CLIENT_NAME, PHANPY_WEBSITE: WEBSITE } = import.meta
-  .env;
+const {
+  PHANPY_CLIENT_NAME: CLIENT_NAME,
+  PHANPY_WEBSITE: WEBSITE,
+  PHANPY_SCHEME: SCHEME = 'https',
+} = import.meta.env;
 
 const SCOPES = 'read write follow push';
 
@@ -11,7 +14,7 @@ export async function registerApplication({ instanceURL }) {
     website: WEBSITE,
   });
   const registrationResponse = await fetch(
-    `https://${instanceURL}/api/v1/apps`,
+    `${SCHEME}://${instanceURL}/api/v1/apps`,
     {
       method: 'POST',
       headers: {
@@ -33,7 +36,7 @@ export async function getAuthorizationURL({ instanceURL, client_id }) {
     // redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
     response_type: 'code',
   });
-  const authorizationURL = `https://${instanceURL}/oauth/authorize?${authorizationParams.toString()}`;
+  const authorizationURL = `${SCHEME}://${instanceURL}/oauth/authorize?${authorizationParams.toString()}`;
   return authorizationURL;
 }
 
@@ -51,7 +54,7 @@ export async function getAccessToken({
     code,
     scope: SCOPES,
   });
-  const tokenResponse = await fetch(`https://${instanceURL}/oauth/token`, {
+  const tokenResponse = await fetch(`${SCHEME}://${instanceURL}/oauth/token`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',