mn_utils_gem 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e7292a8e70611c5bf7971d203841260cc3b2d7a84f87f249a82c0caac84175a
-  data.tar.gz: f6de5171379b867c8f1d002e61a1eb4d4c705437dcdd179c8d98c5e8b9485f82
+  metadata.gz: ce04246925c9e620cad30e8f2899be5f9f833a3d897ddd8f8bb41574c9412ced
+  data.tar.gz: f423d16543105226239e6824cb258b03f9f32fecac6764051fb02914d22e9da0
 SHA512:
-  metadata.gz: e04c99269319b133fdd37462a02933123097b111f8543ad0d9a2184d209512cc8382e80f93b2e879501816fbd37e366751817be73e13803954a20b62b83122a4
-  data.tar.gz: bb1619401461f39a203bb075a481117dc137fe98c5430a72c8a0d19aa309715c190680f8fd381d9086532da4680af4e7df5803fb381061e7954c9edc20aebfe8
+  metadata.gz: f99670585184657c736a94abcfe2d67d42f03e2c36c71af7acef0ab390b7dd073e45efa6e3199dcdfae2f743ca17797576e93aebbcd690f62492f0a4196e3aa0
+  data.tar.gz: e68a6200d6d7568571966a4e0cb7bab9caca041ba1eb0245eb85951a864761412d618795d35da9c5f3fa4838dac1e7c45168764839bef74f862659571d150448

data/lib/mn_utils_gem.rb

@@ -1,4 +1,5 @@
 require "mn_utils_gem/version"
+require "mn_utils_gem/string_to_bool"
 require "mn_utils_gem/site_action"
 require "mn_utils_gem/gui"
 require "mn_utils_gem/transactional_email"

data/lib/mn_utils_gem/sso.rb

@@ -16,8 +16,6 @@ module MnUtilsAuth
     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]
@@ -29,8 +27,6 @@ module MnUtilsAuth
     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])
@@ -47,29 +43,19 @@ module MnUtilsAuth
     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?
+      if cookies[SSO_COOKIE_NAME].nil? || !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
-      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
@@ -85,7 +71,6 @@ module MnUtilsAuth
       expiry = persistent ? 1.year.from_now : 1.day.from_now
       cookies[SSO_COOKIE_NAME] = {
           value: cookie_value,
-          domain: ENV['COOKIE_DOMAIN'],
           expires: expiry,
           secure: true,
           httponly: true
@@ -96,7 +81,7 @@ module MnUtilsAuth
     def redis_server
       @redis_server ||= Redis.new(
           url: ENV['MN_REDIS_URL'],
-          ssl: SharedService.string_to_bool(ENV['MN_REDIS_SSL']),
+          ssl: ENV['MN_REDIS_SSL'].to_bool,
           semian: {
               name: 'user-service',
               tickets: 4,

data/lib/mn_utils_gem/version.rb

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

metadata

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