cxf 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c8cbe1cc3db14801bba1018da757262a9dfc3c7fc181aa662cd8587cd22fdd5
-  data.tar.gz: 5194302848b46fc2bdafb6de8ebbed78cfe3f7b9f31fe4de37a25e7ccfbcd686
+  metadata.gz: 6f4d4438ad88e14b53649c99f16ade67766fe99131d5be687e0c45da71d7ffbc
+  data.tar.gz: b4c881f37d39e448ee993c87e26f1b3722a344d6a5f06f455b733867d24c91f7
 SHA512:
-  metadata.gz: 12490c8b54f73f9d46294f704e39ea6031af993231d43aa4b62c664c3c9457acae14e3a03bddef9340bcc91ca53d91709a77b277f0f4d21c8d6445d237dfb726
-  data.tar.gz: e772e7072cf77ae9134dcd2fea2149d4dff0249b706f19b2b318a8bef052b9a1d19060f2bfef125f246e2fd5823c703f7e88f2bfecd0d54040255ae9692fdf67
+  metadata.gz: 9b806f588681360912cbdf98932d6f061e64407158a898c56de54a9262461fe7d519688784b0af1b240745f7fa45b493878f04c6cb09400be79ca43f1d6bebd0
+  data.tar.gz: b09c53002f03c0ad50b8a93610b71c1ee8ba3fa474acb155c59f7175207f6cae7d1f85fc6c6734e23acc669af1e37312192eebeaaee27f1fe4bde48d942bcb88

data/lib/client.rb

@@ -13,7 +13,7 @@ module Cxf
     include CxfHelper
 
     attr_reader :host, :mode, :api_key, :scope, :base_url
-    attr_accessor :session_token, :refresh_token, :contact_token_id, :session_token_expires_at, :refresh_token_expires_at, :user_agent
+    attr_accessor :session_token, :refresh_token, :contact_token_id, :user_agent
 
     def initialize(
       host,
@@ -30,9 +30,7 @@ module Cxf
       @host = host
       @api_key = api_key
       @session_token = session_token
-      @session_token_expires_at = nil
       @refresh_token = refresh_token
-      @refresh_token_expires_at = nil
       @contact_token_id = contact_token_id
       @visit_id = visit_id
       @debug = debug
@@ -380,7 +378,7 @@ module Cxf
 
         if !is_success and !ignore_http_errors
           title = "Request failed with status #{http_status}"
-          detail = response&.parsed_response["message"] ||response&.response&.message || 'Unknown error'
+          detail = response&.parsed_response["message"] || response&.response&.message || 'Unknown error'
 
           if @debug
             puts "Error detected: #{http_status}"
@@ -447,12 +445,25 @@ module Cxf
       return unless response&.headers
 
       # Return if the response does not have headers Access-Token and Refresh-Token
-      return unless response.headers.key?('Access-Token') && response.headers.key?('Refresh-Token')
+      return unless response.headers.key?('Set-Cookie')
+      parsed_cookie = parse_set_cookie(response.headers['Set-Cookie'])
+      return unless parsed_cookie['Access-Token'] || parsed_cookie['Refresh-Token']
 
-      @session_token = response.headers['Access-Token']
-      @refresh_token = response.headers['Refresh-Token']
-      @session_token_expires_at = Time.parse(response.headers['Access-Token-Expires-At'])
-      @refresh_token_expires_at = Time.parse(response.headers['Refresh-Token-Expires-At'])
+      @session_token = parsed_cookie['Access-Token'] if parsed_cookie['Access-Token']
+      @refresh_token = parsed_cookie['Refresh-Token'] if parsed_cookie['Refresh-Token']
+    end
+
+    def parse_set_cookie(set_cookie)
+      set_cookie = set_cookie.split(', ')
+      cookies_hash = {}
+
+      set_cookie.each do |cookie|
+        key, value = cookie.split('=')
+        value = value.split(';')[0]
+        cookies_hash[key] = value
+      end
+
+      cookies_hash
     end
   end
 end

data/lib/contact.rb

@@ -93,6 +93,8 @@ module Cxf
         password: password
       }
       response = @client.raw('post', '/contacts/login', nil, data_transform(data))
