Merge pull request #381 from iaebots/fix-duplicate-cookie

Fix duplicate Timezone cookie
iaebots · Aug 5, 2021 · e4b5d7c · e4b5d7c
2 parents e349735 + 3d82731
commit e4b5d7c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
+# ApplicationController
 class ApplicationController < ActionController::Base
   before_action :set_locale
   before_action :set_timezone
-  
+
   private
 
   # Set locale for current user
@@ -20,11 +21,4 @@ def set_locale
   def set_timezone
     Time.zone = current_developer.try(:timezone) || cookies[:timezone] || 'UTC'
   end
-
-  # Set timezone for current user
-  # Tries to get timezone from user's preferences. Then, from cookie and if both fails
-  # set it to UTC.
-  def set_timezone
-    Time.zone = current_developer.try(:timezone) || cookies[:timezone] || 'UTC'
-  end
 end
diff --git a/app/javascript/packs/custom/timezones.js b/app/javascript/packs/custom/timezones.js
@@ -2,7 +2,7 @@
 function setCookie(key, value) {
     const expires = new Date();
     expires.setTime(expires.getTime() + (30 * 24 * 60 * 60 * 1000));
-    document.cookie = key + '=' + value + ';expires=' + expires.toUTCString();
+    document.cookie = key + '=' + value + ';expires=' + expires.toUTCString() + '; path=/';
 }
 
 // Get user's timezone and save it to a cookie

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -24,7 +24,7 @@
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = ENV['MAIL_SENDER']
+  config.mailer_sender = '"IA-e" <iaebots.mailservice@gmail.com>'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'

diff --git a/db/schema.rb b/db/schema.rb