[bug fix] Cannot change account email from user settings (#1403)

Addresses: #1375 Demo: https://user-images.githubusercontent.com/50227291/216375346-430563ab-382e-4c21-a1f5-2aca95f6e4b2.mov Co-authored-by: Pralish Kayastha <[email protected]>
restarone · Feb 6, 2023 · 567bcf8 · 567bcf8
1 parent a1c806e
commit 567bcf8
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 3 deletions.
diff --git a/app/models/subdomain.rb b/app/models/subdomain.rb
@@ -163,6 +163,10 @@ def send_analytics_report
     UserMailer.analytics_report(self).deliver_later
   end
 
+  def subdomain_name
+    self.name == Subdomain::ROOT_DOMAIN_NAME ? 'www' : self.name
+  end
+
   private
 
   def change_2fa_setting 

diff --git a/app/views/shared/_company_logo.haml b/app/views/shared/_company_logo.haml
@@ -1,5 +1,5 @@
 - if Subdomain.current.logo.attached? 
   = link_to root_url(subdomain: Subdomain.current.name), target: '_blank', class: 'd-flex justify-content-center align-items-center' do
-    - path = rails_blob_url(Subdomain.current.logo, subdomain: Subdomain.current.name == Subdomain::ROOT_DOMAIN_NAME ? 'www' : Subdomain.current.name)
+    - path = rails_blob_url(Subdomain.current.logo, subdomain: Subdomain.current.subdomain_name)
     = image_tag(path, class: 'd-none d-lg-block img-fluid p-4', size: '150x150')
 
diff --git a/app/views/users/mailer/confirmation_instructions.html.haml b/app/views/users/mailer/confirmation_instructions.html.haml
@@ -2,4 +2,4 @@
 %p
   = "Welcome #{@email}!"
 %p You can confirm your account email through the link below:
-%p= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token, subdomain: Subdomain.current.name)
+%p= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token, subdomain: Subdomain.current.subdomain_name)
diff --git a/config/sitemap.rb b/config/sitemap.rb
@@ -4,7 +4,7 @@
 
 
 Subdomain.all.each do |subdomain|
-  subdomain_name = subdomain.name == Subdomain::ROOT_DOMAIN_NAME ? 'www' : subdomain.name
+  subdomain_name = subdomain.subdomain_name
   sitemap_path = "/sitemaps/#{subdomain_name}/sitemap.xml.gz"
   SitemapGenerator::Sitemap.default_host = "https://#{subdomain_name}.#{ENV['APP_HOST']}"
   SitemapGenerator::Sitemap.sitemaps_path = "sitemaps/#{subdomain_name}"

diff --git a/test/controllers/users/registrations_controller_test.rb b/test/controllers/users/registrations_controller_test.rb
@@ -394,4 +394,28 @@ class Users::RegistrationsControllerTest < ActionDispatch::IntegrationTest
     get edit_user_registration_path
     assert_nil session[:otp_user_id]
   end
+
+  test '#update email: should send confirmation email with correct confirmation url' do
+    payload = {
+      user: {
+        email: '[email protected]',
+        current_password: '123456'
+      }
+    }
+    assert_changes "Devise.mailer.deliveries.size", +1 do    
+      sign_in(@user)
+      patch user_registration_url, params: payload
+    end
+
+    assert_includes Devise.mailer.deliveries.last.body.to_s, "http://public.localhost/users/confirmation?confirmation_token=#{@user.reload.confirmation_token}"
+
+    Subdomain.current.update(name: 'root')
+
+    assert_changes "Devise.mailer.deliveries.size", +1 do    
+      sign_in(@user)
+      patch user_registration_url, params: payload
+    end
+
+    assert_includes Devise.mailer.deliveries.last.body.to_s, "http://www.localhost/users/confirmation?confirmation_token=#{@user.reload.confirmation_token}"  
+  end
 end
diff --git a/test/models/subdomain_test.rb b/test/models/subdomain_test.rb
@@ -195,4 +195,16 @@ class SubdomainTest < ActiveSupport::TestCase
       end
     end
   end
+
+  test 'subdomain_name when name is not ROOT_DOMAIN_NAME' do
+    ENV['APP_HOST']="lvh.me:5250"
+    subdomain = Subdomain.new(name: "test")
+    assert_equal 'test', subdomain.subdomain_name
+  end
+
+  test 'subdomain_name when name is ROOT_DOMAIN_NAME' do
+    ENV['APP_HOST']="lvh.me:5250"
+    subdomain = Subdomain.new(name: Subdomain::ROOT_DOMAIN_NAME)
+    assert_equal 'www', subdomain.subdomain_name
+  end
 end