From 646c95ecc2663f4abdce26655bf2296712b465f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Sun, 27 Apr 2025 16:09:32 +0400
Subject: [PATCH] Fix local/development RS auth URL

---
 app/controllers/webfinger_controller.rb                 | 2 +-
 app/models/concerns/settings/remote_storage_settings.rb | 3 +++
 app/views/services/remotestorage/show.html.erb          | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/controllers/webfinger_controller.rb b/app/controllers/webfinger_controller.rb
index f3bf08d..7b28719 100644
--- a/app/controllers/webfinger_controller.rb
+++ b/app/controllers/webfinger_controller.rb
@@ -74,7 +74,7 @@ class WebfingerController < WellKnownController
   end
 
   def remotestorage_link
-    auth_url = new_rs_oauth_url(@username, host: Setting.accounts_domain)
+    auth_url = new_rs_oauth_url(@username, host: Setting.rs_accounts_domain)
     storage_url = "#{Setting.rs_storage_url}/#{@username}"
 
     {
diff --git a/app/models/concerns/settings/remote_storage_settings.rb b/app/models/concerns/settings/remote_storage_settings.rb
index 0290e25..00f8984 100644
--- a/app/models/concerns/settings/remote_storage_settings.rb
+++ b/app/models/concerns/settings/remote_storage_settings.rb
@@ -6,6 +6,9 @@ module Settings
       field :remotestorage_enabled, type: :boolean,
         default: ENV["RS_STORAGE_URL"].present?
 
+      field :rs_accounts_domain, type: :string,
+        default: ENV["RS_AKKOUNTS_DOMAIN"] || ENV["AKKOUNTS_DOMAIN"]
+
       field :rs_storage_url, type: :string,
         default: ENV["RS_STORAGE_URL"].presence
 
diff --git a/app/views/services/remotestorage/show.html.erb b/app/views/services/remotestorage/show.html.erb
index 5510773..e4146e9 100644
--- a/app/views/services/remotestorage/show.html.erb
+++ b/app/views/services/remotestorage/show.html.erb
@@ -14,8 +14,9 @@
     <p class="mb-6">
       In order to connect an app to your storage account, give it your address:
     </p>
-    <p data-controller="clipboard" class="flex items-center gap-1 sm:w-2/5">
-      <img src="/img/logos/icon_remotestorage.svg" class="inline-block h-6 w-6 mr-1">
+    <p data-controller="clipboard" class="flex gap-1 sm:w-2/5">
+      <img src="/img/logos/icon_remotestorage.svg"
+           class="inline-block h-6 w-6 mr-1 self-center">
       <input type="text" id="user_address" class="grow"
              value=<%= current_user.address %> disabled="disabled"
              data-clipboard-target="source" />