j1_template_mde 2018.4.13 → 2018.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c23e994ca666b95e3a990ac39405a56f2008d47
-  data.tar.gz: f470ecc01a8f282dd76f8a6a4c2839ddf3d7f122
+  metadata.gz: 50fdf4baf4065cd8c1783f8d5e6114956ae79a8b
+  data.tar.gz: 7bf1982f2266f606bd435abebfe25fe5c1d29ba3
 SHA512:
-  metadata.gz: 559cb19ae7599456581626ded10435e762ed5e109720eba60bf711bff0f79979f6be57727d97d02fce2af38c77261cb1c8035b71fb141425d0a9f0de8ac23129
-  data.tar.gz: e18cf30e82e710d2d86a57a65d6c3d28007185fa8a2072c9c42bbb515ce9d84fd1aaeb3e3413d736462272935bcba3a02a42f7b781f86dae35726f93f3c723fb
+  metadata.gz: e230ed4d944e11fbda67e83c24a6b3281af89f374c071358c0f146d0f8f5d0a563ebc3049d93e346bfbbc1f9f70c03d622ebcd77a3fae80441fce0929b31255c
+  data.tar.gz: 0f41b6eaa8946286d484d9723262f015e7c57013b88b71bf0f7d7c4aabde67b36f00e53231429cfd41a3b905147b013919f46bd41f81739b27d8a7e6460bcb50

data/_includes/themes/j1/procedures/global/create_bs_button.proc

@@ -68,11 +68,14 @@
         {% if key == 'icon_color' %} {% assign button_icon_color = value %} {% endif %}
         {% if key == 'icon_size' %}  {% assign button_icon_size  = value %} {% endif %}
         {% if key == 'href' %}       {% assign button_href       = value %} {% endif %}
+        {% if key == 'target' %}     {% assign button_target     = value %} {% endif %}
       {% endfor %}
 
     {% endfor %}
 
-    {% if button_href %}
+    {% if button_href and button_target %}
+      {% capture bs_button_html %}<a href="{{button_href}}" target="{{ button_target }}" class="btn {{button_class}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
+    {% elsif button_href %}
       {% capture bs_button_html %}<a href="{{button_href}}" class="btn {{button_class}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
     {% else %}
       {% capture bs_button_html %}<!-- INFO: No valid value for parameter href found. -->{% endcapture %}

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2018.4.13'
+  VERSION = '2018.4.14'
 end

data/lib/j1_app/j1_auth_manager/auth_manager.rb

@@ -1,5 +1,22 @@
 # frozen_string_literal: true
 
+# ------------------------------------------------------------------------------
+#  ~/lib/j1_auth_manager/auth_manager/.rb
+#
+#  Provides authentication services based on Warden|OmniAuth
+#
+#  Product/Info:
+#  https://jekyll-one.com
+#
+#  Copyright (C) 2019 Juergen Adams
+#
+#  J1 Template is licensed under the MIT License.
+#  See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+# NOTES
+#
+# ------------------------------------------------------------------------------
 module J1App
   class AuthManager < Sinatra::Base
 
@@ -12,11 +29,11 @@ module J1App
 
     # NOTE: https://stackoverflow.com/questions/7847536/sinatra-in-facebook-iframe
     #
-    set :protection, :except => :frame_options
+    #set :protection, :except => :frame_options
 
     # Check: http://sinatrarb.com/intro.html
     #
-    set :static_cache_control, [:public, :max_age => 10]
+    #set :static_cache_control, [:public, :max_age => 10]
 
 
     # ==========================================================================
@@ -24,17 +41,16 @@ module J1App
     # ==========================================================================
 
     j1_web_session = {
-        'authenticated'   => 'false',
-        'requested_page'  => '/',
-        'users_allowed'   => 'unknown',
-        'user_name'       => 'unknown',
-        'user_id'         => 'unknown',
-        'user_details'    => 'unknown',
-        'user_pledges'    => 'unknown',
-        'provider'        => 'unknown',
-        'provider_url'    => '/',
-        'permissions'     => 'unknown',
-        'writer'          => 'middleware'
+        'authenticated'       => 'false',
+        'requested_page'      => '/',
+        'users_allowed'       => 'unknown',
+        'user_name'           => 'unknown',
+        'user_id'             => 'unknown',
+        'provider'            => 'unknown',
+        'provider_url'        => '/',
+        'payment_info'        => 'unknown',
+        'permissions'         => 'unknown',
+        'writer'              => 'middleware'
     }
 
     # Enable SSL for the rack session if configured