+
+      return response unless response.is_a? Hash
       if response.key? 'data' and response['data'].key? 'access_token'
         @client.session_token = response['data']['access_token']
         @client.refresh_token = response['data']['refresh_token']

data/lib/cxf/controllers/concerns/cxf_clients.rb

@@ -62,8 +62,8 @@ module CxfClients
   # Initialize the contact client and set the contact token
   def set_cxf_contact_client
     # Initialize cxf contact client
-    contact_session_token = cookies[:cxf_contact_session_token]
-    contact_refresh_token = cookies[:cxf_contact_refresh_token]
+    contact_session_token = cookies["cxf_contact_session_token"]
+    contact_refresh_token = cookies["cxf_contact_refresh_token"]
     contact_token_id = cookies[:cxf_contact_id] || nil
     user_agent = request.user_agent
     @cxf_contact = Cxf::Contact.new(
@@ -82,8 +82,8 @@ module CxfClients
   # Initialize the user client
   def set_cxf_user_client
     # Initialize cxf user client
-    user_session_token = cookies[:cxf_user_session_token]
-    user_refresh_token = cookies[:cxf_user_refresh_token]
+    user_session_token = cookies["cxf_user_session_token"]
+    user_refresh_token = cookies["cxf_user_refresh_token"]
     user_agent = request.user_agent
     @cxf_user = Cxf::User.new(
       @host,

data/lib/cxf/helpers/contact_auth_helper.rb

@@ -7,15 +7,18 @@ module ContactAuthHelper
   def cxf_contact_login(email, password)
     # Login in cxf
     response = @cxf_contact.login(email, password)
+
     # Get session token from response
+    return response unless response.is_a? Hash
     if response.key? 'data'
-      session_token = response['data']['session_token']
+      session_token = response['data']['access_token']
       refresh_token = response['data']['refresh_token']
       id_token = response['data']['contact_token'] || response['data']['id_token'] || nil
     end
+
     # Set a permanent cookie with the session token
-    cookies.permanent[:cxf_contact_session_token] = { value: session_token, secure: true, httponly: true }
-    cookies.permanent[:cxf_contact_refresh_token] = { value: refresh_token, secure: true, httponly: true }
+    cookies.permanent["cxf_contact_session_token"] = { value: session_token, secure: true, httponly: true }
+    cookies.permanent["cxf_contact_refresh_token"] = { value: refresh_token, secure: true, httponly: true }
     # cookies.permanent[:cxf_contact_id] = { value: id_token, secure: true, httponly: true }
     @contact_token = id_token
   end
@@ -33,8 +36,8 @@ module ContactAuthHelper
       refresh_token = response['data']['refresh_token']
       # id_token = response['data']['contact']['contact_token'] ? response['data']['contact']['contact_token'] : response['data']['contact']['id_token']
       # Set a permanent cookie with the session token
-      cookies.permanent[:cxf_contact_session_token] = { value: session_token, secure: true, httponly: true }
-      cookies.permanent[:cxf_contact_refresh_token] = { value: refresh_token, secure: true, httponly: true }
+      cookies.permanent["cxf_contact_session_token"] = { value: session_token, secure: true, httponly: true }
+      cookies.permanent["cxf_contact_refresh_token"] = { value: refresh_token, secure: true, httponly: true }
       # cookies.permanent[:cxf_contact_id] = { value: id_token, secure: true, httponly: true }
       # @contact_token = id_token
       redirect_to response['data']['redirect_url'] || '/' if redirect_in_error
@@ -51,8 +54,8 @@ module ContactAuthHelper
     @cxf_contact.logout
     # Delete session token and keep the contact token id
     # Never delete the cxf_contact_id cookie to avoid the creation of ghosts
-    cookies.delete(:cxf_contact_session_token)
-    cookies.delete(:cxf_contact_refresh_token)
+    cookies.delete("cxf_contact_session_token")
+    cookies.delete("cxf_contact_refresh_token")
     @contact_token = nil
   end
 
@@ -66,8 +69,8 @@ module ContactAuthHelper
     rescue => e
       # Handle the client Unauthorized error
       # if cxf response is negative delete the session cookie
-      cookies.delete(:cxf_contact_session_token)
-      cookies.delete(:cxf_contact_refresh_token)
+      cookies.delete("cxf_contact_session_token")
+      cookies.delete("cxf_contact_refresh_token")
       status = false
     end
 
@@ -75,12 +78,10 @@ module ContactAuthHelper
   end
 
   def update_contact_tokens
-    access_token = @cxf_user.get_client.session_token
-    refresh_token = @cxf_user.get_client.refresh_token
-    access_token_expires_at = @cxf_user.get_client.session_token_expires_at
-    refresh_token_expires_at = @cxf_user.get_client.refresh_token_expires_at
+    access_token = @cxf_contact.get_client.session_token
+    refresh_token = @cxf_contact.get_client.refresh_token
 
-    cookies[:cxf_contact_session_token] = { value: access_token, secure: true, httponly: true, expires: Time.at(access_token_expires_at) } if access_token && access_token_expires_at
-    cookies[:cxf_contact_refresh_token] = { value: refresh_token, secure: true, httponly: true, expires: Time.at(refresh_token_expires_at) } if refresh_token && refresh_token_expires_at
+    cookies["cxf_contact_session_token"] = { value: access_token, secure: true, httponly: true} if access_token
+    cookies["cxf_contact_refresh_token"] = { value: refresh_token, secure: true, httponly: true } if refresh_token
   end
 end

data/lib/cxf/helpers/proxy_controllers_methods.rb

@@ -29,8 +29,8 @@ module ProxyControllersMethods
     }
 
     if %w[contact user].include? controller_type
-      session_token = cookies["cxf_#{controller_type}_session_token".to_sym]
-      refresh_token = cookies["cxf_#{controller_type}_refresh_token".to_sym]
+      session_token = cookies["cxf_#{controller_type}_session_token"]
+      refresh_token = cookies["cxf_#{controller_type}_refresh_token"]
       headers['Access-Token'] = session_token
       headers['Refresh-Token'] = refresh_token
     end
@@ -124,12 +124,9 @@ module ProxyControllersMethods
       # set Cookies from response headers
       if %w[contact user].include? controller_type
         config.on_response do |_status_code, response|
-          session_token_expires_at = Time.parse(response.header['Access-Token-Expires-At']) if response.header['Access-Token-Expires-At']
-          refresh_token_expires_at = Time.parse(response.header['Refresh-Token-Expires-At']) if response.header['Refresh-Token-Expires-At']
-
-          # add expires to cookies
-          cookies["cxf_#{controller_type}_session_token".to_sym] = { value: response.header['Access-Token'], secure: true, httponly: true, expires: Time.at(session_token_expires_at) } if response.header['Access-Token']
-          cookies["cxf_#{controller_type}_refresh_token".to_sym] = { value: response.header['Refresh-Token'], secure: true, httponly: true, expires: Time.at(refresh_token_expires_at) } if response.header['Refresh-Token']
+          parsed_cookie = parse_set_cookie(response.header['Set-Cookie'])
+          cookies["cxf_#{controller_type}_session_token"] = { value: parsed_cookie['Access-Token'], secure: true, httponly: true } if parsed_cookie['Access-Token']
+          cookies["cxf_#{controller_type}_refresh_token"] = { value: parsed_cookie['Refresh-Token'], secure: true, httponly: true } if parsed_cookie['Refresh-Token']
         end
       end
 
@@ -140,4 +137,19 @@ module ProxyControllersMethods
       end
     end
   end
+
+  private
+
+  def parse_set_cookie(set_cookie)
+    set_cookie = set_cookie.split(', ')
+    cookies_hash = {}
+
+    set_cookie.each do |cookie|
+      key, value = cookie.split('=')
+      value = value.split(';')[0]
+      cookies_hash[key] = value
+    end
+
+    cookies_hash
+  end
 end

data/lib/cxf/helpers/user_auth_helper.rb

@@ -8,8 +8,8 @@ module UserAuthHelper
     rescue => e
       # Handle the client Unauthorized error
       # if cxf response is negative delete the session cookie
-      cookies.delete(:cxf_user_session_token)
-      cookies.delete(:cxf_user_refresh_token)
+      cookies.delete("cxf_user_session_token")
+      cookies.delete("cxf_user_refresh_token")
       response = nil
     end
 
@@ -23,16 +23,17 @@ module UserAuthHelper
     # Login in cxf
     response = @cxf_user.login(email, password)
     # Get session token from response
+    return response unless response.is_a? Hash
     if response.key? 'data'
       session_token = response['data']['access_token']
       refresh_token = response['data']['refresh_token']
-      session_token_expires_at = Time.parse(response['data']['access_token_expires_at'])
-      refresh_token_expires_at = Time.parse(response['data']['refresh_token_expires_at'])
+      # session_token_expires_at = Time.parse(response['data']['access_token_expires_at'])
+      # refresh_token_expires_at = Time.parse(response['data']['refresh_token_expires_at'])
     end
 
     # Set a permanent cookie with the session token
-    cookies[:cxf_user_session_token] = { value: session_token, secure: true, httponly: true, expires: Time.at(session_token_expires_at) }
-    cookies[:cxf_user_refresh_token] = { value: refresh_token, secure: true, httponly: true, expires: Time.at(refresh_token_expires_at) }
+    cookies["cxf_user_session_token"] = { value: session_token, secure: true, httponly: true }
+    cookies["cxf_user_refresh_token"] = { value: refresh_token, secure: true, httponly: true}
   end
 
   ##
@@ -43,8 +44,8 @@ module UserAuthHelper
     response = @cxf_user.magic_link_login(hash)
     if response['data']
       # Set a cookie with the session token
-      cookies[:cxf_user_session_token] = { value: response['data']['access_token'], secure: true, httponly: true }
-      cookies[:cxf_user_refresh_token] = { value: response['data']['refresh_token'], secure: true, httponly: true }
+      cookies["cxf_user_session_token"] = { value: response['data']['access_token'], secure: true, httponly: true }
+      cookies["cxf_user_refresh_token"] = { value: response['data']['refresh_token'], secure: true, httponly: true }
       redirect_to response['data']['redirect_url'] || '/'
     else
       redirect_to '/'
@@ -58,17 +59,15 @@ module UserAuthHelper
     # Logout from cxf
     # @cxf_user.logout
     # Delete local cookie
-    cookies.delete(:cxf_user_session_token)
-    cookies.delete(:cxf_user_refresh_token)
+    cookies.delete("cxf_user_session_token")
+    cookies.delete("cxf_user_refresh_token")
   end
 
   def update_user_tokens
     access_token = @cxf_user.get_client.session_token
     refresh_token = @cxf_user.get_client.refresh_token
-    access_token_expires_at = @cxf_user.get_client.session_token_expires_at
-    refresh_token_expires_at = @cxf_user.get_client.refresh_token_expires_at
 
-    cookies[:cxf_user_session_token] = { value: access_token, secure: true, httponly: true, expires: Time.at(access_token_expires_at) } if access_token && access_token_expires_at
-    cookies[:cxf_user_refresh_token] = { value: refresh_token, secure: true, httponly: true, expires: Time.at(refresh_token_expires_at) } if refresh_token && refresh_token_expires_at
+    cookies["cxf_user_session_token"] = { value: access_token, secure: true, httponly: true} if access_token
+    cookies["cxf_user_refresh_token"] = { value: refresh_token, secure: true, httponly: true} if refresh_token
   end
 end

data/lib/user.rb

@@ -69,7 +69,8 @@ module Cxf
     def login(email, password)
       data = { email: email, password: password }
       response = @client.raw('post', '/users/login', nil, data.to_json, '/api/v1', { no_content_type: true })
-      # @client.session_token = response['api_token'] if response.key? 'api_token'
+
+      return response unless response.is_a? Hash
       if response.key? 'data' and response['data'].key? 'access_token'
         @client.session_token = response['data']['access_token']
         @client.refresh_token = response['data']['refresh_token']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxf
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ruben Gomez Garcia, Omar Mora, Luis Payan, Oscar Castillo, Fabian Garcia, Luis Hesiquio