Fix OAuth login on custom domains (#320)

2025-12-15 19:27:52 +01:00 · 2024-03-28 12:29:54 +01:00
parent b63956a173
commit e887bca9cf
9 changed files with 42 additions and 25 deletions
--- a/app/views/devise/shared/_o_auths.html.erb
+++ b/app/views/devise/shared/_o_auths.html.erb
@@ -10,6 +10,7 @@
          oAuthLogo: o_auth.logo,
          oAuthReason: "login",
          isSignUp: defined?(is_sign_up) ? is_sign_up : false,
+          href: get_url_for(method(:o_auth_start_url), resource: o_auth.id, disallow_custom_domain: true, options: { reason: "login" }),
        }
      )
    %>
--- a/app/views/site_settings/general.html.erb
+++ b/app/views/site_settings/general.html.erb
@@ -19,6 +19,7 @@
            locale: @tenant.locale
          },
          boards: @tenant.boards.order(order: :asc),
+          isMultiTenant: Rails.application.multi_tenancy?,
          authenticityToken: form_authenticity_token
        }
      )