@@ -97,40 +113,62 @@ module J1App
 
       # Detect and set supported authentication strategies for OmniAuth
       # ------------------------------------------------------------------------
+
+      # Additional (strategy) option skip_extra, default: true
+      #
+      # If true, skips the collection of raw data (extra) to NOT blow
+      # up the session cookie (as it is limited to 4K)
+      skip_extra = true
+
       if J1App.provider.include? 'patreon'
-        scope = J1App.provider_scope 'patreon'
+        scope             = J1App.provider_scope 'patreon'
+        data_collection   = J1App.provider_data 'patreon'
+        skip_extra        = false if data_collection =~ /raw/i
         provider :patreon,
            ENV['PATREON_CLIENT_ID'],
            ENV['PATREON_CLIENT_SECRET'],
-           scope: "#{scope}"
+           scope: "#{scope}",
+           skip_extra: skip_extra
       end
       if J1App.provider.include? 'disqus'
-        scope = J1App.provider_scope 'disqus'
+        scope             = J1App.provider_scope 'disqus'
+        data_collection   = J1App.provider_data 'disqus'
+        skip_extra        = false if data_collection =~ /raw/i
         provider :disqus,
            ENV['DISQUS_CLIENT_ID'],
            ENV['DISQUS_CLIENT_SECRET'],
-           scope: "#{scope}"
+           scope: "#{scope}",
+           skip_extra: skip_extra
       end
       if J1App.provider.include? 'facebook'
-        scope = J1App.provider_scope 'facebook'
+        scope             = J1App.provider_scope 'facebook'
+        data_collection   = J1App.provider_data 'facebook'
+        skip_extra        = false if data_collection =~ /raw/i
         provider :facebook,
            ENV['FACEBOOK_CLIENT_ID'],
            ENV['FACEBOOK_CLIENT_SECRET'],
-           scope: "#{scope}"
+           scope: "#{scope}",
+           skip_extra: skip_extra
       end
       if J1App.provider.include? 'github'
-        scope = J1App.provider_scope 'github'
+        scope             = J1App.provider_scope 'github'
+        data_collection   = J1App.provider_data 'github'
+        skip_extra        = false if data_collection =~ /raw/i
         provider :github,
            ENV['GITHUB_CLIENT_ID'],
            ENV['GITHUB_CLIENT_SECRET'],
-           scope: "#{scope}"
+           scope: "#{scope}",
+           skip_extra: skip_extra
       end
       if J1App.provider.include? 'twitter'
-        scope = J1App.provider_scope 'twitter'
+        scope             = J1App.provider_scope 'twitter'
+        data_collection   = J1App.provider_data 'twitter'
+        skip_extra        = false if data_collection =~ /raw/i
         provider :twitter,
            ENV['TWITTER_CLIENT_ID'],
            ENV['TWITTER_CLIENT_SECRET'],
-           scope: "#{scope}"
+           scope: "#{scope}",
+           skip_extra: skip_extra
       end
     end
 
@@ -189,13 +227,7 @@ module J1App
         j1_web_session['provider']        = user[:provider]
         j1_web_session['provider_url']    = J1App.provider_url user[:provider]
         j1_web_session['permissions']     = J1App.get_provider_permissions "#{user[:provider]}"
-        if user[:provider] == 'patreon'
-          j1_web_session['user_details']  = user[:extra]['raw_info']['data']['attributes']
-          j1_web_session['user_pledges']  = user[:extra]['raw_info']['data']['relationships']['pledges'] unless user[:extra]['raw_info']['data']['relationships'].nil?
-        else
-          j1_web_session['user_pledges']  = 'unknown'
-          j1_web_session['provider']      = 'unknown'
-        end
+        j1_web_session['payment_info']    = user[:info]['payment_info']['attributes'] unless user[:info]['payment_info'].nil?
       else
         logger.info "ROOT PAGE: User detected as signed out"
         j1_web_session['authenticated']   = 'false'
