j1_template_mde 2018.4.15 → 2018.4.16

data/lib/j1_app/j1_auth_manager/config.rb

@@ -37,88 +37,39 @@ module J1App
     !!config['ssl']
   end
 
-  def self.provider
-    auth_config['provider']['activated']
+  def self.active_providers
+    auth_config['providers']['activated']
   end
 
   def self.default_provider
-    auth_config['provider']['activated'][0]
-  end
-
-  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']
-    }
-    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']
-    }
-    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(',')
+    auth_config['providers']['activated'][0]
   end
 
   def self.permissions
     permission_profile = {
-      'private'   => [],
-      'premium'   => []
+        :private   => [],
+        :premium   => []
     }
 
-    provider_permissions = auth_config['provider']['permission']
-    provider_permissions.each do |key, value|
-      value.each { |perm| permission_profile["#{perm}"] << key }
-    end
-    permission_profile
-  end
-
-  def self.get_provider_permissions (arg)
-    auth_config['provider']['permission']["#{arg}"].join(',')
-  end
-
-  def self.users
-    user_profile = {}
+    active_providers = auth_config['providers']['activated']
 
-    provider_users = auth_config['provider']['user']
-    provider_users.each do |key, value|
-      user_profile[key] = value
+    for p in active_providers do
+      provider_permissions = auth_config['providers']["#{p}"]['permissions']
+      provider_permissions.each do |perm|
+        permission_profile[:"#{perm}"] << "#{p}"
+      end
     end
-    user_profile
+    permission_profile
   end
 
-  def self.strategies
-    strategy_profile = {}
-
-    provider_strategies = auth_config['provider']['strategy']
-    provider_strategies.each do |key, value|
-      strategy_profile[key] = :"#{value}"
-    end
-    strategy_profile
+  def self.get_condition(arg)
+    auth_config['provider']['condition']["#{arg}"]
   end
 
-  def self.conditions
+  def self.conditions (arg)
     condition_profile = {}
-
-    provider_conditions = auth_config['provider']['condition']
+    provider = arg
+    provider_conditions = auth_config['providers']["#{provider}"]['conditions']
     provider_conditions.each do |key, value|
       condition_profile[key] = value
     end
@@ -131,4 +82,90 @@ module J1App
     end
   end
 
+
+
+
+
+  # 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']
+  #   }
+  #   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']
+  #   }
+  #   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.provider_condition(arg)
+  #   provider_condition = {
+  #       'patreon'   => auth_config['provider']['condition']['patreon'],
+  #       'disqus'    => auth_config['provider']['condition']['disqus'],
+  #       'facebook'  => auth_config['provider']['condition']['facebook'],
+  #       'github'    => auth_config['provider']['condition']['github'],
+  #       'twitter'   => auth_config['provider']['condition']['twitter']
+  #   }
+  #   provider_condition[arg]
+  # end
+
+  # def self.permissions_old
+  #   permission_profile = {
+  #       :private   => [],
+  #       :premium   => []
+  #   }
+  #
+  #   provider_permissions = auth_config['provider']['permission']
+  #   provider_permissions.each do |key, value|
+  #     my_key = key
+  #     value.each { |perm| permission_profile[:"#{perm}"] << key }
+  #   end
+  #   permission_profile
+  # end
+
+  # def self.get_provider_permissions (arg)
+  #   auth_config['provider']['permission']["#{arg}"].join(',')
+  # end
+
+  # def self.users
+  #   user_profile = {}
+  #
+  #   provider_users = auth_config['provider']['user']
+  #   provider_users.each do |key, value|
+  #     user_profile[key] = value
+  #   end
+  #   user_profile
+  # end
+
+  # def self.strategies
+  #   strategy_profile = {}
+  #
+  #   provider_strategies = auth_config['provider']['strategy']
+  #   provider_strategies.each do |key, value|
+  #     strategy_profile[key] = :"#{value}"
+  #   end
+  #   strategy_profile
+  # end
+
 end

data/lib/j1_app/j1_auth_manager/helpers.rb

@@ -19,18 +19,6 @@ module J1App
       return J1App.auth_enabled
     end
 
-    # def authentication_strategy
-    #   if !ENV["GITHUB_TEAM_ID"].to_s.blank?
-    #     :team
-    #   elsif !ENV["GITHUB_TEAM_IDS"].to_s.blank?
-    #     :teams
-    #   elsif !ENV["GITHUB_ORG_NAME"].to_s.blank?
-    #     :org
-    #   elsif !ENV['GITHUB_MEMBERS'].to_s.blank?
-    #     :member
-    #   end
-    # end
-
     def warden
       env['warden']
     end
@@ -51,8 +39,28 @@ module J1App
       !!(str =~ /[öäüÖÄÜß]/)
     end
 
-    # def _relative_url_for(path)
-    #   request.script_name + path
+    def log_info! (*args)
+      scope, func, text, details = *args
+
+      if details.nil?
+        message = sprintf( "[%-15s] [%-15s] %s", "#{scope} ", "#{func}", "#{text}" )
+      else
+        message = sprintf( "[%-15s] [%-15s] %s : %s", "#{scope} ", "#{func}", "#{text}", "#{details}" )
+      end
+      logger.info "#{message}"
+    end
+
+
+    # def authentication_strategy
+    #   if !ENV["GITHUB_TEAM_ID"].to_s.blank?
+    #     :team
+    #   elsif !ENV["GITHUB_TEAM_IDS"].to_s.blank?
+    #     :teams
+    #   elsif !ENV["GITHUB_ORG_NAME"].to_s.blank?
+    #     :org
+    #   elsif !ENV['GITHUB_MEMBERS'].to_s.blank?
+    #     :member
+    #   end
     # end
 
   end

