duodealer_app 1.0.0 → 1.0.1

data/lib/generators/duodealer_app/rotate_duodealer_token_job/templates/rotate_duodealer_token_job.rb

@@ -3,16 +3,16 @@
 module Duodealer
   class RotateDuodealerTokenJob < ActiveJob::Base
     def perform(params)
-      @shop = Shop.find_by(duodealer_domain: params[:shop_domain])
-      return unless @shop
+      @account = Account.find_by(duodealer_domain: params[:account_domain])
+      return unless @account
 
       config = DuodealerApp.configuration
-      uri = URI("https://#{@shop.duodealer_domain}/admin/oauth/access_token")
+      uri = URI("https://#{@account.duodealer_domain}/admin/oauth/access_token")
       post_data = {
         client_id: config.api_key,
         client_secret: config.secret,
         refresh_token: params[:refresh_token],
-        access_token: @shop.duodealer_token,
+        access_token: @account.duodealer_token,
       }
 
       @response = Net::HTTP.post_form(uri, post_data)
@@ -21,7 +21,7 @@ module Duodealer
       access_token = JSON.parse(@response.body)['access_token']
       return log_error(no_access_token_error_message) unless access_token
 
-      @shop.update(duodealer_token: access_token)
+      @account.update(duodealer_token: access_token)
     end
 
     private
@@ -31,11 +31,11 @@ module Duodealer
     end
 
     def no_access_token_error_message
-      "RotateDuodealerTokenJob response returned no access token for shop: #{@shop.duodealer_domain}"
+      "RotateDuodealerTokenJob response returned no access token for account: #{@account.duodealer_domain}"
     end
 
     def response_exception_error_message
-      "RotateDuodealerTokenJob failed for shop: #{@shop.duodealer_domain}." \
+      "RotateDuodealerTokenJob failed for account: #{@account.duodealer_domain}." \
         "Response returned status: #{@response.code}. Error message: #{@response.message}. "
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duodealer_app
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Eric Raio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser_sniffer
@@ -234,37 +234,21 @@ files:
 - app/assets/javascripts/duodealer_app/top_level.js
 - app/assets/javascripts/duodealer_app/top_level_interaction.js
 - app/controllers/concerns/duodealer_app/authenticated.rb
-- app/controllers/concerns/duodealer_app/authenticated.rb-e
 - app/controllers/duodealer_app/authenticated_controller.rb
-- app/controllers/duodealer_app/authenticated_controller.rb-e
 - app/controllers/duodealer_app/callback_controller.rb
-- app/controllers/duodealer_app/callback_controller.rb-e
 - app/controllers/duodealer_app/extension_verification_controller.rb
-- app/controllers/duodealer_app/extension_verification_controller.rb-e
 - app/controllers/duodealer_app/sessions_controller.rb
-- app/controllers/duodealer_app/sessions_controller.rb-e
 - app/controllers/duodealer_app/webhooks_controller.rb
-- app/controllers/duodealer_app/webhooks_controller.rb-e
 - app/views/duodealer_app/partials/_button_styles.html.erb
-- app/views/duodealer_app/partials/_button_styles.html.erb-e
 - app/views/duodealer_app/partials/_card_styles.html.erb
-- app/views/duodealer_app/partials/_card_styles.html.erb-e
 - app/views/duodealer_app/partials/_empty_state_styles.html.erb
-- app/views/duodealer_app/partials/_empty_state_styles.html.erb-e
 - app/views/duodealer_app/partials/_layout_styles.html.erb
-- app/views/duodealer_app/partials/_layout_styles.html.erb-e
 - app/views/duodealer_app/partials/_typography_styles.html.erb
-- app/views/duodealer_app/partials/_typography_styles.html.erb-e
 - app/views/duodealer_app/sessions/enable_cookies.html.erb
-- app/views/duodealer_app/sessions/enable_cookies.html.erb-e
 - app/views/duodealer_app/sessions/new.html.erb
-- app/views/duodealer_app/sessions/new.html.erb-e
 - app/views/duodealer_app/sessions/request_storage_access.html.erb
-- app/views/duodealer_app/sessions/request_storage_access.html.erb-e
 - app/views/duodealer_app/sessions/top_level_interaction.html.erb
-- app/views/duodealer_app/sessions/top_level_interaction.html.erb-e
 - app/views/duodealer_app/shared/redirect.html.erb
-- app/views/duodealer_app/shared/redirect.html.erb-e
 - config/locales/cs.yml
 - config/locales/da.yml
 - config/locales/de.yml

