duodealer_app 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2269bcddcbaf2ec4b28af339d18939f72c087eeb238612d5ffafd30c1911f7f
-  data.tar.gz: 9837fe7b93b11dda135fab7e9913cebe4388ccd23f48c4182309a3e9839f17cc
+  metadata.gz: 9bd076d150bbda67fd85120ca53340145100c291f3735f9d6b2310bf83e88f21
+  data.tar.gz: 377d76ef4c8a3d774609eb1aea989fe17696ced667ead3c92b564e60b0fb9308
 SHA512:
-  metadata.gz: 390073fdc0a5321ec2f11c5535237e23299f3718bb9f38d786370a46367e73ae292154721cfcebbf23bec93e72b360b249427f9c988f5f9e16468a8b5444a3d9
-  data.tar.gz: 8c230c87bbcc2e07d9c95c980c6444f604a5eca30172359776fc49870d75230c52641baf40578c670f4495da9323924463f7bb46b844ae85b26536dfceb9d521
+  metadata.gz: 5f87a9d0829b3a04a7490079748b9865e301af819118cdcf7f29fdb24582d7976587e08694c8b39f15336b6200bb9d6a732ce3fa4d2973149f2cd29c6a2b1ff5
+  data.tar.gz: 290bd181c140f6f4275d21b70cabd4c37cf2c9e94e1def7362d779852776d63e6f366338ee95c934e41616424c71781311eabdb68d6e3cae17c8a76c54c0376f

data/README.md

@@ -220,7 +220,7 @@ If you only run the install generator then by default you will have an in memory
 #### Shop-based token storage
 Storing tokens on the store model means that any user login associated to the store will have equal access levels to whatever the original user granted the app.
 ```sh
-$ rails generate duodealer_app:shop_model
+$ rails generate duodealer_app:account_model
 ```
 This will generate a shop model which will be the storage for the tokens necessary for authentication.
 
@@ -311,7 +311,7 @@ end
 
 When the oauth callback is completed successfully DuodealerApp will queue a background job which will ensure all the specified webhooks exist for that shop. Because this runs on every oauth callback it means your app will always have the webhooks it needs even if the user uninstalls and re-installs the app.
 
-DuodealerApp also provides a WebhooksController that receives webhooks and queues a job based on the received topic. For example if you register the webhook from above then all you need to do is create a job called `CartsUpdateJob`. The job will be queued with 2 params: `shop_domain` and `webhook` (which is the webhook body).
+DuodealerApp also provides a WebhooksController that receives webhooks and queues a job based on the received topic. For example if you register the webhook from above then all you need to do is create a job called `CartsUpdateJob`. The job will be queued with 2 params: `account_domain` and `webhook` (which is the webhook body).
 
 If you would like to namespace your jobs you may set `webhook_jobs_namespace` in the config. For example if your app handles webhooks from other ecommerce applications as well, and you want Duo Dealer cart update webhooks to be processed by a job living in `jobs/duodealer/webhooks/carts_update_job.rb` rather than `jobs/carts_update_job.rb`):
 
@@ -339,7 +339,7 @@ class CustomWebhooksController < ApplicationController
 
   def carts_update
     params.permit!
-    SomeJob.perform_later(shop_domain: shop_domain, webhook: webhook_params.to_h)
+    SomeJob.perform_later(account_domain: account_domain, webhook: webhook_params.to_h)
     head :no_content
   end
 
@@ -518,13 +518,13 @@ end
 
 ### Generated file change
 
