j1_template_mde 2018.4.13 → 2018.4.14

data/lib/j1_app/j1_auth_manager/warden_omniauth.rb

@@ -1,4 +1,22 @@
 # frozen_string_literal: true
+#
+# ------------------------------------------------------------------------------
+#  ~/lib/j1_auth_manager/auth_manager/.rb
+#
+#  Provides Warden authentication strategy based on 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
+#
+# ------------------------------------------------------------------------------
 
 class J1WardenOmniAuth
 

data/lib/j1_app/omniauth/strategies/disqus.rb

@@ -1,8 +1,37 @@
+# ------------------------------------------------------------------------------
+# ~/lib/j1_app/j1_auth_manager/omniauth/strategies/github.rb
+#
+# Provides OmniAuth OAuth2 strategy for Github
+#
+# Product/Info:
+# https://jekyll-one.com
+#
+# Copyright (C) 2019 Juergen Adams
+# Copyright (C) 2012 Mark Dodwell
+#
+# J1 Template is licensed under the MIT License
+# See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+# omniauth-patreon-v2 is licensed under the MIT License
+# See: https://github.com/doumart/omniauth-patreon-v2#license
+#
+# ------------------------------------------------------------------------------
+# NOTES
+#
+# ------------------------------------------------------------------------------
+
+require 'omniauth/strategies/oauth2'
+require 'json'
+
 module OmniAuth
   module Strategies
     class Disqus < OmniAuth::Strategies::OAuth2
 
-      DEFAULT_SCOPE = 'read'
+      # ========================================================================
+      # OAuth client settings
+      # ========================================================================
+
+      DEFAULT_SCOPE = 'read write'
 
       option :name, 'disqus'
       option :client_options, {
@@ -11,44 +40,72 @@ module OmniAuth
         :token_url     => '/api/oauth/2.0/access_token/'
       }
 
+      def callback_url
+        options[:redirect_uri] || full_host + script_name + callback_path
+      end
+
+      # ========================================================================
+      # OAuth client data (returned by provider)
+      # ========================================================================
+
       uid { access_token.params['user_id'] }
 
       info do
         {
-          :name           => raw_info['name'],
-          :nickname       => raw_info['username'].gsub('ä','ae').gsub('ö','oe').gsub('ü','ue').gsub(' ','_').downcase,
-          :location       => raw_info['location'],
           :description    => raw_info['about'],
+          :email          => nil,
           :image          => raw_info['avatar']['small']['permalink'],
+          :location       => raw_info['location'],
+          :name           => raw_info['name'],
+          :first_name     => nil,
+          :last_name      => nil,
+          :nickname       => raw_info['username'].gsub('ä','ae').gsub('ö','oe').gsub('ü','ue').gsub(' ','_').downcase,
           :urls           => {
-            'profileUrl'  => raw_info['profileUrl']
-          }
+            'site'        => raw_info['profileUrl'],
+            'blog'        => nil
+          },
+          # Make payment_info always available
+          #
+          :payment_info   => {}
         }
       end
 
       extra do
-        {
-          :raw_info => raw_info
-        }
+        hash = {}
+        hash['raw_info'] = raw_info unless skip_extra? || skip_info?
+        hash
       end
 
-      def callback_url
-        options[:redirect_uri] || full_host + script_name + callback_path
+      def raw_info
+        url    = '/api/3.0/users/details.json'
+        params = {
+          'api_key'      => access_token.client.id,
+          'access_token' => access_token.token
+        }
+        @raw_info ||= access_token.get(url, :params => params).parsed['response']
       end
 
+      # ========================================================================
+      # Helpers
+      # ========================================================================
+
+      private
+
       def get_scope(params)
         raw_scope = params[:scope] || DEFAULT_SCOPE
         scope_list = raw_scope.split(' ').map { |item| item.split(',') }.flatten
         scope_list.join(' ')
       end
 
