shopify_app 8.2.4 → 8.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1662a396a08cd1ba5550280392d00fe2886e0ca
-  data.tar.gz: 8b8744e2ae2ece532aa36973cc6057642cba49cd
+  metadata.gz: 7cb86cb83230251cb968831235d493374af72078
+  data.tar.gz: 9cc6298756b568b83a36bc223375687c9485e958
 SHA512:
-  metadata.gz: 1cd6fd0df8ecddb2dfc28a5cd301dac2606cb729e62261d7363a06c7044568466eb9ee13fa2225f1a599b3c7c7bacdb53cbc7fe5f73597437abcd59b156e0128
-  data.tar.gz: 0f1ef949777a3f65b857b69e2bb328db7b449450cd7ac3fc3eb3924106791e6fd91dc40a4f1bd2d25026685f5e33bc0e02449e10cc5c33bf03b7651615a753a0
+  metadata.gz: 9d6537b2fc344d439964c58e92f18460315161183e9f197dedb958f2997c225a0cca0a09d17afd7c274d441638a0c9730c0913325def0550edcdec7e726c1e0d
+  data.tar.gz: b98fd48e225d0b1d8a0f93b290c21c91bf7b796e2dcc47a426b9825a4e3b644062327d2c6fe9b483f37362972afe9e0546233046c5cc7af896edb330cd9782b8

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+8.2.5
+* fix iframe headers on session controller
+
 8.2.4
 -----
 * Add CSRF protection through `protect_from_forgery with: :exception` on `ShopifyApp::AuthenticatedController`

data/README.md

@@ -143,7 +143,7 @@ After running the `install` generator, you can start your app with `bundle exec
 $ rails generate shopify_app:shop_model
 ```
 
-The install generator doesn't create any database tables or models for you. If you are starting a new app its quite likely that you will want a shops table and model to store the tokens when your app is installed (most of our internally developed apps do!). This generator creates a shop model and a migration. This model includes the `ShopifyApp::Shop` concern which adds two methods to make it compatible as a `SessionRepository`. After running this generator you'll notice the `session_repository` in your `config/initializers/shopify_app.rb` will be set to the `Shop` model. This means that internally ShopifyApp will try and load tokens from this model.
+The install generator doesn't create any database tables or models for you. If you are starting a new app its quite likely that you will want a shops table and model to store the tokens when your app is installed (most of our internally developed apps do!). This generator creates a shop model and a migration. This model includes the `ShopifyApp::SessionStorage` concern which adds two methods to make it compatible as a `SessionRepository`. After running this generator you'll notice the `session_repository` in your `config/initializers/shopify_app.rb` will be set to the `Shop` model. This means that internally ShopifyApp will try and load tokens from this model.
 
 *Note that you will need to run rake db:migrate after this generator*
 
@@ -360,7 +360,7 @@ bin/rails g shopify_app:add_after_authenticate_job
 ShopifyApp::SessionRepository
 -----------------------------
 
-`ShopifyApp::SessionRepository` allows you as a developer to define how your sessions are retrieved and stored for a shop. The `SessionRepository` is configured in the `config/initializers/shopify_app.rb` file and can be set to any object that implements `self.store(shopify_session)` which stores the session and returns a unique identifier and `self.retrieve(id)` which returns a `ShopifyAPI::Session` for the passed id. See either the `ShopifyApp::InMemorySessionStore` class or the `ShopifyApp::Shop` concern for examples.
+`ShopifyApp::SessionRepository` allows you as a developer to define how your sessions are retrieved and stored for shops. The `SessionRepository` is configured in the `config/initializers/shopify_app.rb` file and can be set to any object that implements `self.store(shopify_session)` which stores the session and returns a unique identifier and `self.retrieve(id)` which returns a `ShopifyAPI::Session` for the passed id. See either the `ShopifyApp::InMemorySessionStore` class or the `ShopifyApp::SessionStorage` concern for examples.
 
 If you only run the install generator then by default you will have an in memory store but it **won't work** on multi-server environments including Heroku. If you ran all the generators including the shop_model generator then the `Shop` model itself will be the `SessionRepository`. If you look at the implementation of the generated shop model you'll see that this gem provides a concern for the `SessionRepository`. You can use this concern on any model that responds to `shopify_domain` and `shopify_token`.
 

data/app/controllers/shopify_app/sessions_controller.rb

@@ -2,6 +2,9 @@ module ShopifyApp
   class SessionsController < ActionController::Base
     include ShopifyApp::LoginProtection
     layout false, only: :new
+    after_action only: :new do |controller|
+      controller.response.headers.except!('X-Frame-Options')
+    end
 
     def new
       authenticate if sanitized_shop_name.present?
@@ -38,6 +41,7 @@ module ShopifyApp
         session['shopify.omniauth_params'] = { shop: sanitized_shop_name }
         fullpage_redirect_to "#{main_app.root_path}auth/shopify"
       else
+        flash[:error] = I18n.t('invalid_shop_url')
         redirect_to return_address
       end
     end

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

@@ -48,6 +48,12 @@
       line-height: 2em;
     }
 
+    .error {
+      line-height: 1em;
+      padding: 0.5em;
+      color: red;
+    }
+
     input.marketing-input {
       width: 100%;
       height: 52px;
@@ -104,7 +110,10 @@
       <label for="shop">Enter your shop domain to log in or install this app.</label>
     </p>
 
-    <form method="GET" action="login">
+    <form method="POST" action="login">
+      <% if flash[:error] %>
+        <div class=error><%= flash[:error] %></div>
+      <% end %>
       <input id="shop" name="shop" type="text" autofocus="autofocus" placeholder="example.myshopify.com" class="marketing-input">
       <button type="submit" class="marketing-button">Install</button>
     </form>

data/config/locales/en.yml

@@ -1,3 +1,4 @@
 en:
   logged_out: 'Successfully logged out'
   could_not_log_in: 'Could not log in to Shopify store'
+  invalid_shop_url: 'Invalid shop domain'

data/config/locales/fr.yml

@@ -1,3 +1,4 @@
 fr:
   logged_out: 'Vous êtes déconnecté(e)'
   could_not_log_in: 'Impossible de se connecter à la boutique Shopify'
+  invalid_shop_url: 'Url invalide'

data/lib/shopify_app/version.rb

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = '8.2.4'
+  VERSION = '8.2.5'
 end

data/shopify_app.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.author      = "Shopify"
   s.summary     = %q{This gem is used to get quickly started with the Shopify API}
 
-  s.required_ruby_version = ">= 2.2.2"
+  s.required_ruby_version = ">= 2.3.1"
 
   s.add_runtime_dependency('rails', '>= 5.0.0')
   s.add_runtime_dependency('shopify_api', '>= 4.3.5')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 8.2.4
+  version: 8.2.5
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -207,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="