cxf 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a71c504ca9f2b229b5d68535c6f96d0d2aed4647c5f09a496f7c4e6dfe39e8
-  data.tar.gz: 26ad78974ffd6995bfa896b76bce187f3f9b6d04e5c35918193702b61b8d1ee7
+  metadata.gz: 324d21f2cb1f4897cd159cff3de9ddb46c36221d7c9b2bbf552bf557b59a5e73
+  data.tar.gz: e7a9566860ebed67d6c472a18eb65a4e84b89e234e4f7cc82841651fad826821
 SHA512:
-  metadata.gz: a6862001d7e884971f6d1fc23504a0156fa97f62a14826d08799760374d75edb0a23be70d83d2779872d5612c547bd1b3af75d68b7d93dde7fdc5b929d614181
-  data.tar.gz: 9c7eda03f2587846b5c222bbc9ff1fe7d3629f33511fec4c6ffc127533918d7d8737464874e9888354202c5fee8a88cd329f8d682a55f92c1bbce8923c3686f3
+  metadata.gz: 6679f8b27340c887f989a03606186350a6cabfa85c229c188ef38cd53a467a1e3fb4b67cf561019f6b3c143a4054bd2e9ce2ad45ea3f8d4a803b64e2bb56ab0a
+  data.tar.gz: de3da6126a76d8304a7ff625ed7970305eb806e0a79372e2c5057e9c14928ab109d97765e24d5f019a35b1de8ec04e8ec2818ac193d39e4172138fbf15789b42

data/README.md

@@ -25,8 +25,8 @@ class ApplicationController < ActionController::Base
   include UserAuthHelper # if you log in with a user
   include ContactAuthHelper # if you log in with a contact
 
