whiplash-app 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90618c9787cb8660f4fcb0be146bdb14736ce8635274f9b262f68813268bd35d
-  data.tar.gz: a26cca38e01f5c5642b94afe39cbc0be6ea08f05c9ccf446d0d802e5548aa100
+  metadata.gz: 228da95848c936a8a771e6f67e6d4aa03899ab722274b2d355917593c9b83a89
+  data.tar.gz: 2f1f50222b2b7a578d23a88efdfd5328e2d0b772bdae0696249be13457e57db5
 SHA512:
-  metadata.gz: d67a3f4a633319407cb8dd9a6717a92b57480825dab3fa36b4e77fda280f58c16089aa833a39fade900dee77efeaa169b868e3ba5f0e25832e37105da40ad53b
-  data.tar.gz: 94df31ed65be70e565fb5ea8ba2744dbfbbfe386500d8ae5c57bce4bd72474ff0af70f4ea9620e02f2a108282d24821c6477b0107d0b55146249c690010f8d07
+  metadata.gz: 31ba3a5b17e6679551d961ce009efb489e3a4a49bf0cf5cf8e9d4e978626c6ae825a38dad30d62552cf619e08a78a09066cd3ffb67a04599f5dcb6f7d01bc4a4
+  data.tar.gz: e845ad83845b36f932d21a3fd4fa283e8ef0fc45066cc37a82f80c3c178600a3c4870c76633f9ee88aad1967b16db7e7caf280a55e91b2f0d0d7fcf4ce6965e1

data/lib/whiplash/app/api_config.rb

@@ -10,6 +10,12 @@ module Whiplash
         end
       end
 
+      def rate_limit
+        (ENV['WHIPLASH_RATE_LIMIT'] || 25).to_i
+      end
+
+      private
+      
       def production_url
         ENV["WHIPLASH_API_URL"] || "https://www.getwhiplash.com"
       end
@@ -18,10 +24,6 @@ module Whiplash
         ENV["WHIPLASH_API_URL"] || "https://sandbox.getwhiplash.com"
       end
 
-      def rate_limit
-        (ENV['WHIPLASH_RATE_LIMIT'] || 25).to_i
-      end
-
     end
   end
 end

data/lib/whiplash/app/connections.rb

@@ -27,7 +27,7 @@ module Whiplash
 
       def app_request(options={})
         return base_app_request(options) unless defined?(Sidekiq)
-        limiter = Sidekiq::Limiter.window('whiplash-core', self.rate_limit, :second, wait_timeout: 15)
+        limiter = Sidekiq::Limiter.window('whiplash-core', self.class.rate_limit, :second, wait_timeout: 15)
         limiter.within_limit do
           base_app_request(options)
         end

data/lib/whiplash/app/controller_helpers.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+module Whiplash
+  class App
+    module ControllerHelpers
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :cookie_domain,
+                      :core_url,
+                      :core_url_for,
+                      :current_user
+      end 
+
+      private
+
+      def cookie_domain
+        '.' + URI.parse(core_url).host
+      end
+
+      def core_url
+        ENV['WHIPLASH_API_URL']
+      end
+
+      def core_url_for(path)
+        [core_url, path].join('/')
+      end
+
+      def current_user
+        return if cookies[:user].blank?
+        begin
+          @current_user ||= JSON.parse(cookies[:user])
+        rescue StandardError => e 
+          Rails.logger.warn "User could not be initialized: #{e.message}"
+          @current_user = nil
+        end
+      end
+
+      def http_scheme
+        URI(core_url).scheme
+      end
+
+      def init_whiplash_api(options = {})
+        return redirect_to core_url_for('login') if cookies[:oauth_token].blank?
+        token = {access_token: cookies[:oauth_token]}
+        begin 
+          @whiplash_api = Whiplash::App.new(token, options)
+        rescue StandardError => e 
+          Rails.logger.warn "API failed to initialize: #{e.message}"
+          @whiplash_api = nil
+        end
+      end
+    
+      def require_user
+        redirect_to core_url_for('login') if current_user.blank?
+      end
+    
+      def set_locale!
+        I18n.default_locale = :en
+        I18n.locale = current_user.try('locale') || I18n.default_locale
+      end
+
+
+      def set_current_user_cookie!(expires_at = nil)
+        user = @whiplash_api.get!("me").body
+        fields_we_care_about = %w(id email role locale first_name last_name partner_id warehouse_id customer_ids)
+        user_hash = user.slice(*fields_we_care_about)
+        expires_at ||= user['current_sign_in_expires_at']
+
+        shared_values = {
+          expires: DateTime.parse(expires_at),
+          secure: http_scheme == 'https',
+          samesite: :strict,
+          domain: cookie_domain
+        }
+        cookies[:user] = shared_values.merge(value: user_hash.to_json)
+      end
+
+    end
+  end
+end