@@ -203,8 +235,7 @@ module J1App
         j1_web_session['users_allowed']   = 'all'
         j1_web_session['user_name']       = 'unknown'
         j1_web_session['user_id']         = 'unknown'
-        j1_web_session['user_details']    = 'unknown'
-        j1_web_session['user_pledges']    = 'unknown'
+        j1_web_session['payment_info']    = 'unknown'
         j1_web_session['provider']        = 'unknown'        
         j1_web_session['provider_url']    = 'unknown'
         j1_web_session['permissions']     = 'unknown'
@@ -255,10 +286,7 @@ module J1App
         j1_web_session['provider_url']    = J1App.provider_url user[:provider]
         j1_web_session['users_allowed']   = users["#{user[:provider]}"]
         j1_web_session['permissions']     = J1App.get_provider_permissions "#{user[:provider]}"
-        if user[:provider] == 'patreon'
-          j1_web_session['user_details']  = user[:extra]['raw_info']['data']['attributes']
-          j1_web_session['user_pledges']  = user[:extra]['raw_info']['data']['relationships']['pledges'] unless user[:extra]['raw_info']['data']['relationships'].nil?
-        end
+        j1_web_session['payment_info']    = user[:info]['payment_info']['attributes'] unless user[:info]['payment_info'].nil?
         j1_web_session['writer']          = 'middleware'
       end
 
@@ -445,9 +473,8 @@ module J1App
           # --------------------------------------------------------------------
           j1_web_session['user_name']     = 'unknown'
           j1_web_session['user_id']       = 'unknown'
-          j1_web_session['user_details']  = 'unknown'
           j1_web_session['users_allowed'] = 'unknown'
-          j1_web_session['user_pledges']  = 'unknown'
+          j1_web_session['payment_info']  = 'unknown'
           j1_web_session['provider']      = 'unknown'
           j1_web_session['provider_url']  = 'unknown'
           j1_web_session['permissions']   = 'unknown'
@@ -507,9 +534,8 @@ module J1App
           # --------------------------------------------------------------------
           j1_web_session['user_name']     = 'unknown'
           j1_web_session['user_id']       = 'unknown'
-          j1_web_session['user_details']  = 'unknown'
           j1_web_session['users_allowed'] = 'unknown'
-          j1_web_session['user_pledges']  = 'unknown'
+          j1_web_session['payment_info']  = 'unknown'
           j1_web_session['provider']      = 'unknown'
           j1_web_session['provider_url']  = 'unknown'
           j1_web_session['permissions']   = 'unknown'
@@ -545,35 +571,41 @@ module J1App
 
       #logger.info "AFTER AUTHENTICATION: read J1 web session data as: #{j1_web_session}"
       logger.info "AFTER AUTHENTICATION: read J1 web session data"
+
       user = warden.user
-      j1_web_session['user_name']       = user[:info]['nickname']
-      j1_web_session['user_id']         = user[:uid]
-      j1_web_session['provider']        = user[:provider]
-      j1_web_session['permissions']     = J1App.get_provider_permissions "#{user[:provider]}"
-      j1_web_session['authenticated']   = 'true'
-      if user[:provider] == 'patreon'
-        j1_web_session['user_details']  = user[:extra]['raw_info']['data']['attributes']
-        j1_web_session['user_pledges']  = user[:extra]['raw_info']['data']['relationships']['pledges'] unless user[:extra]['raw_info']['data']['relationships'].nil?
-      else
-        j1_web_session['user_pledges']  = 'unknown'
-        j1_web_session['provider']      = 'unknown'
-      end
-      j1_web_session['writer']          = 'middleware'
+      user_json = user.to_json
 