-      def raw_info
-        url    = '/api/3.0/users/details.json'
-        params = {
-          'api_key'      => access_token.client.id,
-          'access_token' => access_token.token
-        }
-        @raw_info ||= access_token.get(url, :params => params).parsed['response']
+      def prune!(hash)
+        hash.delete_if do |_, value|
+          prune!(value) if value.is_a?(Hash)
+          value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
+      end
+
+      def skip_extra?
+        !!options[:skip_extra]
       end
 
     end

data/lib/j1_app/omniauth/strategies/facebook.rb

@@ -1,4 +1,26 @@
-require 'omniauth-oauth2'
+# ------------------------------------------------------------------------------
+# ~/lib/j1_app/j1_auth_manager/omniauth/strategies/github.rb
+#
+# Provides OmniAuth OAuth2 strategy for Github
+#
+# Product/Info:
+# https://jekyll-one.com
+#
+# Copyright (C) 2019 Juergen Adams
+# Copyright (C) 2012 Mark Dodwell
+#
+# J1 Template is licensed under the MIT License
+# See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+# omniauth-patreon-v2 is licensed under the MIT License
+# See: https://github.com/doumart/omniauth-patreon-v2#license
+#
+# ------------------------------------------------------------------------------
+# NOTES
+#
+# ------------------------------------------------------------------------------
+
+#require 'omniauth-oauth2'
 #require 'omniauth/facebook/signed_request'
 require 'openssl'
 require 'rack/utils'
@@ -12,6 +34,10 @@ module OmniAuth
 
       class NoAuthorizationCodeError < StandardError; end
 
+      # ========================================================================
+      # OAuth client settings
+      # ========================================================================
+
       DEFAULT_SCOPE = 'email'
 
       option :client_options, {
@@ -30,27 +56,27 @@ module OmniAuth
       uid { raw_info['id'] }
 
       info do
-        prune!({
-                   'nickname' => raw_info['username'].gsub('ä','ae').gsub('ö','oe').gsub('ü','ue').gsub(' ','_').downcase,
-                   'email' => raw_info['email'],
-                   'name' => raw_info['name'],
-                   'first_name' => raw_info['first_name'],
-                   'last_name' => raw_info['last_name'],
-                   'image' => image_url(uid, options),
-                   'description' => raw_info['bio'],
-                   'urls' => {
-                       'Facebook' => raw_info['link'],
-                       'Website' => raw_info['website']
-                   },
-                   'location' => (raw_info['location'] || {})['name'],
-                   'verified' => raw_info['verified']
-               })
+        {
+          'description'   => raw_info['bio'],
+          'email'         => raw_info['email'],
+          'image'         => image_url(uid, options),
+          'location'      => (raw_info['location'] || {})['name'],
+          'name'          => raw_info['name'],
+          'first_name'    => raw_info['first_name'],
+          'last_name'     => raw_info['last_name'],
+          'nickname'      => raw_info['username'].gsub('ä','ae').gsub('ö','oe').gsub('ü','ue').gsub(' ','_').downcase,
+          'urls'          => {
+             'site'       => raw_info['link'],
+             'blog'       => raw_info['website']
+          },
+          :payment_info   => {}
+        }
       end
 
       extra do
         hash = {}
-        hash['raw_info'] = raw_info unless skip_info?
-        prune! hash
+        hash['raw_info']  = raw_info unless skip_extra? || skip_info?
+        hash
       end
 
       def raw_info
@@ -151,13 +177,6 @@ module OmniAuth
         end
       end
 
-      def prune!(hash)
-        hash.delete_if do |_, value|
-          prune!(value) if value.is_a?(Hash)
-          value.nil? || (value.respond_to?(:empty?) && value.empty?)
-        end
-      end
-
       def image_url(uid, options)
         uri_class = options[:secure_image_url] ? URI::HTTPS : URI::HTTP
         site_uri = URI.parse(client.site)
@@ -176,6 +195,18 @@ module OmniAuth
       def appsecret_proof
         @appsecret_proof ||= OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, client.secret, access_token.token)
       end