data/app/controllers/concerns/duodealer_app/authenticated.rb-e

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module DuodealerApp
-  module Authenticated
-    extend ActiveSupport::Concern
-
-    included do
-      include DuodealerApp::Localization
-      include DuodealerApp::LoginProtection
-      include DuodealerApp::EmbeddedApp
-      before_action :login_again_if_different_user_or_shop
-      around_action :duodealer_session
-    end
-  end
-end

data/app/controllers/duodealer_app/authenticated_controller.rb-e

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module DuodealerApp
-  class AuthenticatedController < ApplicationController
-    include DuodealerApp::Authenticated
-
-    protect_from_forgery with: :exception
-  end
-end

data/app/controllers/duodealer_app/callback_controller.rb-e

@@ -1,104 +0,0 @@
-# frozen_string_literal: true
-
-module DuodealerApp
-  # Performs login after OAuth completes
-  class CallbackController < ApplicationController
-    include DuodealerApp::LoginProtection
-
-    def callback
-      if auth_hash
-        login_shop
-        install_webhooks
-        install_scripttags
-        perform_after_authenticate_job
-
-        redirect_to return_address
-      else
-        flash[:error] = I18n.t("could_not_log_in")
-        redirect_to(login_url_with_optional_shop)
-      end
-    end
-
-    private
-      def login_shop
-        reset_session_options
-        set_duodealer_session
-      end
-
-      def auth_hash
-        request.env["omniauth.auth"]
-      end
-
-      def shop_name
-        auth_hash.uid
-      end
-
-      def associated_user
-        return if auth_hash["extra"].blank?
-
-        auth_hash["extra"]["associated_user"]
-      end
-
-      def token
-        auth_hash["credentials"]["token"]
-      end
-
-      def reset_session_options
-        request.session_options[:renew] = true
-        session.delete(:_csrf_token)
-      end
-
-      def set_duodealer_session
-        session_store = DuodealerAPI::Session.new(
-          domain: shop_name,
-          token: token,
-          api_version: DuodealerApp.configuration.api_version
-        )
-        session[:duodealer] = DuodealerApp::SessionRepository.store(session_store, user: associated_user)
-        session[:duodealer_domain] = shop_name
-        session[:duodealer_user] = associated_user
-
-        if DuodealerApp.configuration.per_user_tokens?
-          # Adds the user_session to the session to determine if the logged in user has changed
-          user_session = auth_hash&.extra&.session
-          raise IndexError, "Missing user session signature" if user_session.nil?
-          session[:user_session] = user_session
-        end
-      end
-
-      def install_webhooks
-        return unless DuodealerApp.configuration.has_webhooks?
-
-        WebhooksManager.queue(
-          shop_name,
-          token,
-          DuodealerApp.configuration.webhooks
-        )
-      end
-
-      def install_scripttags
-        return unless DuodealerApp.configuration.has_scripttags?
-
-        ScripttagsManager.queue(
-          shop_name,
-          token,
-          DuodealerApp.configuration.scripttags
-        )
-      end
-
-      def perform_after_authenticate_job
-        config = DuodealerApp.configuration.after_authenticate_job
-
-        return unless config && config[:job].present?
-
-        job = config[:job]
-        job = job.constantize if job.is_a?(String)
-
-        if config[:inline] == true
-          job.perform_now(shop_domain: session[:duodealer_domain])
-        else
-          job.perform_later(shop_domain: session[:duodealer_domain])
-        end
-      end
-  end
-end

data/app/controllers/duodealer_app/extension_verification_controller.rb-e

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module DuodealerApp
-  class ExtensionVerificationController < ApplicationController
-    protect_from_forgery with: :null_session
-    before_action :verify_request
-
-    private
-      def verify_request
-        hmac_header = request.headers["HTTP_X_DUODEALER_HMAC_SHA256"]
-        request_body = request.body.read
-        secret = DuodealerApp.configuration.secret
-        digest = OpenSSL::Digest.new("sha256")
-
-        expected_hmac = Base64.strict_encode64(OpenSSL::HMAC.digest(digest, secret, request_body))
-        head(:unauthorized) unless ActiveSupport::SecurityUtils.secure_compare(expected_hmac, hmac_header)
-      end
-  end
-end

data/app/controllers/duodealer_app/sessions_controller.rb-e