-      current_user = user[:info]['nickname'] = user[:info]['nickname']
-      current_provider = user[:provider]
+      unless user.nil?
+        j1_web_session['user_name']       = user[:info]['nickname']
+        j1_web_session['user_id']         = user[:uid]
+        j1_web_session['provider']        = user[:provider]
+        j1_web_session['permissions']     = J1App.get_provider_permissions "#{user[:provider]}"
+        j1_web_session['authenticated']   = 'true'
+        j1_web_session['payment_info']    = user[:info]['payment_info']['attributes'] unless user[:info]['payment_info'].nil?
+        j1_web_session['writer']          = 'middleware'
 
-      j1_web_session['requested_page'].scan(/(private|premium)/) do |match|
-        category = match[0]
-        unless j1_web_session['users_allowed'].include? 'all'
-          unless j1_web_session['users_allowed'].include? "#{current_user}"
-            logger.info "AFTER AUTHENTICATION: User #{current_user} not allowed. Allowed users: #{j1_web_session['users_allowed']}"
-            warden.logout
-            session.clear
-            logger.info "AFTER AUTHENTICATION: User #{current_user} signed out."
-            redirect "/access_denied?provider=#{current_provider}&user=#{current_user}&category=#{category}"
+        current_user = user[:info]['nickname'] = user[:info]['nickname']
+        current_provider = user[:provider]
+
+        j1_web_session['requested_page'].scan(/(private|premium)/) do |match|
+          category = match[0]
+          unless j1_web_session['users_allowed'].include? 'all'
+            unless j1_web_session['users_allowed'].include? "#{current_user}"
+              logger.info "AFTER AUTHENTICATION: User #{current_user} not allowed. Allowed users: #{j1_web_session['users_allowed']}"
+              warden.logout
+              session.clear
+              logger.info "AFTER AUTHENTICATION: User #{current_user} signed out."
+              redirect "/access_denied?provider=#{current_provider}&user=#{current_user}&category=#{category}"
+            end
           end
         end
+      else
+        # Collection of session data failed (e.g cookie > 4K)
+        #
+        logger.info "AFTER AUTHENTICATION: Internal error, user authentication failed.}"
+        warden.logout
+        session.clear
+        redirect "/access_denied?provider=unknown&user=unknown&category=unknown"
       end
 
       j1_web_session['provider']      = current_provider
@@ -683,9 +715,8 @@ module J1App
       # --------------------------------------------------------------------
       j1_web_session['user_name']     = 'unknown'
       j1_web_session['user_id']       = 'unknown'
-      j1_web_session['user_details']  = 'unknown'
       j1_web_session['users_allowed'] = 'unknown'
-      j1_web_session['user_pledges']  = 'unknown'
+      j1_web_session['payment_info']  = 'unknown'
       j1_web_session['provider']      = 'unknown'
       j1_web_session['provider_url']  = 'unknown'
       j1_web_session['permissions']   = 'unknown'

data/lib/j1_app/j1_auth_manager/config.rb

@@ -47,30 +47,41 @@ module J1App
 
   def self.provider_url(arg)
     provider_url = {
-        'patreon'   => auth_config['provider']['home_url']['patreon'],
-        'disqus'    => auth_config['provider']['home_url']['disqus'],
-        'facebook'  => auth_config['provider']['home_url']['facebook'],
-        'github'    => auth_config['provider']['home_url']['github'],
-        'twitter'   => auth_config['provider']['home_url']['twitter']
+      'patreon'   => auth_config['provider']['home_url']['patreon'],
+      'disqus'    => auth_config['provider']['home_url']['disqus'],
+      'facebook'  => auth_config['provider']['home_url']['facebook'],
+      'github'    => auth_config['provider']['home_url']['github'],
+      'twitter'   => auth_config['provider']['home_url']['twitter']
     }
     provider_url[arg]
   end
 
   def self.provider_scope(arg)
     provider_scope = {
-        'patreon'   => auth_config['provider']['scope']['patreon'],
-        'disqus'    => auth_config['provider']['scope']['disqus'],
-        'facebook'  => auth_config['provider']['scope']['facebook'],
-        'github'    => auth_config['provider']['scope']['github'],
-        'twitter'   => auth_config['provider']['scope']['twitter']
+      'patreon'   => auth_config['provider']['scope']['patreon'],
+      'disqus'    => auth_config['provider']['scope']['disqus'],
+      'facebook'  => auth_config['provider']['scope']['facebook'],
+      'github'    => auth_config['provider']['scope']['github'],
+      'twitter'   => auth_config['provider']['scope']['twitter']
     }
     provider_scope[arg].join(',')
   end
 
