From 14445aeb141e5fb9a41dfcb1e0e33ead6af0fedc Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Mon, 24 Aug 2020 16:42:47 +0300
Subject: [PATCH] do not use remember_me, set cookie expiration

---
 app/controllers/api/user_token_controller.rb       | 4 +---
 config/initializers/session_cookie.rb              | 1 +
 spec/controllers/api/user_token_controller_spec.rb | 6 ------
 3 files changed, 2 insertions(+), 9 deletions(-)
 create mode 100644 config/initializers/session_cookie.rb

diff --git a/app/controllers/api/user_token_controller.rb b/app/controllers/api/user_token_controller.rb
index 6d21b38..2f64c9e 100644
--- a/app/controllers/api/user_token_controller.rb
+++ b/app/controllers/api/user_token_controller.rb
@@ -47,8 +47,6 @@ class Api::UserTokenController < Knock::AuthTokenController
   private
 
   def sign_in_user
-    if sign_in(entity)
-      remember_me(entity)
-    end
+    sign_in(entity)
   end
 end
diff --git a/config/initializers/session_cookie.rb b/config/initializers/session_cookie.rb
new file mode 100644
index 0000000..4caf103
--- /dev/null
+++ b/config/initializers/session_cookie.rb
@@ -0,0 +1 @@
+Rails.application.config.session_store :cookie_store, key: '_easy_release_session', expire_after: 1.month
\ No newline at end of file
diff --git a/spec/controllers/api/user_token_controller_spec.rb b/spec/controllers/api/user_token_controller_spec.rb
index 5b88d36..cb01e35 100644
--- a/spec/controllers/api/user_token_controller_spec.rb
+++ b/spec/controllers/api/user_token_controller_spec.rb
@@ -13,7 +13,6 @@ RSpec.describe Api::UserTokenController, type: :request do
       expect(response).to be_successful
       expect(response.body).to match record_not_found
       expect(cookie_data).to eq nil
-      expect(rtfuser_cookie).to eq nil
     end
 
     it 'sends token and cookie if credentials are correct' do
@@ -23,7 +22,6 @@ RSpec.describe Api::UserTokenController, type: :request do
       expect(response.body).not_to match record_not_found
       expect(response.body).to match token_response
       expect(cookie_data).not_to eq nil
-      expect(rtfuser_cookie).not_to eq nil
     end
   end
 
@@ -62,8 +60,4 @@ RSpec.describe Api::UserTokenController, type: :request do
   def cookie_data
     cookies[:_easy_release_session]
   end
-
-  def rtfuser_cookie
-    cookies[:_rtfuser]
-  end
 end