@@ -1,159 +0,0 @@
-# frozen_string_literal: true
-
-module DuodealerApp
-  class SessionsController < ApplicationController # rubocop:disable Metrics/ClassLength
-    include DuodealerApp::LoginProtection
-
-    layout false, only: :new
-    after_action only: [:new, :create] do |controller|
-      controller.response.headers.except!("X-Frame-Options")
-    end
-
-    def new
-      authenticate if sanitized_shop_name.present?
-    end
-
-    def create
-      authenticate
-    end
-
-    def enable_cookies
-      return unless validate_shop
-
-      render(:enable_cookies, layout: false, locals: {
-        does_not_have_storage_access_url: top_level_interaction_path(
-          shop: sanitized_shop_name,
-          return_to: params[:return_to]
-        ),
-        has_storage_access_url: login_url_with_optional_shop(top_level: true),
-        app_target_url: granted_storage_access_path(
-          shop: sanitized_shop_name,
-          return_to: params[:return_to]
-        ),
-        current_duodealer_domain: current_duodealer_domain
-      })
-    end
-
-    def top_level_interaction
-      @url = login_url_with_optional_shop(top_level: true)
-      validate_shop
-    end
-
-    def granted_storage_access
-      return unless validate_shop
-
-      session["duodealer.granted_storage_access"] = true
-
-      copy_return_to_param_to_session
-
-      redirect_to(return_address_with_params({ shop: @shop }))
-    end
-
-    def destroy
-      reset_session
-      flash[:notice] = I18n.t(".logged_out")
-      redirect_to(login_url_with_optional_shop)
-    end
-
-    private
-      def authenticate
-        return render_invalid_shop_error if sanitized_shop_name.blank?
-        session["duodealer.omniauth_params"] = { shop: sanitized_shop_name }
-
-        copy_return_to_param_to_session
-
-        if user_agent_can_partition_cookies
-          authenticate_with_partitioning
-        else
-          authenticate_normally
-        end
-      end
-
-      def authenticate_normally
-        if request_storage_access?
-          redirect_to_request_storage_access
-        elsif authenticate_in_context?
-          authenticate_in_context
-        else
-          authenticate_at_top_level
-        end
-      end
-
-      def authenticate_with_partitioning
-        if session["duodealer.cookies_persist"]
-          clear_top_level_oauth_cookie
-          authenticate_in_context
-        else
-          set_top_level_oauth_cookie
-          enable_cookie_access
-        end
-      end
-
-      def validate_shop
-        @shop = sanitized_shop_name
-        unless @shop
-          render_invalid_shop_error
-          return false
-        end
-
-        true
-      end
-
-      def copy_return_to_param_to_session
-        session[:return_to] = params[:return_to] if params[:return_to]
-      end
-
-      def render_invalid_shop_error
-        flash[:error] = I18n.t("invalid_shop_url")
-        redirect_to return_address
-      end
-
-      def enable_cookie_access
-        fullpage_redirect_to(enable_cookies_path(
-                               shop: sanitized_shop_name,
-                               return_to: session[:return_to]
-        ))
-      end
-
-      def authenticate_in_context
-        redirect_to "#{main_app.root_path}auth/duodealer"
-      end
-
-      def authenticate_at_top_level
-        fullpage_redirect_to(login_url_with_optional_shop(top_level: true))
-      end
-
-      def authenticate_in_context?
-        return true unless DuodealerApp.configuration.embedded_app?
-        params[:top_level]
-      end
-
-      def request_storage_access?
-        return false unless DuodealerApp.configuration.embedded_app?
-        return false if params[:top_level]
-        return false if user_agent_is_mobile
-        return false if user_agent_is_pos
-
-        !session["duodealer.granted_storage_access"]
-      end
-
-      def redirect_to_request_storage_access
-        render(
-          :request_storage_access,
-          layout: false,
-          locals: {
-            does_not_have_storage_access_url: top_level_interaction_path(
-              shop: sanitized_shop_name,
-              return_to: session[:return_to]
-            ),
-            has_storage_access_url: login_url_with_optional_shop(top_level: true),
-            app_target_url: granted_storage_access_path(
-              shop: sanitized_shop_name,
-              return_to: session[:return_to]
-            ),
-            current_duodealer_domain: current_duodealer_domain
-          }
-        )
-      end
-  end
-end

data/app/controllers/duodealer_app/webhooks_controller.rb-e

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module DuodealerApp
-  class WebhooksController < ApplicationController
-    include DuodealerApp::WebhookVerification
-
-    class DuodealerApp::MissingWebhookJobError < StandardError; end
-
-    def receive
-      params.permit!
-      job_args = { shop_domain: shop_domain, webhook: webhook_params.to_h }
-      webhook_job_klass.perform_later(job_args)
-      head :no_content
-    end
-
-    private
-      def webhook_params
-        params.except(:controller, :action, :type)
-      end
-
-      def webhook_job_klass
-        webhook_job_klass_name.safe_constantize || raise(DuodealerApp::MissingWebhookJobError)
-      end
-
-      def webhook_job_klass_name(type = webhook_type)
-        [webhook_namespace, "#{type}_job"].compact.join("/").classify
-      end
-
-      def webhook_type
-        params[:type]
-      end
-
-      def webhook_namespace
-        DuodealerApp.configuration.webhook_jobs_namespace
-      end
-  end
-end