shopapp 0.2.64 → 0.2.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e76522947f310606b06cd0c94be0a018479194fd4c09e2b1f27c10019a60354
-  data.tar.gz: 777d68b75bf8f8e0fabeed55e02183cb835ad58cfc081f1482ba1e97f80f8577
+  metadata.gz: b9a36e2f6ece1b23aad4a03d49d919a0e877321925a26204bb08a952cfe4cf76
+  data.tar.gz: 43d2a9d45768a7bc4185a8b666ec43d5fe7c6e0d83ee11bcc673b2a3b4d68685
 SHA512:
-  metadata.gz: e15db8c0ed67bac56acfb4fff0329397ac09230806a9be85851cfae87242b466f5b1275702c42e6c68c46bc5e8f665e05c2f60a9dd3ce61502982a130125ed16
-  data.tar.gz: 9f2272b8ff45d0637edbc761dd0bb09e6a31a9fc65bc4b83abf7d675a4835941a42a59ba9a0cb4a9ce8db3afbc511fa4b9bb1a42e4b9888209daf01ec07a6241
+  metadata.gz: e64145e1d24b14ea1af1ea59b53dde063f2058e099afc072556023ccad0e57a7bfe4d842f54a8d7c0ba9da29dda04574084f9a0d369f24bcebd73690b1295540
+  data.tar.gz: 729f88f254de28015e3c6dccb29b70d28bfb7bc5794d72fb815ed2cd683b729beaf82b6ca308a11977ff911819312c0a593c0b4ce068ccf6073a148a4a401865

data/README.md

@@ -93,4 +93,4 @@ shopapp to support i18n, add two methods to your ApplicationController:
 
 To build new version of this gem, change the version in shopapp.gemspec and run:
 
-    git push; gem build shopapp.gemspec ; gem push shopapp-0.2.64.gem; gem install shopapp
+    git push; gem build shopapp.gemspec ; gem push shopapp-0.2.65.gem; gem install shopapp

data/app/controllers/concerns/shoplift_client.rb

@@ -16,6 +16,7 @@ module ShopliftClient
     helper_method :company_logo_path_defined
     helper_method :supported_locales_defined
     helper_method :home_link_path
+    helper_method :shoplift_login_url
   end
 
   class_methods do
@@ -107,14 +108,22 @@ module ShopliftClient
     end
   end
 
-  def redirect_unauthorized
+  def shoplift_login_url
+    client.auth_code.authorize_url(
+      redirect_uri: local_authlift_redirect_uri,
+      scope: scope)
+  end
+
+  def redirect_unauthorized(skip_landing_page = false)
     return if performed?
     session.clear
     session[:previous_url] = request.fullpath
 
-    redirect_to client.auth_code.authorize_url(
-      redirect_uri: local_authlift_redirect_uri,
-      scope: scope)
+    if Rails.configuration.settings['use_welcome_screen'].present? && !skip_landing_page
+      redirect_to login_message_path
+    else
+      redirect_to shoplift_login_url
+    end
   end
 
   def scope
@@ -181,8 +190,8 @@ module ShopliftClient
     true
   end
 
-  def authenticate_user!
-    redirect_unauthorized unless authenticate_user
+  def authenticate_user!(skip_landing_page = false)
+    redirect_unauthorized(skip_landing_page) unless authenticate_user
   end
 
   def authenticate_user_or_api!

data/app/controllers/shopapp_login_controller.rb

@@ -0,0 +1,22 @@
+class ShopappLoginController < ApplicationController
+  include ShopliftClient
+
+  def welcome
+    unless Rails.configuration.settings['use_welcome_screen'].present?
+      redirect_to root_path
+      return
+    end
+
+    if authenticate_user
+      redirect_to root_path
+    else
+      if params['logged_in'] == 'false'
+        render 'shopapp/login_message', layout: nil
+      elsif params['logged_in'] == 'true'
+        authenticate_user! true
+      else
+        redirect_to "#{Rails.configuration.settings['authlift_url']}softly_verify_login"
+      end
+    end
+  end
+end

data/app/views/shopapp/login_message.haml

@@ -0,0 +1,31 @@
+!!!
+%html
+  %head
+    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %title OZZ Account Login
+    -# %link{:href => "https://fonts.googleapis.com/icon?family=Material+Icons", :rel => "stylesheet"}/
+    -# %link{:href => "https://fonts.googleapis.com/css?family=Fira+Sans:400,500,700", :rel => "stylesheet"}/
+    = csrf_meta_tags
+    = stylesheet_link_tag    'application', media: 'all'
+    = javascript_include_tag 'application'
+    = shopapp3_favicon
+  %body.bg-light
+    .row.justify-content-center
+      %div(class="#{@widebody ? 'col' : 'col-xl-5 col-lg-6 col-md-8 col-sm-10 col'}")
+        .container.pt-sm-5.pt-2
+          - if notice
+            .alert.alert-secondary.mt-3(role="alert")= notice
+          - if alert
+            .alert.alert-danger.mt-3(role="alert")= alert
+          .jumbotron.bg-secondary.text-light
+            .container.h-100
+              = image_tag company_logo_path_defined
+              %h2.pt-5 #{@current_shop_owner.name} B2B shop
+              %h1.mt-3 Welcome!
+              %p.mt-5
+                #{@current_shop_owner.name} B2B Shop is running on OZZ platform.
+                You need to login with your OZZ account to proceed.
+              = link_to shoplift_login_url do
+                %button.btn.btn-primary.btn-lg.float-right.my-5
+                  Proceed to login
+              .clearfix

data/lib/shopapp/routes.rb

@@ -4,5 +4,7 @@ class ActionDispatch::Routing::Mapper
     post 'auth/change_company/:new_company_code', to: 'auth#change_company', as: 'change_company'
     post 'auth/change_language/:new_language_code', to: 'auth#change_language', as: 'change_language'
     delete 'auth', to: 'auth#destroy', as: 'logout'
+
+    get 'login', to: 'shopapp_login#welcome', as: 'login_message'
   end
-end
+end

data/shopapp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.64'
-  s.date        = '2019-09-24'
+  s.version     = '0.2.65'
+  s.date        = '2019-09-25'
   s.summary     = 'Do a shoplift.'
   s.description = 'Ha! Art thou Bedlam? Dost thou thirst base Trojan, to have me fold up Parca\'s fatal web? Hence!\
                    I am qualmish at the smell of leek.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopapp
 version: !ruby/object:Gem::Version
-  version: 0.2.64
+  version: 0.2.65
 platform: ruby
 authors:
 - Zeljko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -414,6 +414,7 @@ files:
 - app/controllers/concerns/shopapp3.rb
 - app/controllers/concerns/shoplift_client.rb
 - app/controllers/concerns/shoplift_search.rb
+- app/controllers/shopapp_login_controller.rb
 - app/controllers/user_authenticated_controller.rb
 - app/controllers/user_authenticated_or_api_controller.rb
 - app/helpers/euro_helper.rb
@@ -425,6 +426,7 @@ files:
 - app/views/shopapp/_shopapp2.html.haml
 - app/views/shopapp/_shopapp3.html.haml
 - app/views/shopapp/_shopapp_alerts.html.haml
+- app/views/shopapp/login_message.haml
 - bin/shop
 - bin/shopitapp
 - config/initializers/active_settings.rb