Fix login with alternative domain

cheeaun · Dec 26, 2024 · ef44251 · ef44251
1 parent 8d23087
commit ef44251
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 18 deletions.
diff --git a/src/pages/login.css b/src/pages/login.css
@@ -60,3 +60,9 @@
   color: var(--text-insignificant-color);
   font-style: italic;
 }
+
+#settings input {
+  width: revert;
+  display: inline;
+  margin-top: 0.25em;
+}
diff --git a/src/pages/login.jsx b/src/pages/login.jsx
@@ -30,10 +30,14 @@ function Login() {
   const [uiState, setUIState] = useState('default');
   const [searchParams] = useSearchParams();
   const instance = searchParams.get('instance');
+  const isWebDomainParam = searchParams.get('is_web_domain');
   const submit = searchParams.get('submit');
   const [instanceText, setInstanceText] = useState(
     instance || cachedInstanceURL?.toLowerCase() || '',
   );
+  const [isWebDomain, setIsWebDomain] = useState(
+    isWebDomainParam || false,
+  );
 
   const [instancesList, setInstancesList] = useState([]);
   const searcher = useRef();
@@ -63,24 +67,26 @@ function Login() {
     (async () => {
       // 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 text = await res.text();
-        // Parse XML
-        const parser = new DOMParser();
-        const xmlDoc = parser.parseFromString(text, 'text/xml');
-        // Get Link[template]
-        const link = xmlDoc.getElementsByTagName('Link')[0];
-        const template = link.getAttribute('template');
-        const url = URL.parse(template);
-        const { host } = url; // host includes the port
-        if (instanceURL !== host) {
-          console.log(`💫 ${instanceURL} -> ${host}`);
-          instanceURL = host;
+      if (!isWebDomain) {
+        try {
+          const res = await fetch(`https://${instanceURL}/.well-known/host-meta`); // returns XML
+          const text = await res.text();
+          // Parse XML
+          const parser = new DOMParser();
+          const xmlDoc = parser.parseFromString(text, 'text/xml');
+          // Get Link[template]
+          const link = xmlDoc.getElementsByTagName('Link')[0];
+          const template = link.getAttribute('template');
+          const url = URL.parse(template);
+          const { host } = url; // host includes the port
+          if (instanceURL !== host) {
+            console.log(`💫 ${instanceURL} -> ${host}`);
+            instanceURL = host;
+          }
+        } catch (e) {
+          // Silently fail
+          console.error(e);
         }
-      } catch (e) {
-        // Silently fail
-        console.error(e);
       }
 
       store.local.set('instanceURL', instanceURL);
@@ -257,6 +263,18 @@ function Login() {
               : t`Continue`}
           </button>{' '}
         </div>
+        <div id='settings'>
+          <label>
+            <input
+              type="checkbox"
+              checked={isWebDomain}
+              onChange={(e) => {
+                setIsWebDomain(e.target.checked);
+              }}
+            />{' '}
+            <Trans>This is the Web Domain used by Mastodon</Trans>
+          </label>
+        </div>
         <Loader hidden={uiState !== 'loading'} />
         <hr />
         {!DEFAULT_INSTANCE && (

diff --git a/src/pages/welcome.jsx b/src/pages/welcome.jsx
@@ -57,7 +57,7 @@ function Welcome() {
             <Link
               to={
                 DEFAULT_INSTANCE
-                  ? `/login?instance=${DEFAULT_INSTANCE}&submit=1`
+                  ? `/login?instance=${DEFAULT_INSTANCE}&submit=1&is_web_domain=true`
                   : '/login'
               }
               class="button"