From b4eb230b3d977be5fd48bfe9beac47de8d3ff3a0 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sun, 16 Mar 2025 12:28:01 +0100
Subject: [PATCH 1/3] (auth) attempt to fix mastodon & indieauth

---
 server/express/user.ts | 3 ++-
 src/socialProviders.ts | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/express/user.ts b/server/express/user.ts
index 0e7b5a286..7761a70e4 100644
--- a/server/express/user.ts
+++ b/server/express/user.ts
@@ -39,6 +39,7 @@ import { addMfaInfo } from './mfa.ts';
 
 import { getLocale, loadConfig, loadTranslator } from '~/server/data.ts';
 import type { Translator } from '~/src/translator.ts';
+import { getUrlForLocale } from '~/src/domain.ts';
 
 export interface UserRow {
     id: string;
@@ -795,7 +796,7 @@ router.get('/user/social/:provider', handleErrorAsync(async (req, res) => {
             return `/${config.user.route}`;
         }
         const host = env === 'development' || process.env.NUXT_PUBLIC_ENV === 'test'
-            ? ''
+            ? getUrlForLocale(req.session.socialRedirect)
             : buildLocaleList(config.locale, true)[req.session.socialRedirect].url;
         delete req.session.socialRedirect;
 
diff --git a/src/socialProviders.ts b/src/socialProviders.ts
index 160c3643a..650b7ba41 100644
--- a/src/socialProviders.ts
+++ b/src/socialProviders.ts
@@ -18,6 +18,7 @@ export const socialProviders: Record<string, SocialProvider> = {
             return `^https?://(?:www.)?${p.name.split('@')[1]}/(?:(?:web/)?@|users/)?${p.name.split('@')[0]}/?$`;
         },
         avatars: true,
+        redirectViaHome: true,
     },
     indieauth: {
         name: 'IndieAuth',
@@ -27,6 +28,7 @@ export const socialProviders: Record<string, SocialProvider> = {
         icon: 'indieauth.png',
         iconMargin: true,
         avatars: false,
+        redirectViaHome: true,
     },
     discord: {
         name: 'Discord',

From 96ff0ccd74d1f8427cc274dc7f3908e351ec036d Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sun, 16 Mar 2025 12:56:27 +0100
Subject: [PATCH 2/3] (auth)(bug) disable node-cluster, it's possible that it's
 breaking social login

---
 nuxt.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuxt.config.ts b/nuxt.config.ts
index cec5af8a6..889d5679e 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -113,7 +113,7 @@ export default defineNuxtConfig({
         esbuild: {
             options: esBuildOptions,
         },
-        preset: 'node-cluster',
+        // preset: 'node-cluster',
     },
     serverHandlers: [
         {

From 7820291e10effd4b3cdb1fcde90deca7892fc67d Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sun, 16 Mar 2025 13:11:03 +0100
Subject: [PATCH 3/3] lint

---
 server/express/user.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/express/user.ts b/server/express/user.ts
index 7761a70e4..7f8190e26 100644
--- a/server/express/user.ts
+++ b/server/express/user.ts
@@ -38,8 +38,8 @@ import type { SocialProfilePayload } from '../social.ts';
 import { addMfaInfo } from './mfa.ts';
 
 import { getLocale, loadConfig, loadTranslator } from '~/server/data.ts';
-import type { Translator } from '~/src/translator.ts';
 import { getUrlForLocale } from '~/src/domain.ts';
+import type { Translator } from '~/src/translator.ts';
 
 export interface UserRow {
     id: string;