mn_utils_gem 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dd7f0e45d09dbe91d637ca39b4803c5ace35bf1a291bb0a8f24d3eab25ec180
-  data.tar.gz: 2ceebf3260f7d4583a51748dc6f43d261fc71ec83252a8a7491048ef599510f1
+  metadata.gz: 6e7292a8e70611c5bf7971d203841260cc3b2d7a84f87f249a82c0caac84175a
+  data.tar.gz: f6de5171379b867c8f1d002e61a1eb4d4c705437dcdd179c8d98c5e8b9485f82
 SHA512:
-  metadata.gz: 6138e24185e22071e28e1df512ba08be07b36380d1fa67d8a2b549e52d5e6bd5a16a16d14f47177401ed41bc0fb8ebdcae60c06f4fa33d6d3420b2e01d4d560b
-  data.tar.gz: eef8b9f1a42ddc7e0b30796ae0b312e33828c3f83f7fc39d23d87d34d070a2745c5a219b27b3d307b089e7bb1eab83a5fc91edab946b4d352f6cfd8b561340f0
+  metadata.gz: e04c99269319b133fdd37462a02933123097b111f8543ad0d9a2184d209512cc8382e80f93b2e879501816fbd37e366751817be73e13803954a20b62b83122a4
+  data.tar.gz: bb1619401461f39a203bb075a481117dc137fe98c5430a72c8a0d19aa309715c190680f8fd381d9086532da4680af4e7df5803fb381061e7954c9edc20aebfe8

data/lib/mn_utils_gem/sso.rb

@@ -14,6 +14,10 @@ module MnUtilsAuth
     end
 
     def get_sso_user_id(cookies)
+      raise ArgumentError, "ENV['MN_REDIS_URL'] is required" \
+          unless ENV.key? 'MN_REDIS_URL'
+      raise ArgumentError, "ENV['COOKIE_DOMAIN'] is required" \
+          unless ENV.key? 'COOKIE_DOMAIN'
       parsed = get_sso cookies
       return nil if parsed.nil?
       parsed[:user_id]
@@ -23,9 +27,13 @@ module MnUtilsAuth
     end
 
     def get_sso(cookies)
+      raise ArgumentError, "ENV['MN_REDIS_URL'] is required" \
+          unless ENV.key? 'MN_REDIS_URL'
+      raise ArgumentError, "ENV['COOKIE_DOMAIN'] is required" \
+          unless ENV.key? 'COOKIE_DOMAIN'
       return RequestStore.store[:sso] if RequestStore.store[:sso]
       return nil if cookies.nil? || cookies[SSO_COOKIE_NAME].nil? || redis_server.nil?
-      json = redis_server.get(cookies[SSO_COOKIE_NAME].to_s)
+      json = redis_server.get(cookies[SSO_COOKIE_NAME])
       return nil if json.nil?
       parsed = JSON.parse(json, symbolize_names: true)
       return nil unless parsed.is_a?(Hash)
@@ -36,21 +44,32 @@ module MnUtilsAuth
       nil
     end
 
-    def set_sso(cookies, user_id, other_attributes = {})
-      @logger.debug "in set_sso 1"
-      return if cookies.nil? || user_id.blank? || redis_server.nil? || RequestStore.store[:sso]
-      @logger.debug "in set_sso 2"
+    def set_sso(cookies, user_id, persistent, other_attributes = {})
+      raise ArgumentError, "ENV['MN_REDIS_URL'] is required" \
+          unless ENV.key? 'MN_REDIS_URL'
+      raise ArgumentError, "ENV['COOKIE_DOMAIN'] is required" \
+          unless ENV.key? 'COOKIE_DOMAIN'
+      return if cookies.nil? || user_id.blank? || RequestStore.store[:sso] || redis_server.nil?
+      value = other_attributes.reverse_merge({ user_id: user_id })
+      redis_ttl = (persistent) ? 1.year.to_i : 1.day.to_i
       if cookies[SSO_COOKIE_NAME].nil?
-        @logger.debug "in set_sso 3 #{cookies[SSO_COOKIE_NAME]}"
-        cookie = set_sso_cookie cookies
-        @logger.debug "in set_sso 4 #{cookie}"
-        value = other_attributes.reverse_merge({ user_id: user_id })
-        redis_server.set(cookie, JSON[value])
+        cookie = set_sso_cookie cookies, persistent
+        redis_server.set(cookie, JSON[value], ex: redis_ttl)
         RequestStore.store[:sso] = value
+      else
+        if !redis_server.get(cookies[SSO_COOKIE_NAME])
+          cookie = set_sso_cookie cookies, persistent
+          redis_server.set(cookie, JSON[value], ex: redis_ttl)
+          RequestStore.store[:sso] = value
+        end
       end
     end
 
     def delete_sso(cookies)
+      raise ArgumentError, "ENV['MN_REDIS_URL'] is required" \
+          unless ENV.key? 'MN_REDIS_URL'
+      raise ArgumentError, "ENV['COOKIE_DOMAIN'] is required" \
+          unless ENV.key? 'COOKIE_DOMAIN'
       if cookies[SSO_COOKIE_NAME]
         redis_server.del(cookies[SSO_COOKIE_NAME])
         cookies.delete SSO_COOKIE_NAME
@@ -62,10 +81,12 @@ module MnUtilsAuth
 
     private
 
-    def set_sso_cookie(cookies)
+    def set_sso_cookie(cookies, persistent)
+      expiry = persistent ? 1.year.from_now : 1.day.from_now
       cookies[SSO_COOKIE_NAME] = {
           value: cookie_value,
-          expires: 1.year.from_now,
+          domain: ENV['COOKIE_DOMAIN'],
+          expires: expiry,
           secure: true,
           httponly: true
       }

data/lib/mn_utils_gem/version.rb

@@ -1,3 +1,3 @@
 module MnUtilsGem
-  VERSION = "1.14.1"
+  VERSION = "1.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn_utils_gem
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.0
 platform: ruby
 authors:
 - Shamim Mirzai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gelf