data/lib/whiplash/app/railtie.rb

@@ -1,14 +1,31 @@
 # frozen_string_literal: true
 
 module Whiplash
-  module Logs
+  class App
     class Railtie < Rails::Railtie
+
+      config.before_configuration do |app|
+        # App name/etc, mainly for consistency in logging
+        app_name = app.class.module_parent.name.underscore.dasherize
+        app.config.environment_key = ENV.fetch('ENVIRONMENT_KEY', Rails.env.to_s)
+        app.config.application_key = ENV.fetch('APPLICATION_KEY', app_name)
+        app.config.application_name_space = [config.application_key, config.environment_key].join('-')
+    
+        # session settings
+        session_days = 30 
+        session_seconds = session_days * 24 * 60 * 60
+        session_length = ENV.fetch('SESSION_LENGTH', session_seconds).to_i
+        app.config.session_length = session_length
+        app.config.session_store :cookie_store, :key => '_session', :expire_after => session_length
+      end
+
       initializer "whiplash_app.action_controller" do
         ActiveSupport.on_load(:action_controller) do
-          puts "Extending #{self} with YourGemsModuleName::Controller"
           include Whiplash::App::CanonicalHost
+          include Whiplash::App::ControllerHelpers
         end
       end
+
     end
   end
 end

data/lib/whiplash/app/version.rb

@@ -1,5 +1,5 @@
 module Whiplash
   class App
-    VERSION = "0.9.2"
+    VERSION = "0.9.4"
   end
 end

data/lib/whiplash/app.rb

@@ -9,16 +9,17 @@ require "faraday"
 
 # Rails app stuff
 if defined?(Rails::Railtie)
-  require "whiplash/app/canonical_host" 
   require "whiplash/app/railtie"
+  require "whiplash/app/canonical_host" 
+  require "whiplash/app/controller_helpers"
 end 
 
 module Whiplash
   class App
-    include Whiplash::App::ApiConfig
+    extend Whiplash::App::Signing
+    extend Whiplash::App::ApiConfig
     include Whiplash::App::Connections
     include Whiplash::App::FinderMethods
-    extend Whiplash::App::Signing
 
     attr_accessor :customer_id, :shop_id, :token
 
@@ -29,16 +30,16 @@ module Whiplash
       @api_version = options[:api_version] || 2 # can be 2_1
     end
 
-    def client
-      OAuth2::Client.new(ENV["WHIPLASH_CLIENT_ID"], ENV["WHIPLASH_CLIENT_SECRET"], site: api_url)
-    end
-
     def versioned_api_url
       "api/v#{@api_version}"
     end
 
+    def client
+      OAuth2::Client.new(ENV["WHIPLASH_CLIENT_ID"], ENV["WHIPLASH_CLIENT_SECRET"], site: self.class.api_url)
+    end
+
     def connection
-      Faraday.new [api_url, versioned_api_url].join("/") do |conn|
+      Faraday.new [self.class.api_url, versioned_api_url].join("/") do |conn|
         conn.request :authorization, 'Bearer', token.token
         conn.request :json
         conn.response :json, :content_type => /\bjson$/
@@ -53,9 +54,9 @@ module Whiplash
       case ENV["WHIPLASH_CLIENT_SCOPE"]
       when /app_(manage|read)/
         begin
-          access_token = client.client_credentials.get_token(scope: ENV["WHIPLASH_CLIENT_SCOPE"])
+          access_token = self.class.client_credentials_token
         rescue URI::InvalidURIError => e
-          raise StandardError, "The provide URL (#{ENV["WHIPLASH_API_URL"]}) is not valid"
+          raise StandardError, "The provided URL (#{ENV["WHIPLASH_API_URL"]}) is not valid"
         end
       else
         raise StandardError, "You must request an access token before you can refresh it" if token.nil?
@@ -70,6 +71,13 @@ module Whiplash
       false
     end
 
+    class << self 
+      def client_credentials_token
+        client = OAuth2::Client.new(ENV["WHIPLASH_CLIENT_ID"], ENV["WHIPLASH_CLIENT_SECRET"], site: api_url)
+        client.client_credentials.get_token(scope: ENV["WHIPLASH_CLIENT_SCOPE"])
+      end
+    end
+
     private
     def format_token(oauth_token)
       return oauth_token if oauth_token.is_a?(OAuth2::AccessToken)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whiplash-app
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Don Sullivan, Mark Dickson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -117,6 +117,7 @@ files:
 - lib/whiplash/app/api_config.rb
 - lib/whiplash/app/canonical_host.rb
 - lib/whiplash/app/connections.rb
+- lib/whiplash/app/controller_helpers.rb
 - lib/whiplash/app/finder_methods.rb
 - lib/whiplash/app/railtie.rb
 - lib/whiplash/app/signing.rb