+  def self.provider_data(arg)
+    provider_data = {
+        'patreon'   => auth_config['provider']['data']['patreon'],
+        'disqus'    => auth_config['provider']['data']['disqus'],
+        'facebook'  => auth_config['provider']['data']['facebook'],
+        'github'    => auth_config['provider']['data']['github'],
+        'twitter'   => auth_config['provider']['data']['twitter']
+    }
+    provider_data[arg].join(',')
+  end
+
   def self.permissions
     permission_profile = {
-        'private'   => [],
-        'premium'   => []
+      'private'   => [],
+      'premium'   => []
     }
 
     provider_permissions = auth_config['provider']['permission']

data/lib/j1_app/j1_auth_manager/helpers_disqus.rb

@@ -1,3 +1,20 @@
+# ------------------------------------------------------------------------------
+# ~/lib/j1_app/j1_auth_manager/omniauth/strategies/helpers_disqus.rb
+#
+# Provides helper methods for the disqus omniauth strategy
+#
+# Product/Info:
+# https://jekyll-one.com
+#
+# Copyright (C) 2019 Juergen Adams
+#
+# J1 Template is licensed under the MIT License
+# See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+# NOTES
+#
+# ------------------------------------------------------------------------------
 module J1App
   module DisqusHelpers
 

data/lib/j1_app/j1_auth_manager/helpers_facebook.rb

@@ -1,3 +1,20 @@
+# ------------------------------------------------------------------------------
+# ~/lib/j1_app/j1_auth_manager/omniauth/strategies/helpers_facebook.rb
+#
+# Provides helper methods for the facebook omniauth strategy
+#
+# Product/Info:
+# https://jekyll-one.com
+#
+# Copyright (C) 2019 Juergen Adams
+#
+# J1 Template is licensed under the MIT License
+# See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+# NOTES
+#
+# ------------------------------------------------------------------------------
 module J1App
   module FacebookHelpers
 

data/lib/j1_app/j1_auth_manager/helpers_github.rb

@@ -1,3 +1,20 @@
+# ------------------------------------------------------------------------------
+# ~/lib/j1_app/j1_auth_manager/omniauth/strategies/helpers_github.rb
+#
+# Provides helper methods for the github omniauth strategy
+#
+# Product/Info:
+# https://jekyll-one.com
+#
+# Copyright (C) 2019 Juergen Adams
+#
+# J1 Template is licensed under the MIT License
+# See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+# NOTES
+#
+# ------------------------------------------------------------------------------
 module J1App
   module GithubHelpers
 

data/lib/j1_app/j1_auth_manager/helpers_patreon.rb

@@ -1,3 +1,20 @@
+# ------------------------------------------------------------------------------
+# ~/lib/j1_app/j1_auth_manager/omniauth/strategies/helpers_patreon.rb
+#
+# Provides helper methods for the patreon omniauth strategy
+#
+# Product/Info:
+# https://jekyll-one.com
+#
+# Copyright (C) 2019 Juergen Adams
+#
+# J1 Template is licensed under the MIT License
+# See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+# NOTES
+#
+# ------------------------------------------------------------------------------
 module J1App
   module PatreonHelpers
 

data/lib/j1_app/j1_auth_manager/helpers_twitter.rb

@@ -1,3 +1,21 @@
+# ------------------------------------------------------------------------------
+# ~/lib/j1_app/j1_auth_manager/omniauth/strategies/helpers_twitter.rb
+#
+# Provides helper methods for the twitter omniauth strategy
+#
+# Product/Info:
+# https://jekyll-one.com
+#
+# Copyright (C) 2019 Juergen Adams
+#
+# J1 Template is licensed under the MIT License
+# See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+# ------------------------------------------------------------------------------
+# NOTES
+#
+# ------------------------------------------------------------------------------
+
 module J1App
   module TwitterHelpers