-`embedded_app.html.erb` the usage of `shop_session.url` needs to be changed to `shop_session.domain`
+`embedded_app.html.erb` the usage of `account_session.url` needs to be changed to `account_session.domain`
 ```erb
 <script type="text/javascript">
   DuodealerApp.init({
     apiKey: "<%= DuodealerApp.configuration.api_key %>",
 
-    shopOrigin: "<%= "https://#{ @shop_session.url }" if @shop_session %>",
+    shopOrigin: "<%= "https://#{ @account_session.url }" if @account_session %>",
 
     debug: false,
     forceRedirect: true
@@ -537,7 +537,7 @@ is changed to
   DuodealerApp.init({
     apiKey: "<%= DuodealerApp.configuration.api_key %>",
 
-    shopOrigin: "<%= "https://#{ @shop_session.domain }" if @shop_session %>",
+    shopOrigin: "<%= "https://#{ @account_session.domain }" if @account_session %>",
 
     debug: false,
     forceRedirect: true

data/app/assets/javascripts/duodealer_app/storage_access.js

@@ -132,7 +132,7 @@
 
   /* ITP 2.0 solution: handles cookie partitioning */
   StorageAccessHelper.prototype.setUpHelper = function() {
-    return new ITPHelper({redirectUrl: window.shopOrigin + "/admin/apps/" + window.apiKey + window.returnTo});
+    return new ITPHelper({redirectUrl: window.accountOrigin + "/admin/apps/" + window.apiKey + window.returnTo});
   }
 
   StorageAccessHelper.prototype.setCookieAndRedirect = function() {

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

@@ -8,7 +8,7 @@ module DuodealerApp
       include DuodealerApp::Localization
       include DuodealerApp::LoginProtection
       include DuodealerApp::EmbeddedApp
-      before_action :login_again_if_different_user_or_shop
+      before_action :login_again_if_different_user_or_account
       around_action :duodealer_session
     end
   end

data/app/views/duodealer_app/sessions/enable_cookies.html.erb

@@ -16,7 +16,7 @@
   </style>
   <script>
     window.apiKey = "<%= DuodealerApp.configuration.api_key %>";
-    window.shopOrigin = "https://<%= @shop %>";
+    window.accountOrigin = "https://<%= @account %>";
     window.returnTo = "<%= params[:return_to] %>"
   </script>
 

data/app/views/duodealer_app/sessions/new.html.erb

@@ -107,14 +107,14 @@
       <%= application_name.presence || 'Duo Dealer App – Installation' %>
     </h3>
     <p class="subtitle">
-      <label for="shop">Enter your shop domain to log in or install this app.</label>
+      <label for="account">Enter your account domain to log in or install this app.</label>
     </p>
 
     <%= form_tag login_path do %>
       <% if flash[:error] %>
         <div class="error"><%= flash[:error] %></div>
       <% end %>
-      <input id="shop" name="shop" type="text" autofocus="autofocus" placeholder="example.duodealer.com" class="marketing-input">
+      <input id="account" name="account" type="text" autofocus="autofocus" placeholder="example.duodealer.com" class="marketing-input">
       <button type="submit" class="marketing-button">Install</button>
     <% end %>
   </main>

data/app/views/duodealer_app/sessions/top_level_interaction.html.erb

@@ -17,7 +17,7 @@
 
   <script>
     window.apiKey = "<%= DuodealerApp.configuration.api_key %>";
-    window.shopOrigin = "https://<%= @shop %>";
+    window.accountOrigin = "https://<%= @account %>";
     window.redirectUrl = "<%= @url %>";
   </script>
 

data/config/locales/cs.yml

@@ -2,7 +2,7 @@
 cs:
   logged_out: Odhlášení proběhlo úspěšně
   could_not_log_in: Nelze se přihlásit do obchodu Duo Dealer
-  invalid_shop_url: Neplatná doména obchodu
+  invalid_account_url: Neplatná doména obchodu
   enable_cookies_heading: Zapnout soubory cookie z aplikace %{app}
   enable_cookies_body: Pokud chcete v Duo Dealer používat aplikaci %{app}, musíte soubory
     cookie v tomto prohlížeči povolit ručně.

data/config/locales/da.yml

@@ -2,7 +2,7 @@
 da:
   logged_out: Logget ud
   could_not_log_in: Kunne ikke logge ind på Duo Dealer-butik
-  invalid_shop_url: Ugyldig butiksdomæne
+  invalid_account_url: Ugyldig butiksdomæne
   enable_cookies_heading: Aktivér cookies fra %{app}
   enable_cookies_body: Du skal manuelt aktivere cookies i denne browser for at kunne
     bruge %{app} i Duo Dealer.

data/config/locales/de.yml

@@ -2,7 +2,7 @@
 de:
   logged_out: Erfolgreich ausgelogt
   could_not_log_in: Duo Dealer Store Login fehlgeschlagen
-  invalid_shop_url: Ungültige Shop-Domain
+  invalid_account_url: Ungültige Shop-Domain
   enable_cookies_heading: Cookies von %{app} aktivieren
   enable_cookies_body: Sie müssen Cookies in diesem Browser manuell aktivieren, um
     %{app} in Duo Dealer verwenden zu können.

data/config/locales/en.yml

@@ -1,7 +1,7 @@
 en:
   logged_out: 'Successfully logged out'
   could_not_log_in: 'Could not log in to Duo Dealer store'
-  invalid_shop_url: 'Invalid shop domain'
+  invalid_account_url: 'Invalid shop domain'
   enable_cookies_heading: "Enable cookies from %{app}"
   enable_cookies_body: "You must manually enable cookies in this browser in order to use %{app} within Duo Dealer."
   enable_cookies_footer: 'Cookies let the app authenticate you by temporarily storing your preferences and personal information. They expire after 30 days.'

data/config/locales/es.yml

@@ -2,7 +2,7 @@
 es:
   logged_out: Cerrar sesión
   could_not_log_in: No se pudo iniciar sesión en tu tienda Duo Dealer
-  invalid_shop_url: Dominio de tienda inválido
+  invalid_account_url: Dominio de tienda inválido
   enable_cookies_heading: Habilitar cookies de %{app}
   enable_cookies_body: Debes habilitar manualmente las cookies en este navegador para
     usar %{app} en Duo Dealer.

data/config/locales/fi.yml

@@ -2,7 +2,7 @@
 fi:
   logged_out: Olet kirjautunut ulos
   could_not_log_in: Kirjautuminen Duo Dealer-kauppaan ei onnistunut
-  invalid_shop_url: Virheellinen kaupan verkkotunnus
+  invalid_account_url: Virheellinen kaupan verkkotunnus
   enable_cookies_heading: Ota käyttöön sovelluksen %{app} evästeet
   enable_cookies_body: Sinun on otettava evästeet käyttöön manuaalisesti tässä selaimessa,
     jotta voit käyttää sovellusta %{app} Duo Dealerssa.

data/config/locales/fr.yml

@@ -2,7 +2,7 @@
 fr:
   logged_out: Vous êtes déconnecté(e)
   could_not_log_in: Impossible de se connecter à la boutique Duo Dealer
-  invalid_shop_url: Url invalide
+  invalid_account_url: Url invalide
   enable_cookies_heading: Activer les cookies de %{app}
   enable_cookies_body: Vous devez manuellement activer les cookies dans ce navigateur
     pour utiliser %{app} dans Duo Dealer.

data/config/locales/hi.yml

@@ -2,7 +2,7 @@
 hi:
   logged_out: सफलतापूर्वक लॉग आउट कर दिया
   could_not_log_in: Duo Dealer स्टोर में लॉग इन नहीं किया जा सका
-  invalid_shop_url: अमान्य शॉप डोमेन
+  invalid_account_url: अमान्य शॉप डोमेन
   enable_cookies_heading: "%{app} के कुकीज़ सक्षम करें"
   enable_cookies_body: आपको %{app} का उपयोग Duo Dealer में करने के लिए इस ब्राउज़र में
     कुकीज़ मैन्युअल रूप से सक्षम करने चाहिए.

data/config/locales/it.yml

@@ -2,7 +2,7 @@
 it:
   logged_out: Disconnessione effettuata correttamente
   could_not_log_in: Impossibile accedere al negozio Duo Dealer
-  invalid_shop_url: Dominio negozio non valido
+  invalid_account_url: Dominio negozio non valido
   enable_cookies_heading: Abilita i cookie di %{app}
   enable_cookies_body: Devi abilitare manualmente i cookie in questo browser per poter
     utilizzare %{app} da Duo Dealer.

data/config/locales/ja.yml

@@ -2,7 +2,7 @@
 ja:
   logged_out: ログインに成功しました
   could_not_log_in: Duo Dealerストアにログインできませんでした
-  invalid_shop_url: ショップのドメインが無効です
+  invalid_account_url: ショップのドメインが無効です
   enable_cookies_heading: "%{app}からのCookieを有効にする"
   enable_cookies_body: Duo Dealerで%{app}を使用できるようにするためには、このブラウザのCookieを手動で有効にする必要があります。
   enable_cookies_footer: Cookieを使用すると、各種設定や個人情報を一時的に保存することで、アプリ認証を受けることができます。30日後に有効期限が切れます。

data/config/locales/ko.yml

@@ -2,7 +2,7 @@
 ko:
   logged_out: 성공적으로 로그아웃 되었습니다.
   could_not_log_in: Duo Dealer 스토어에 로그인할 수 없습니다.
-  invalid_shop_url: 유효하지 않은 상점 도메인
+  invalid_account_url: 유효하지 않은 상점 도메인
   enable_cookies_heading: "%{app}에서 쿠키를 사용 가능"
   enable_cookies_body: Duo Dealer 내에서 %{app} 을 사용하기 위해 이 브라우저에서 쿠키를 수동으로 사용할 수 있습니다.
   enable_cookies_footer: 쿠키를 사용하면 개인의 선호나 정보를 임시로 저장하여 앱에서 사용자를 인증할 수 있습니다. 쿠키는 30일

data/config/locales/ms.yml

@@ -2,7 +2,7 @@
 ms:
   logged_out: Berjaya log keluar
   could_not_log_in: Tidak dapat log masuk ke kedai Duo Dealer
-  invalid_shop_url: Domain kedai tidak sah
+  invalid_account_url: Domain kedai tidak sah
   enable_cookies_heading: Dayakan kuki dari %{app}
   enable_cookies_body: Anda mesti mengaktifkan kuki secara manual dalam pelayar ini
     untuk %{app} digunakan dalam Duo Dealer.

data/config/locales/nb.yml

@@ -2,7 +2,7 @@
 nb:
   logged_out: Logget ut
   could_not_log_in: Kunne ikke logge på Duo Dealer-butikken
-  invalid_shop_url: Ugyldig butikkdomene
+  invalid_account_url: Ugyldig butikkdomene
   enable_cookies_heading: Aktiver informasjonskapsler fra %{app}
   enable_cookies_body: Du kan manuelt aktivere informasjonskapsler i denne nettleseren
     for å kunne bruke %{app} i Duo Dealer.

data/config/locales/nl.yml

@@ -2,7 +2,7 @@
 nl:
   logged_out: u bent afgemeld
   could_not_log_in: Kon niet aanmelden bij Duo Dealer-winkel
-  invalid_shop_url: Ongeldig winkeldomein
+  invalid_account_url: Ongeldig winkeldomein
   enable_cookies_heading: Schakel cookies in van %{app}
   enable_cookies_body: U moet cookies in deze browser handmatig inschakelen om %{app}
     binnen Duo Dealer te gebruiken.

data/config/locales/pl.yml

@@ -2,7 +2,7 @@
 pl:
   logged_out: Pomyślne wylogowanie
   could_not_log_in: Nie można zalogować się do sklepu Duo Dealer
-  invalid_shop_url: Nieprawidłowa domena sklepu
+  invalid_account_url: Nieprawidłowa domena sklepu
   enable_cookies_heading: Włącz korzystanie z plików cookie z %{app}
   enable_cookies_body: Aby móc korzystać z %{app} w Duo Dealer, musisz ręcznie włączyć
     korzystanie z plików cookie w tej przeglądarce.

data/config/locales/pt-BR.yml

@@ -2,7 +2,7 @@
 pt-BR:
   logged_out: Você saiu.
   could_not_log_in: Não foi possível fazer login na Duo Dealer store
-  invalid_shop_url: Domínio de loja inválido
+  invalid_account_url: Domínio de loja inválido
   enable_cookies_heading: Habilitar cookies de %{app}
   enable_cookies_body: Você precisa habilitar manualmente os cookies neste navegador
     para usar %{app} dentro da Duo Dealer.

data/config/locales/pt-PT.yml

@@ -2,7 +2,7 @@
 pt-PT:
   logged_out: Terminou a sessão com sucesso
   could_not_log_in: Não foi possível iniciar sessão na loja da Duo Dealer
-  invalid_shop_url: Domínio de loja inválido
+  invalid_account_url: Domínio de loja inválido
   enable_cookies_heading: Ativar cookies de %{app}
   enable_cookies_body: Tem de ativar manualmente os cookies neste navegador para utilizar
     %{app} dentro da Duo Dealer.

data/config/locales/sv.yml

@@ -2,7 +2,7 @@
 sv:
   logged_out: Har loggats ut
   could_not_log_in: Det gick inte att logga in i Duo Dealer-butiken
-  invalid_shop_url: Ogiltig butiksdomän
+  invalid_account_url: Ogiltig butiksdomän
   enable_cookies_heading: Aktivera cookies från %{app}
   enable_cookies_body: Du måste aktivera cookies manuellt i den här webbläsaren för
     att kunna använda %{app} inom Duo Dealer.

data/config/locales/th.yml

@@ -2,7 +2,7 @@
 th:
   logged_out: ออกจากระบบสำเร็จ
   could_not_log_in: ไม่สามารถเข้าสู่ระบบร้านค้า Duo Dealer ได้
-  invalid_shop_url: โดเมนร้านค้าไม่ถูกต้อง
+  invalid_account_url: โดเมนร้านค้าไม่ถูกต้อง
   enable_cookies_heading: เปิดใช้งานคุกกี้จาก %{app}
   enable_cookies_body: คุณต้องเปิดใช้งานคุกกี้ด้วยตนเองในเบราว์เซอร์นี้เพื่อใช้งาน
     %{app} ภายใน Duo Dealer

data/config/locales/tr.yml

@@ -2,7 +2,7 @@
 tr:
   logged_out: Oturum başarıyla kapatıldı
   could_not_log_in: Duo Dealer mağazasında oturum açılamadı
-  invalid_shop_url: Geçersiz mağaza alan adı
+  invalid_account_url: Geçersiz mağaza alan adı
   enable_cookies_heading: "%{app} uygulamasından çerezleri etkinleştir"
   enable_cookies_body: "%{app} uygulamasını Duo Dealer içinde kullanabilmek için bu tarayıcıda
     çerezleri manuel olarak etkinleştirmelisiniz."

data/config/locales/zh-CN.yml

@@ -2,7 +2,7 @@
 zh-CN:
   logged_out: 已成功退出
   could_not_log_in: 无法登录到 Duo Dealer 商店
-  invalid_shop_url: 商店域名无效
+  invalid_account_url: 商店域名无效
   enable_cookies_heading: 从 %{app} 启用 Cookie
   enable_cookies_body: 您必须在此浏览器中手动启用 Cookie 才能在 Duo Dealer 中使用 %{app}。
   enable_cookies_footer: Cookie 使此应用能够通过暂时存储您的偏好设置和个人信息来验证您的身份。这些信息将在 30 天后过期。

data/config/locales/zh-TW.yml

@@ -2,7 +2,7 @@
 zh-TW:
   logged_out: 登出成功
   could_not_log_in: 無法登入 Duo Dealer 商店
-  invalid_shop_url: 商店網域無效
+  invalid_account_url: 商店網域無效
   enable_cookies_heading: 啟用 %{app} 的 Cookie
   enable_cookies_body: 您必須在此瀏覽器中手動啟用 Cookie，才能夠在 Duo Dealer 使用 %{app}。
   enable_cookies_footer: Cookie 可讓應用程式暫時儲存您的偏好設定和個人資訊，藉此驗證您的身分，這些資料會在 30 天後失效。

data/lib/duodealer_app/managers/scripttags_manager.rb

@@ -4,12 +4,12 @@ module DuodealerApp
   class ScripttagsManager
     class CreationFailed < StandardError; end
 
-    def self.queue(shop_domain, shop_token, scripttags)
+    def self.queue(account_domain, account_token, scripttags)
       DuodealerApp::ScripttagsManagerJob.perform_later(
-        shop_domain: shop_domain,
-        shop_token: shop_token,
+        account_domain: account_domain,
+        account_token: account_token,
         # Procs cannot be serialized so we interpolate now, if necessary
-        scripttags: build_src(scripttags, shop_domain)
+        scripttags: build_src(scripttags, account_domain)
       )
     end
 
@@ -22,11 +22,11 @@ module DuodealerApp
       end
     end
 
-    attr_reader :required_scripttags, :shop_domain
+    attr_reader :required_scripttags, :account_domain
 
-    def initialize(scripttags, shop_domain)
+    def initialize(scripttags, account_domain)
       @required_scripttags = scripttags
-      @shop_domain = shop_domain
+      @account_domain = account_domain
     end
 
     def recreate_scripttags!
@@ -53,7 +53,7 @@ module DuodealerApp
 
     private
       def expanded_scripttags
-        self.class.build_src(required_scripttags, shop_domain)
+        self.class.build_src(required_scripttags, account_domain)
       end
 
       def is_required_scripttag?(scripttags, tag)

data/lib/duodealer_app/managers/webhooks_manager.rb

@@ -4,10 +4,10 @@ module DuodealerApp
   class WebhooksManager
     class CreationFailed < StandardError; end
 
-    def self.queue(shop_domain, shop_token, webhooks)
+    def self.queue(account_domain, account_token, webhooks)
       DuodealerApp::WebhooksManagerJob.perform_later(
-        shop_domain: shop_domain,
-        shop_token: shop_token,
+        account_domain: account_domain,
+        account_token: account_token,
         webhooks: webhooks
       )
     end

data/lib/duodealer_app/session/session_storage.rb

@@ -8,7 +8,7 @@ module DuodealerApp
       if DuodealerApp.configuration.per_user_tokens?
         extend DuodealerApp::SessionStorage::UserStorageStrategy
       else
-        extend DuodealerApp::SessionStorage::ShopStorageStrategy
+        extend DuodealerApp::SessionStorage::AccountStorageStrategy
       end
 
       validates :duodealer_token, presence: true

data/lib/duodealer_app/session/storage_strategies/account_storage_strategy.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module DuodealerApp
+  module SessionStorage
+    module AccountStorageStrategy
+      def store(auth_session, *args)
+        account = find_or_initialize_by(duodealer_domain: auth_session.domain)
+        account.duodealer_token = auth_session.token
+        account.save!
+        account.id
+      end
+
+      def retrieve(id)
+        return unless id
+        if account = self.find_by(id: id)
+          DuodealerAPI::Session.new(
+            domain: account.duodealer_domain,
+            token: account.duodealer_token,
+            api_version: account.api_version
+          )
+        end
+      end
+    end
+  end
+end

data/lib/duodealer_app/utils.rb

@@ -2,8 +2,8 @@
 
 module DuodealerApp
   module Utils
-    def self.sanitize_shop_domain(shop_domain)
-      name = shop_domain.to_s.downcase.strip
+    def self.sanitize_account_domain(account_domain)
+      name = account_domain.to_s.downcase.strip
       name += ".#{DuodealerApp.configuration.duodealer_domain}" if !name.include?("#{DuodealerApp.configuration.duodealer_domain}") && !name.include?(".")
       name.sub!(%r|https?://|, "")
 

data/lib/duodealer_app/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DuodealerApp
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/duodealer_app.rb

@@ -46,7 +46,7 @@ module DuodealerApp
   require "duodealer_app/middleware/same_site_cookie_middleware"
 
   # session
-  require "duodealer_app/session/storage_strategies/shop_storage_strategy"
+  require "duodealer_app/session/storage_strategies/account_storage_strategy"
   require "duodealer_app/session/storage_strategies/user_storage_strategy"
   require "duodealer_app/session/session_storage"
   require "duodealer_app/session/session_repository"

data/lib/generators/duodealer_app/{shop_model/shop_model_generator.rb → account_model/account_model_generator.rb}

@@ -1,28 +1,26 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 require "rails/generators/active_record"
 
 module DuodealerApp
   module Generators
-    class ShopModelGenerator < Rails::Generators::Base
+    class AccountModelGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
       source_root File.expand_path("../templates", __FILE__)
 
-      def create_shop_model
-        copy_file "shop.rb", "app/models/shop.rb"
+      def create_account_model
+        copy_file "account.rb", "app/models/account.rb"
       end
 
-      def create_shop_migration
-        migration_template "db/migrate/create_shops.erb", "db/migrate/create_shops.rb"
+      def create_account_migration
+        migration_template "db/migrate/create_accounts.erb", "db/migrate/create_accounts.rb"
       end
 
       def update_duodealer_app_initializer
-        gsub_file "config/initializers/duodealer_app.rb", "DuodealerApp::InMemorySessionStore", "Shop"
+        gsub_file "config/initializers/duodealer_app.rb", "DuodealerApp::InMemorySessionStore", "account"
       end
 
-      def create_shop_fixtures
-        copy_file "shops.yml", "test/fixtures/shops.yml"
+      def create_account_fixtures
+        copy_file "accounts.yml", "test/fixtures/accounts.yml"
       end
 
       private

data/lib/generators/duodealer_app/account_model/templates/db/migrate/create_accounts.erb

@@ -0,0 +1,11 @@
+class CreateAccounts < ActiveRecord::Migration[<%= rails_migration_version %>]
+  def change
+    create_table :accounts  do |t|
+      t.string :duodealer_domain, null: false
+      t.string :duodealer_token, null: false
+      t.timestamps
+    end
+
+    add_index :accounts, :duodealer_domain, unique: true
+  end
+end

data/lib/generators/duodealer_app/add_after_authenticate_job/add_after_authenticate_job_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

data/lib/generators/duodealer_app/add_after_authenticate_job/templates/after_authenticate_job.rb

@@ -1,7 +1,7 @@
 module Duodealer
   class AfterAuthenticateJob < ActiveJob::Base
-    def perform(shop_domain:)
-      shop = Shop.find_by(duodealer_domain: shop_domain)
+    def perform(account_domain:)
+      shop = Shop.find_by(duodealer_domain: account_domain)
 
       shop.with_duodealer_session do
       end

data/lib/generators/duodealer_app/add_marketing_activity_extension/add_marketing_activity_extension_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

data/lib/generators/duodealer_app/add_marketing_activity_extension/templates/marketing_activities_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class MarketingActivitiesController < DuodealerApp::ExtensionVerificationController
   def preload_form_data
     preload_data = {

data/lib/generators/duodealer_app/add_webhook/add_webhook_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

data/lib/generators/duodealer_app/add_webhook/templates/webhook_job.rb

@@ -1,6 +1,6 @@
 class <%= @job_class_name %> < ActiveJob::Base
-  def perform(shop_domain:, webhook:)
-    shop = Shop.find_by(duodealer_domain: shop_domain)
+  def perform(account_domain:, webhook:)
+    shop = Shop.find_by(duodealer_domain: account_domain)
 
     shop.with_duodealer_session do
     end

data/lib/generators/duodealer_app/app_proxy_controller/app_proxy_controller_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AppProxyController < ApplicationController
   include DuodealerApp::AppProxyVerification
 

data/lib/generators/duodealer_app/authenticated_controller/authenticated_controller_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AuthenticatedController < ApplicationController
   include DuodealerApp::Authenticated
 end

data/lib/generators/duodealer_app/controllers/controllers_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

data/lib/generators/duodealer_app/duodealer_app_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module DuodealerApp
   module Generators
     class DuodealerAppGenerator < Rails::Generators::Base
@@ -10,7 +8,7 @@ module DuodealerApp
 
       def run_all_generators
         generate "duodealer_app:install #{@opts.join(' ')}"
-        generate "duodealer_app:shop_model"
+        generate "duodealer_app:account_model"
         generate("duodealer_app:authenticated_controller")
         generate "duodealer_app:home_controller"
       end

data/lib/generators/duodealer_app/home_controller/home_controller_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class HomeController < AuthenticatedController
   def index
     @products = DuodealerAPI::Product.find(:all, params: { limit: 10 })

data/lib/generators/duodealer_app/home_controller/templates/index.html.erb

@@ -2,7 +2,7 @@
 
 <ul>
   <% @products.each do |product| %>
-    <li><%= link_to product.title, "https://#{@shop_session.domain}/admin/products/#{product.id}", target: "_top" %></li>
+    <li><%= link_to product.title, "https://#{@account_session.domain}/admin/products/#{product.id}", target: "_top" %></li>
   <% end %>
 </ul>
 

data/lib/generators/duodealer_app/install/install_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

data/lib/generators/duodealer_app/install/templates/embedded_app.html.erb

@@ -28,7 +28,7 @@
 
     <%= content_tag(:div, nil, id: 'duodealer-app-init', data: {
       api_key: DuodealerApp.configuration.api_key,
-      shop_origin: (@shop_session.domain if @shop_session),
+      account_origin: (@account_session.domain if @account_session),
       debug: Rails.env.development?
     } ) %>
 

data/lib/generators/duodealer_app/install/templates/session_store.rb

@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store(:cookie_store, key: '_example_session', expire_after: 14.days)

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

data/lib/generators/duodealer_app/rotate_duodealer_token_job/templates/rotate_duodealer_token.rake

@@ -1,17 +1,16 @@
-# frozen_string_literal: true
 namespace :duodealer do
-  desc "Rotate duodealer tokens for all active shops"
+  desc "Rotate duodealer tokens for all active accounts"
   task :rotate_duodealer_tokens, [:refresh_token] => :environment do |_t, args|
-    all_active_shops.find_each do |shop|
+    all_active_accounts.find_each do |account|
       Duodealer::RotateDuodealerTokenJob.perform_later(
-        shop_domain: shop.duodealer_domain,
+        account_domain: account.duodealer_domain,
         refresh_token: args[:refresh_token]
       )
     end
   end
 
   # Its implementation will depend on the app configuration. Change accordingly.
-  def all_active_shops
-    Shop.all
+  def all_active_accounts
+    Account.all
   end
 end

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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Duodealer
   class RotateDuodealerTokenJob < ActiveJob::Base
     def perform(params)

data/lib/generators/duodealer_app/routes/routes_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

data/lib/generators/duodealer_app/user_model/user_model_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 require "rails/generators/active_record"
 

data/lib/generators/duodealer_app/views/views_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "rails/generators/base"
 
 module DuodealerApp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duodealer_app
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Eric Raio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser_sniffer
@@ -212,7 +212,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".!66854!duodealer_app.gemspec"
 - ".babelrc"
 - ".gitignore"
 - ".nvmrc"
@@ -272,69 +271,12 @@ files:
 - config/locales/zh-CN.yml
 - config/locales/zh-TW.yml
 - config/routes.rb
-- docs/.!20385!test-your-app.png
-- docs/.!20388!install-on-dev-shop.png
-- docs/.!62511!test-your-app.png
-- docs/.!62512!install-on-dev-shop.png
-- docs/.!62763!test-your-app.png
-- docs/.!62765!install-on-dev-shop.png
-- docs/.!63018!test-your-app.png
-- docs/.!63020!install-on-dev-shop.png
-- docs/.!63289!test-your-app.png
-- docs/.!63291!install-on-dev-shop.png
-- docs/.!63562!test-your-app.png
-- docs/.!63564!install-on-dev-shop.png
-- docs/.!63872!test-your-app.png
-- docs/.!63874!install-on-dev-shop.png
-- docs/.!64151!test-your-app.png
-- docs/.!64153!install-on-dev-shop.png
-- docs/.!64428!test-your-app.png
-- docs/.!64431!install-on-dev-shop.png
-- docs/.!64737!test-your-app.png
-- docs/.!64740!install-on-dev-shop.png
-- docs/.!65025!test-your-app.png
-- docs/.!65028!install-on-dev-shop.png
-- docs/.!65324!test-your-app.png
-- docs/.!65327!install-on-dev-shop.png
-- docs/.!65626!test-your-app.png
-- docs/.!65629!install-on-dev-shop.png
-- docs/.!65942!test-your-app.png
-- docs/.!65945!install-on-dev-shop.png
-- docs/.!66760!test-your-app.png
-- docs/.!66763!install-on-dev-shop.png
-- docs/.!67028!test-your-app.png
-- docs/.!67031!install-on-dev-shop.png
-- docs/.!67657!test-your-app.png
-- docs/.!67660!install-on-dev-shop.png
-- docs/.!68031!test-your-app.png
-- docs/.!68034!install-on-dev-shop.png
-- docs/.!68363!test-your-app.png
-- docs/.!68366!install-on-dev-shop.png
 - docs/Quickstart.md
 - docs/Releasing.md
 - docs/Troubleshooting.md
 - docs/install-on-dev-shop.png
 - docs/test-your-app.png
 - duodealer_app.gemspec
-- images/.!20334!app-proxy-screenshot.png
-- images/.!62504!app-proxy-screenshot.png
-- images/.!62754!app-proxy-screenshot.png
-- images/.!63008!app-proxy-screenshot.png
-- images/.!63277!app-proxy-screenshot.png
-- images/.!63548!app-proxy-screenshot.png
-- images/.!63855!app-proxy-screenshot.png
-- images/.!64132!app-proxy-screenshot.png
-- images/.!64407!app-proxy-screenshot.png
-- images/.!64714!app-proxy-screenshot.png
-- images/.!65000!app-proxy-screenshot.png
-- images/.!65296!app-proxy-screenshot.png
-- images/.!65594!app-proxy-screenshot.png
-- images/.!65908!app-proxy-screenshot.png
-- images/.!66724!app-proxy-screenshot.png
-- images/.!66989!app-proxy-screenshot.png
-- images/.!67614!app-proxy-screenshot.png
-- images/.!67986!app-proxy-screenshot.png
-- images/.!68314!app-proxy-screenshot.png
 - images/app-proxy-screenshot.png
 - karma.conf.js
 - lib/duodealer_app.rb
@@ -354,10 +296,14 @@ files:
 - lib/duodealer_app/session/in_memory_session_store.rb
 - lib/duodealer_app/session/session_repository.rb
 - lib/duodealer_app/session/session_storage.rb
-- lib/duodealer_app/session/storage_strategies/shop_storage_strategy.rb
+- lib/duodealer_app/session/storage_strategies/account_storage_strategy.rb
 - lib/duodealer_app/session/storage_strategies/user_storage_strategy.rb
 - lib/duodealer_app/utils.rb
 - lib/duodealer_app/version.rb
+- lib/generators/duodealer_app/account_model/account_model_generator.rb
+- lib/generators/duodealer_app/account_model/templates/account.rb
+- lib/generators/duodealer_app/account_model/templates/account.yml
+- lib/generators/duodealer_app/account_model/templates/db/migrate/create_accounts.erb
 - lib/generators/duodealer_app/add_after_authenticate_job/add_after_authenticate_job_generator.rb
 - lib/generators/duodealer_app/add_after_authenticate_job/templates/after_authenticate_job.rb
 - lib/generators/duodealer_app/add_marketing_activity_extension/add_marketing_activity_extension_generator.rb
@@ -391,10 +337,6 @@ files:
 - lib/generators/duodealer_app/rotate_duodealer_token_job/templates/rotate_duodealer_token_job.rb
 - lib/generators/duodealer_app/routes/routes_generator.rb
 - lib/generators/duodealer_app/routes/templates/routes.rb
-- lib/generators/duodealer_app/shop_model/shop_model_generator.rb
-- lib/generators/duodealer_app/shop_model/templates/db/migrate/create_shops.erb
-- lib/generators/duodealer_app/shop_model/templates/shop.rb
-- lib/generators/duodealer_app/shop_model/templates/shops.yml
 - lib/generators/duodealer_app/user_model/templates/db/migrate/create_users.erb
 - lib/generators/duodealer_app/user_model/templates/user.rb
 - lib/generators/duodealer_app/user_model/templates/users.yml

data/lib/duodealer_app/session/storage_strategies/shop_storage_strategy.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module DuodealerApp
-  module SessionStorage
-    module ShopStorageStrategy
-      def store(auth_session, *args)
-        shop = find_or_initialize_by(duodealer_domain: auth_session.domain)
-        shop.duodealer_token = auth_session.token
-        shop.save!
-        shop.id
-      end
-
-      def retrieve(id)
-        return unless id
-        if shop = self.find_by(id: id)
-          DuodealerAPI::Session.new(
-            domain: shop.duodealer_domain,
-            token: shop.duodealer_token,
-            api_version: shop.api_version
-          )
-        end
-      end
-    end
-  end
-end

data/lib/generators/duodealer_app/shop_model/templates/db/migrate/create_shops.erb

@@ -1,15 +0,0 @@
-class CreateShops < ActiveRecord::Migration[<%= rails_migration_version %>]
-  def self.up
-    create_table :shops  do |t|
-      t.string :duodealer_domain, null: false
-      t.string :duodealer_token, null: false
-      t.timestamps
-    end
-
-    add_index :shops, :duodealer_domain, unique: true
-  end
-
-  def self.down
-    drop_table :shops
-  end
-end