-  after_action :update_user_tokens # if you haven't run the generator yet and you log in with a user
-  after_action :update_contact_tokens # if you haven't run the generator yet and you log in with a contact
+  after_action :sync_user_cookies # if you haven't run the generator yet and you log in with a user
+  after_action :sync_contact_cookies # if you haven't run the generator yet and you log in with a contact
 end
 ```
 
@@ -142,7 +142,8 @@ it to the groups array and set the cache time.
   # Cxf connection configuration
   cxf:
     host: http://your_host_goes_here.com
-    api_key: your_cxf_api_key_goes_here
+    user_api_key: your_cxf_user_api_key_goes_here
+    contact_api_key: your_cxf_contact_api_key_goes_here
     cxf_slug: slug_id #save id and token in redis
   redis_cache:
     use_cache: boolean_value_to_enable_and_disable_cache

data/lib/client.rb

@@ -13,14 +13,12 @@ module Cxf
     include CxfHelper
 
     attr_reader :host, :mode, :api_key, :scope, :base_url
-    attr_accessor :session_token, :refresh_token, :contact_token_id, :user_agent
+    attr_accessor :contact_token_id, :user_agent, :response_cookies
 
     def initialize(
       host,
       api_key,
       scope = nil,
-      session_token = nil,
-      refresh_token = nil,
       contact_token_id = nil,
       visit_id = nil,
       debug = false,
@@ -29,12 +27,11 @@ module Cxf
 
       @host = host
       @api_key = api_key
-      @session_token = session_token
-      @refresh_token = refresh_token
       @contact_token_id = contact_token_id
       @visit_id = visit_id
       @debug = debug
       @user_agent = nil
+      @response_cookies = nil
 
       config = read_config_file('sdk') || {}
 
@@ -130,24 +127,25 @@ module Cxf
 
         unless url_need_cache
           response = self.send("#{@scope}_#{action}", full_url, nil, compatibility_options)
-          replace_tokens(response)
+          set_cookies(response.headers)
         end
 
       elsif action === 'create' or action === 'post'
         action = 'post'
         response = self.send("#{@scope}_#{action}", full_url, data, compatibility_options)
-        replace_tokens(response)
+        set_cookies(response.headers)
       elsif action === 'put' or action === 'patch' or action === 'update'
         action = 'put'
         response = self.send("#{@scope}_#{action}", full_url, data, compatibility_options)
-        replace_tokens(response)
+        set_cookies(response.headers)
       elsif action === 'delete' or action === 'destroy'
         action = 'delete'
         response = self.send("#{@scope}_#{action}", full_url, data, compatibility_options)
-        replace_tokens(response)
+        set_cookies(response.headers)
       end
 
       response = verify_response_status(response, config['sdk']['ignore_http_errors'])
+
       begin
         if @debug
           response_from = if result_from_cache
@@ -347,19 +345,39 @@ module Cxf
       self.http_put(url, set_headers(compatibility_options, headers), data)
     end
 
+    def get_tokens
+      if @scope === 'user'
+        return {
+          access_token: @response_cookies.fetch('cxf_user_access_token', ''),
+          refresh_token: @response_cookies.fetch('cxf_user_refresh_token', '')
+        }
+      elsif @scope === 'contact'
+        return {
+          access_token: @response_cookies.fetch('cxf_contact_access_token', ''),
+          refresh_token: @response_cookies.fetch('cxf_contact_refresh_token', '')
+        }
+      end
+
+      return nil
+    end
+
     def set_headers(compatibility_options, headers = nil)
+      headers = {} if headers.nil?
       h = {
         'Accept' => 'application/json',
         'ApiKey' => @api_key,
-        'Access-Token' => @session_token || '',
-        'Refresh-Token' => @refresh_token || ''
       }
       h['Content-Type'] = 'application/json' unless compatibility_options['no_content_type']
       h['ContactToken'] = @contact_token_id if @contact_token_id
       h['Visit-Id'] = @visit_id if @visit_id
-      h['Authorization'] = "Bearer #{@session_token}" if @session_token
       h['User-Agent'] = @user_agent if @user_agent
 
+      tokens = get_tokens
+      if tokens
+        h['Access-Token'] = tokens[:access_token] if tokens[:access_token]
+        h['Refresh-Token'] = tokens[:refresh_token] if tokens[:refresh_token]
+      end
+
       if headers
         headers.each do |k, v|
           h[k] = v
@@ -441,11 +459,84 @@ module Cxf
       str.pluralize != str && str.singularize == str
     end
 
-    def replace_tokens(response)
-      return unless response&.headers
+    def set_cookies(headers)
+      string_headers = headers['set-cookie'];
+      # use parse_cookies_header of rack
+      @response_cookies = parse_set_cookies(headers['set-cookie'])
+
+      # parsed_cookies.each_value do |cookie|
+      #   Rack::Utils.set_cookie_header!(
+      #     response.headers,
+      #     cookie['name'],
+      #     {
+      #       value: cookie['value'],
+      #       expires: cookie['expires'] ? Time.parse(cookie['expires']) : nil,
+      #       path: cookie['path'] || '/',
+      #       domain: '', # especificar si necesitas uno
+      #       secure: cookie['secure'] || false,
+      #       httponly: cookie['httponly'] || false,
+      #       same_site: (cookie['samesite'] || 'Lax').capitalize
+      #     }
+      #   )
+      # end
+    end
 
-      @session_token = response.headers['Access-Token'] if response.headers.key?('Access-Token')
-      @refresh_token = response.headers['Refresh-Token'] if response.headers.key?('Refresh-Token')
+    # def split_cookie_header(header_string)
+    #   header_string.scan(/(?:^|, )([^=;]+=[^;]+(?:;[^,]*)*)/).flatten
+    # end
+
+    def parse_set_cookies(header_string)
+      return {} unless header_string.is_a?(String)
+
+      cookies = []
+      buffer = ''
+      inside_cookie = false
+
+      # Split cookies
+      header_string.split(',').each do |part|
+        if part.strip =~ /^[^=]+=/ && !inside_cookie
+          buffer = part
+          inside_cookie = true
+        elsif part.strip.downcase.start_with?('expires=')
+          buffer += ',' + part
+        elsif inside_cookie && part.strip.include?('=')
+          buffer += ',' + part
+          cookies << buffer.strip
+          buffer = ''
+          inside_cookie = false
+        else
+          buffer += ',' + part
+        end
+      end
+      cookies << buffer.strip unless buffer.empty?
+
+      parsed = {}
+
+      cookies.each do |cookie_string|
+        parts = cookie_string.split(/;\s*/)
+        name_value = parts.shift
+        name, value = name_value.split('=', 2)
+        next unless name && value
+
+        cookie = { 'name' => name, 'value' => value }
+
+        parts.each do |part|
+          if part.downcase.start_with?('expires=')
+            # Rebuild expires
+            cookie['expires'] = part[8..].strip
+          elsif part.include?('=')
+            k, v = part.split('=', 2)
+            cookie[k.strip.downcase] = v.strip
+          else
+            cookie[part.strip.downcase] = true
+          end
+        end
+
+        parsed[name] = cookie
+      end
+
+      parsed
     end
+
   end
 end

data/lib/contact.rb

@@ -33,8 +33,6 @@ module Cxf
     def initialize(
       host,
       api_key,
-      session_token = nil,
-      refresh_token = nil,
       contact_token_id = nil,
       debug = false,
       user_agent = nil,
@@ -45,8 +43,6 @@ module Cxf
         host,
         api_key,
         'contact',
-        session_token,
-        refresh_token,
         contact_token_id,
         nil,
         debug,
@@ -74,7 +70,7 @@ module Cxf
     #     }
     #     @cxf_contact.register(data);
     def register(data)
-      @client.raw('post', '/contacts/register', nil, data_transform(data))
+      @client.raw('post', '/register', nil, data_transform(data))
     end
 
     ##
@@ -92,14 +88,7 @@ module Cxf
         email: email,
         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']
-      end
-      response
+      @client.raw('post', '/login', nil, data_transform(data))
     end
 
     ##
@@ -113,7 +102,7 @@ module Cxf
     #     data = { email: 'email@example.com' }
     #     @cxf_contact.recover_password(data)
     def recover_password(data)
-      @client.raw('post', '/contacts/recover-password', nil, data_transform(data))
+      @client.raw('post', '/recover-password', nil, data_transform(data))
     end
 
     ##
@@ -132,14 +121,14 @@ module Cxf
     #     }
     #     @cxf_contact.reset_password(data)
     def reset_password(data)
-      @client.raw('post', '/contacts/reset-password', nil, data_transform(data))
+      @client.raw('post', '/reset-password', nil, data_transform(data))
     end
 
     ##
     # === OAuth Login.
     # Login a contact using oauth.
     def oauth_login(data)
-      @client.raw('post', '/contacts/oauth-login', nil, data)
+      @client.raw('post', '/oauth-login', nil, data)
     end
 
     ##
@@ -154,7 +143,7 @@ module Cxf
     #       'd8618c6d-a165-41cb-b3ec-d053cbf30059:zm54HtRdfHED8dpILZpjyqjPIceiaXNLfOklqM92fveBS0nDtyPYBlI4CPlPe3zq'
     #     )
     def magic_link_login(token)
-      response = @client.raw('get', "/contacts/magic-link-login/#{token}", nil, '/api/v1')
+      response = @client.raw('get', "/magic-link-login/#{token}", nil, '/api/v1')
       @client.session_token = response['session_token'] if response.key? 'session_token'
 
       response
@@ -189,7 +178,7 @@ module Cxf
       else
         data['email'] = email_or_phone
       end
-      @client.raw('post', '/contacts/magic-link', nil, data_transform(data), '/api/v1')
+      @client.raw('post', '/magic-link', nil, data_transform(data), '/api/v1')
     end
 
     ### CONTACT/V1 ###
@@ -211,7 +200,7 @@ module Cxf
     #     }
     #     @data = @cxf_contact.me(options)
     def me(options = nil)
-      @client.raw('get', '/contacts/me', options, nil)
+      @client.raw('get', '/me', options, nil)
     end
 
     ##

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

@@ -49,7 +49,7 @@ module CxfClients
 
     @cxf_pub = Cxf::Pub.new(
       @host,
-      @api_key,
+      @contact_api_key,
       contact_token_id,
       visit_id,
       @debug,
@@ -62,37 +62,30 @@ 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_token_id = cookies[:cxf_contact_id] || nil
     user_agent = request.user_agent
     @cxf_contact = Cxf::Contact.new(
       @host,
-      @api_key,
-      contact_session_token,
-      contact_refresh_token,
+      @contact_api_key,
       contact_token_id,
       @debug,
       user_agent
     )
+    @cxf_contact.get_client.response_cookies = cookies
   end
 
   ##
   # === Set Cxf user client.
   # 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_agent = request.user_agent
     @cxf_user = Cxf::User.new(
       @host,
-      @api_key,
-      user_session_token,
-      user_refresh_token,
+      @user_api_key,
       @debug,
       user_agent
     )
+    @cxf_user.get_client.response_cookies = cookies
   end
 
   ##
@@ -103,9 +96,7 @@ module CxfClients
     user_agent = request.user_agent
     @cxf_service_account = Cxf::User.new(
       @host,
-      @api_key,   # api token
-      @api_key,   # session token
-      @api_key,   # refresh token
+      @user_api_key,   # api token
       @debug,
       user_agent
     )

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

@@ -13,7 +13,8 @@ module ReadConfigFile
       config = YAML.safe_load template.result(binding)
 
       @host = config.dig('cxf', 'host')
-      @api_key = config.dig('cxf', 'api_key')
+      @user_api_key = config.dig('cxf', 'user_api_key')
+      @contact_api_key = config.dig('cxf', 'contact_api_key')
       @debug = !!config.dig('cxf', 'debug')
       @redis_config = config.dig('cxf', 'redis_cache')
       @use_cache = config.dig('cxf', 'redis_cache', 'use_cache')

data/lib/cxf/helpers/contact_auth_helper.rb

@@ -11,16 +11,12 @@ module ContactAuthHelper
     # 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']
       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_id] = { value: id_token, secure: true, httponly: true }
     @contact_token = id_token
+
+    response
   end
 
   ##
@@ -31,15 +27,6 @@ module ContactAuthHelper
     response = @cxf_contact.magic_link_login(hash)
 
     if response['data']
-      # Get session token from response
-      session_token = response['data']['session_token']
-      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_id] = { value: id_token, secure: true, httponly: true }
-      # @contact_token = id_token
       redirect_to response['data']['redirect_url'] || '/' if redirect_in_error
     else
       redirect_to '/' if redirect_in_error
@@ -54,7 +41,7 @@ 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_access_token")
     cookies.delete("cxf_contact_refresh_token")
     @contact_token = nil
   end
@@ -77,11 +64,18 @@ module ContactAuthHelper
     status
   end
 
-  def update_contact_tokens
-    access_token = @cxf_contact.get_client.session_token
-    refresh_token = @cxf_contact.get_client.refresh_token
+  def sync_contact_cookies
+    response_cookies = @cxf_contact.get_client.response_cookies
 
-    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
+    response_cookies.each do |key, cookie|
+      cookies[cookie['name']] = {
+        value: cookie['value'],
+        expires: cookie['expires'] ? Time.parse(cookie['expires']) : nil,
+        path: cookie['path'] || '/',
+        secure: cookie['secure'] || false,
+        httponly: cookie['httponly'] || false,
+        same_site: (cookie['samesite'] || 'Lax').downcase.to_sym
+      }
+    end
   end
 end

data/lib/cxf/helpers/user_auth_helper.rb

@@ -23,17 +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'])
-    end
+    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'])
+    # end
 
     # Set a permanent cookie with the session token
-    cookies["cxf_user_session_token"] = { value: session_token, secure: true, httponly: true }
-    cookies["cxf_user_refresh_token"] = { value: refresh_token, secure: true, httponly: true}
+    # 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
 
   ##
@@ -63,11 +63,18 @@ module UserAuthHelper
     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
+  def sync_user_cookies
+    response_cookies = @cxf_user.get_client.response_cookies
 
-    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
+    response_cookies.each do |key, cookie|
+      cookies[cookie['name']] = {
+        value: cookie['value'],
+        expires: cookie['expires'] ? Time.parse(cookie['expires']) : nil,
+        path: cookie['path'] || '/',
+        secure: cookie['secure'] || false,
+        httponly: cookie['httponly'] || false,
+        same_site: (cookie['samesite'] || 'Lax').downcase.to_sym
+      }
+    end
   end
 end

data/lib/generators/cxf_config.yml.erb

@@ -1,7 +1,8 @@
 # Cxf connection configuration
 cxf:
     host: http://your_host_goes_here.com
-    api_key: your_cxf_api_key_goes_here
+    user_api_key: your_cxf_api_key_goes_here
+    contact_api_key: your_cxf_api_key_goes_here
     cxf_slug: slug_id #save id and token in redis
 redis_cache:
   use_cache: boolean_value_to_enable_and_disable_cache

data/lib/pub.rb

@@ -94,8 +94,6 @@ module Cxf
         host,
         api_key,
         'public',
-        nil,
-        nil,
         contact_token_id,
         visit_id,
         debug,

data/lib/user.rb

@@ -50,13 +50,11 @@ module Cxf
 
     attr_reader :client
 
-    def initialize(host, api_key, session_token = nil, refresh_token = nil, debug = false, user_agent = nil, timeouts = {})
+    def initialize(host, api_key, debug = false, user_agent = nil, timeouts = {})
       @client = Cxf::Client.new(
         host,
         api_key,
         'user',
-        session_token,
-        refresh_token,
         nil,
         nil,
         debug,
@@ -69,12 +67,6 @@ 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 })
-
-      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']
-      end
       response
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cxf
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Ruben Gomez Garcia, Omar Mora, Luis Hesiquio