+
+      def prune!(hash)
+        hash.delete_if do |_, value|
+          prune!(value) if value.is_a?(Hash)
+          value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
+      end
+
+      def skip_extra?
+        !!options[:skip_extra]
+      end
+
     end
   end
 end

data/lib/j1_app/omniauth/strategies/github.rb

@@ -1,7 +1,30 @@
+# ------------------------------------------------------------------------------
+#  ~/lib/j1_app/j1_auth_manager/omniauth/strategies/github.rb
+#
+#  Provides OmniAuth OAuth2 strategy for Github
+#
+#  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 OmniAuth
   module Strategies
     class GitHub < OmniAuth::Strategies::OAuth2
 
+      # ========================================================================
+      # OAuth client settings
+      # ========================================================================
+
+      DEFAULT_SCOPE = 'user'
+
       option :client_options, {
         :site => 'https://api.github.com',
         :authorize_url => 'https://github.com/login/oauth/authorize',
@@ -18,29 +41,54 @@ module OmniAuth
             if request.params[v]
               params[v.to_sym] = request.params[v]
             end
+            params[:scope] = get_scope(params)
           end
         end
       end
 
+      def callback_url
+        options[:redirect_uri] || full_host + script_name + callback_path
+      end
+
+      # ========================================================================
+      # OAuth client data (returned by provider)
+      # ========================================================================
+
       uid { raw_info['id'].to_s }
 
       info do
         {
-          :nickname     => raw_info['login'],
-          :email        => email,
-          :name         => raw_info['name'],
-          :image        => raw_info['avatar_url'],
-          :urls         => {
-            'GitHub'    => raw_info['html_url'],
-            'Blog'      => raw_info['blog'],
-          }
+          :description    => nil,
+          :email          => email,
+          :image          => raw_info['avatar_url'],
+          :location       => raw_info['location'],
+          :name           => raw_info['name'],
+          :first_name     => nil,
+          :last_name      => nil,
+          :nickname       => raw_info['login'],
+          :urls           => {
+            'site'        => raw_info['html_url'],
+            'blog'        => raw_info['blog'],
+          },
+          # Make payment_info always available
+          #
+          :payment_info   => {}
         }
       end
 
       extra do
-        {:raw_info => raw_info, :all_emails => emails}
+        hash = {}
+        hash['raw_info']    = raw_info unless skip_extra? || skip_info?
+        hash['all_emails']  = emails unless skip_extra? || skip_info?
+        hash
       end
 
+      # ========================================================================
+      # Helpers
+      # ========================================================================
+
+      private
+
       def raw_info
         access_token.options[:mode] = :query
         @raw_info ||= access_token.get('user').parsed
@@ -69,9 +117,23 @@ module OmniAuth
         (scopes & email_scopes).any?
       end
 
-      def callback_url
-        full_host + script_name + callback_path
+      def get_scope(params)
+        raw_scope = params[:scope] || DEFAULT_SCOPE
+        scope_list = raw_scope.split(' ').map { |item| item.split(',') }.flatten
+        scope_list.join(' ')
+      end
+
+      def prune!(hash)
+        hash.delete_if do |_, value|
+          prune!(value) if value.is_a?(Hash)
+          value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
       end
+
+      def skip_extra?
+        !!options[:skip_extra]
+      end
+
     end
   end
 end

data/lib/j1_app/omniauth/strategies/patreon.rb

@@ -1,48 +1,125 @@
-# https://raw.githubusercontent.com/signalnerve/omniauth-patreon
+# ------------------------------------------------------------------------------
+# ~/lib/j1_app/j1_auth_manager/omniauth/strategies/github.rb
+#
+# Provides OmniAuth OAuth2 strategy for Github
+#
+# Product/Info:
+# https://jekyll-one.com
+#
+# Copyright (C) 2019 Juergen Adams
+# Copyright (C) 2012 Mark Dodwell
+#
+# J1 Template is licensed under the MIT License
+# See: https://github.com/jekyll-one/j1_template_mde/blob/master/LICENSE
+#
+# omniauth-patreon-v2 is licensed under the MIT License
+# See: https://github.com/doumart/omniauth-patreon-v2#license
+#
+# ------------------------------------------------------------------------------
+# NOTES
+#
+# ------------------------------------------------------------------------------
 
-require 'omniauth-oauth2'
+require 'omniauth/strategies/oauth2'
+require 'json'
 
 module OmniAuth
   module Strategies
     class Patreon < OmniAuth::Strategies::OAuth2
 
+      # ========================================================================
+      # OAuth client settings
+      # ========================================================================
+
+      DEFAULT_SCOPE = 'users, pledges-to-me'
+
       option :name, 'patreon'
-      option :client_options,
-             site: 'https://www.patreon.com',
-             authorize_url: 'https://www.patreon.com/oauth2/authorize',
-             token_url: 'https://api.patreon.com/oauth2/token'
+      option :client_options, {
+          :authorize_url => '/oauth2/authorize',
+          :site => 'https://www.patreon.com',
+          :token_url => '/api/oauth2/token'
+      }
+
+      def callback_url
+        options[:redirect_uri] || full_host + script_name + callback_path
+      end
 
-      uid { raw_info['data']['id'].to_s }
+      # ========================================================================
+      # OAuth client data (returned by provider)
+      # ========================================================================
+
+      uid { raw_info["data"]["id"] }
 
       info do
         {
-          :email          => raw_info['data']['attributes']['email'],
-          :name           => raw_info['data']['attributes']['full_name'],
-          :nickname       => raw_info['data']['attributes']['full_name'].gsub('ä','ae').gsub('ö','oe').gsub('ü','ue').gsub(' ','_').downcase,
-          :access_token   => access_token.token,
-          :refresh_token  => access_token.refresh_token
+         :description     => nil,
+         :email           => raw_info['data']['attributes']['email'],
+         :image           => nil,
+         :location        => nil,
+         :name            => raw_info['data']['attributes']['full_name'],
+         :first_name      => nil,
+         :last_name       => nil,
+         :nickname        => raw_info['data']['attributes']['full_name'].gsub('ä','ae').gsub('ö','oe').gsub('ü','ue').gsub(' ','_').downcase,
+         :urls            => {
+           'site'         => nil,
+           'blog'         => nil
+         },
+         # Make payment_info always available
+         #
+         :payment_info    => raw_info['included'].nil? ? {} :  raw_info['included'][0]
         }
       end
 
+      def authorize_params
+        super.tap do |params|
+          options[:authorize_options].each do |k|
+            params[k] = request.params[k.to_s] unless [nil, ''].include?(request.params[k.to_s])
+          end
+          params[:scope] = get_scope(params)
+          session['omniauth.state'] = params[:state] if params[:state]
+        end
+      end
+
       extra do
-        { raw_info: raw_info }
+        hash = {}
+        hash['raw_info'] = raw_info unless skip_extra? || skip_info?
+        hash
       end
 
       def raw_info
         @raw_info ||= begin
           response = client.request(
-            :get, 'https://api.patreon.com/oauth2/api/current_user', 
-            headers: {
-              'Authorization' => "Bearer #{access_token.token}"
-            },
-            parse: :json
+              :get, 'https://api.patreon.com/oauth2/api/current_user',
+              headers: {
+                  'Authorization' => "Bearer #{access_token.token}"
+              },
+              parse: :json
           )
           response.parsed
         end
       end
 
-      def callback_url
-        full_host + script_name + callback_path
+      # ========================================================================
+      # Helpers
+      # ========================================================================
+
+      private
+
+      def get_scope(params)
+        raw_scope = params[:scope] == '' ? DEFAULT_SCOPE : params[:scope]
+        scope_list = raw_scope.split(' ').map { |item| item.split(',') }.flatten
+        scope_list.join(' ')
+      end
+
+      def prune!(hash)
+        hash.delete_if do |_, value|
+          prune!(value) if value.is_a?(Hash)
+          value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
+      end
+
+      def skip_extra?
+        !!options[:skip_extra]
       end
 
     end