data/lib/j1_app/j1_auth_manager/views/auth_manager_ui.erb

@@ -90,8 +90,13 @@
           </div>
           <!-- Footer -->
           <div class="modal-footer">
-            <a type="button" id="signInButton" class="btn btn-primary-modal mr-2" data-dismiss="modal"><%= @modal_agreed_text %></a>
-            <a type="button" id="exitButton" class="btn btn-outline-secondary-modal" data-dismiss="modal"><%= @modal_disagreed_text %></a>
+            <a type="button" id="signInButton" class="btn btn-primary-modal mr-2" data-dismiss="modal">
+              <i class="mdi mdi-18px mdi-dark mdi-login"></i>
+              <%= @modal_agreed_text %>
+            </a>
+            <a type="button" id="exitButton" class="btn btn-outline-secondary-modal" data-dismiss="modal">
+              <%= @modal_disagreed_text %>
+            </a>
           </div>
         </div>
         <!-- END Content -->

data/lib/j1_app/omniauth/strategies/_unused/doumart_patreon.rb

@@ -0,0 +1,75 @@
+require 'omniauth/strategies/oauth2'
+require 'json'
+
+module OmniAuth
+  module Strategies
+    class Patreon < OmniAuth::Strategies::OAuth2
+
+	  DEFAULT_SCOPE = 'identity identity[email]'
+
+	  option :name, 'patreon'
+      option :client_options, {
+        :authorize_url => '/oauth2/authorize',
+        :site => 'https://www.patreon.com',
+        :token_url => '/api/oauth2/token'
+      }
+
+      uid { raw_info["data"]["id"] }
+
+      info do
+       	prune!({
+          :first_name => raw_info["data"]["attributes"]['first_name'],
+          :last_name => raw_info["data"]["attributes"]['last_name'],
+          :full_name => raw_info["data"]["attributes"]['full_name'],
+          :image_url => raw_info["data"]["attributes"]['image_url'],
+          :email => raw_info["data"]["attributes"]['email']
+        })
+      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
+        hash = {}
+        hash['raw_info'] = raw_info unless skip_info?
+        prune! hash
+      end
+
+      def raw_info
+        @raw_info =  MultiJson.decode(access_token.get('/api/oauth2/v2/identity', info_options).body)
+      end
+
+	  def info_options
+        params = {}
+        params.merge!({fields: {user: (options[:info_fields] || 'full_name,email')}})
+        params.merge!({locale: options[:locale]}) if options[:locale]
+
+        { params: params }
+      end
+
+
+	  def callback_url
+		options[:redirect_uri] || full_host + script_name + callback_path
+	  end
+
+	   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
+    end
+  end
+end

data/lib/j1_app/omniauth/strategies/_unused/my_patreon.rb

@@ -0,0 +1,78 @@
+# require 'omniauth/strategies/oauth2'
+# require 'json'
+
+module OmniAuth
+  module Strategies
+    class Patreon < OmniAuth::Strategies::OAuth2
+
+      DEFAULT_SCOPE = 'users'
+
+      option :name, 'patreon'
+      option :client_options, {
+        :authorize_url  => '/oauth2/authorize',
+        :site           => 'https://www.patreon.com',
+        :token_url      => '/api/oauth2/token'
+      }
+
+      uid { raw_info["data"]["id"] }
+
+      info do
+        prune!({
+         :first_name  => raw_info["data"]["attributes"]['first_name'],
+         :last_name   => raw_info["data"]["attributes"]['last_name'],
+         :full_name   => raw_info["data"]["attributes"]['full_name'],
+         :image_url   => raw_info["data"]["attributes"]['image_url'],
+         :email       => raw_info["data"]["attributes"]['email']
+        })
+      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
+        hash = {}
+        hash['raw_info'] = raw_info unless skip_info?
+        prune! hash
+      end
+
+      def raw_info
+        @raw_info =  MultiJson.decode(access_token.get('/api/oauth2/v2/identity', info_options).body)
+      end
+
+      def info_options
+        params = {}
+        params.merge!({fields: {user: (options[:info_fields] || 'full_name,email')}})
+        params.merge!({locale: options[:locale]}) if options[:locale]
+        {
+          params: params
+        }
+      end
+
+      def callback_url
+        options[:redirect_uri] || full_host + script_name + callback_path
+#       options[:redirect_uri]
+      end
+
+      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
+
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+# https://github.com/signalnerve/omniauth-patreon
+
+require 'omniauth-oauth2'
+
+module OmniAuth
+  module Strategies
+    class Patreon < OmniAuth::Strategies::OAuth2
+
+      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'
+
+      uid { raw_info['data']['id'].to_s }
+
+      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
+        }
+      end
+
+      extra do
+        { raw_info: raw_info }
+      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
+          )
+          response.parsed
+        end
+      end
+
+      def callback_url
+        full_host + script_name + callback_path
+      end
+
+    end
+  end
+end