doorkeeper_hub 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69b5f66b512d34931149c92205bc02cf225e2e54ab6adce512763e177b430f78
-  data.tar.gz: c470d887585dde0f18502caacc26f8f2f0f2b885d5b8b78100ca130f292299cb
+  metadata.gz: 7d44355b88b5b8da4004fe095861f322193cd9506ba02ce7dd52c37397562fdd
+  data.tar.gz: 6a7a59d433cb482e80912f118de9487bee48a5dcc5ed7ab1efb6f780e1492a8d
 SHA512:
-  metadata.gz: 2af111ba50fb34ca23a235aebc789bef715fb2ae4db1aca0a155c0b1fb644cc555d71384739d4fd087dbe93b6dcca63c64c1f658df07695709b2615cc9480dcd
-  data.tar.gz: a06f2068120f43754cd18ab62f1eddcccf02cf65b1b0ff273905855efac82f1d30b0a8592c51f208f04e78733db3f122e8fdfef43769ffe09ab8286cc62205bf
+  metadata.gz: aaad6e673cd7b7661269f60c3f6d5d44482d55fbeb8575363023045197c5e1110734f78c1f8ae0e1831c4536e8eb0209f0c5630a24b867d9d3991900412efc1b
+  data.tar.gz: b8fa03bca3ac375ab0b0b9cda906c0ca9c25db36a18c61089b13bc90218933e91fa44291650be1358240a1844182b3692e3e2d768156ddc2788024bbfc70d334

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.idea/

data/app/controllers/doorkeeper_hub/omniauth_callbacks_controller.rb

@@ -1,19 +1,17 @@
 module DoorkeeperHub
-  class OmniauthCallbacksController < Devise::OmniauthCallbacksController
-    skip_before_action :verify_authenticity_token,
-                       :authenticate_doorkeeper!, only: :saml
+  class OmniauthCallbacksController < ApplicationController
+    skip_before_action :authenticate_doorkeeper!,
+                       :verify_authenticity_token, only: :saml
 
     def saml
-      @user = DoorkeeperHub
-                .user_model
-                .constantize
-                .from_omniauth(request.env["omniauth.auth"])
 
-      if @user.present? && @user.persisted?
-        sign_in_and_redirect @user, event: :authentication
-      else
-        raise ActionController::RoutingError.new('Not Found')
-      end
+      warden = request.env['warden']
+
+      # warden.authenticated?(:user) && warden.logout(:user)
+      user = warden.authenticate(:doorkeeper)
+      warden.set_user(user)
+
+      redirect_to after_sign_in_path
     end
   end
 end

data/config/initializers/omniauth.rb

@@ -0,0 +1,10 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :saml,
+    :assertion_consumer_service_url     => DoorkeeperHub.config.callback_url,
+    :issuer                             => DoorkeeperHub.config.issuer,
+    :idp_sso_target_url                 => "https://id.hubhub.co/saml/auth",
+    :idp_sso_target_url_runtime_params  => {:original_request_param => :mapped_idp_param},
+    :idp_cert_fingerprint               => DoorkeeperHub.config.idp_fingerprint,
+    :idp_cert_fingerprint_validator     => lambda { |fingerprint| fingerprint },
+    :name_identifier_format             => "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+end

data/config/initializers/warden.rb

@@ -0,0 +1,26 @@
+Warden::Strategies.add(:doorkeeper) do
+  def valid?
+    true
+  end
+
+  def authenticate!
+    u = DoorkeeperHub::User.new('company_tokens' => company_tokens, 'id' => auth.uid)
+    success!(u)
+  end
+
+  def auth
+    request.env["omniauth.auth"]
+  end
+
+  def company_tokens
+    auth.extra.raw_info.multi(DoorkeeperHub.token_name)
+  end
+end
+
+Warden::Manager.serialize_into_session do |user|
+  user
+end
+
+Warden::Manager.serialize_from_session do |data|
+  DoorkeeperHub::User.new(data)
+end

data/config/routes.rb

@@ -1,8 +1,5 @@
 Rails.application.routes.draw do
-  devise_for DoorkeeperHub.devise_routes_scope,
-             controllers: {
-               omniauth_callbacks: 'doorkeeper_hub/omniauth_callbacks'
-             }
+  post 'auth/saml/callback', to: 'doorkeeper_hub/omniauth_callbacks#saml'
 
   unless DoorkeeperHub.client_mode?
     post 'doorkeeper/activation', to: 'doorkeeper_hub/callbacks#activation'

data/doorkeeper_hub.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_dependency "devise", "~> 4.4"
+  spec.add_dependency "warden", "~> 1.2"
   spec.add_dependency "omniauth-saml", "~> 1.10"
 end

data/lib/doorkeeper_hub.rb

@@ -1,6 +1,5 @@
 require "doorkeeper_hub/version"
 require 'doorkeeper_hub/configurator'
-require "doorkeeper_hub/saml"
 require "doorkeeper_hub/helpers"
 require 'doorkeeper_hub/engine' if defined?(::Rails) && Rails::VERSION::MAJOR > 4
 
@@ -13,18 +12,6 @@ module DoorkeeperHub
     yield config
   end
 
-  def self.devise_routes_scope
-    user_model.tableize.to_sym
-  end
-
-  def self.devise_scope
-    user_model.underscore.to_sym
-  end
-
-  def self.user_model
-    config.user_model
-  end
-
   def self.token_name
     config.doorkeeper_token_name
   end
@@ -36,4 +23,22 @@ module DoorkeeperHub
   def self.client_mode?
     config.client_mode
   end
-end
+
+  class User
+    attr_accessor :company_tokens, :id
+
+    def initialize(attrs)
+      @company_tokens = attrs['company_tokens']
+      @id             = attrs['id']
+    end
+
+    def to_key
+      id
+    end
+
+    def authenticatable_salt
+      ''
+    end
+  end
+
+end

data/lib/doorkeeper_hub/configurator.rb

@@ -2,16 +2,20 @@ module DoorkeeperHub
   class Configurator
     attr_accessor :service_token
     attr_accessor :scope_model
-    attr_accessor :user_model
     attr_accessor :doorkeeper_token_name
     attr_accessor :client_mode
+    attr_accessor :issuer
+    attr_accessor :callback_url
+    attr_accessor :idp_fingerprint
 
     def initialize
       self.service_token = ENV["SERVICE_TOKEN"]
-      self.user_model = 'User'
       self.scope_model = 'Company'
       self.doorkeeper_token_name = :doorkeeper_token
       self.client_mode = false
+      self.issuer = 'doorkeeper-client'
+      self.callback_url = 'http://localhost:3000/auth/saml/callback'
+      self.idp_fingerprint = "3A:56:BE:36:48:69:91:CD:60:42:0D:15:5B:21:85:8E:E3:F5:7D:74"
     end
   end
 end

data/lib/doorkeeper_hub/engine.rb

@@ -1,6 +1,10 @@
 require 'doorkeeper_hub/routes'
+require 'warden'
+require 'omniauth'
+require 'omniauth-saml'
 
 module DoorkeeperHub
   class Engine < Rails::Engine
+    config.app_middleware.use Warden::Manager
   end
 end

data/lib/doorkeeper_hub/helpers.rb

@@ -7,15 +7,13 @@ module DoorkeeperHub
     end
 
     def authenticate_doorkeeper!
-      if signed_in?(DoorkeeperHub.devise_scope)
+      if warden.authenticated?
         return if DoorkeeperHub.client_mode?
 
         redirect_to root_path_with_token if params[DoorkeeperHub.token_param].nil?
       else
-        redirect_to omniauth_authorize_path(
-          DoorkeeperHub.devise_scope, :saml,
-          origin: request.fullpath
-        )
+        # TODO add origin path to params
+        redirect_to '/auth/saml'
       end
     end
 
@@ -26,7 +24,7 @@ module DoorkeeperHub
       options
     end
 
-    def after_sign_in_path_for(_)
+    def after_sign_in_path
       request.env['omniauth.origin'] || (DoorkeeperHub.client_mode? ? root_path : root_path_with_token)
     end
 
@@ -36,13 +34,29 @@ module DoorkeeperHub
 
     def params_or_default_token
       params[DoorkeeperHub.token_param] ||
-        current_user.companies.first.send(DoorkeeperHub.config.doorkeeper_token_name)
+        companies.first.send(DoorkeeperHub.config.doorkeeper_token_name)
     end
 
     def company
       @company ||=
-        current_user.companies.active.find_by(DoorkeeperHub.config.doorkeeper_token_name => params[DoorkeeperHub.token_param]) ||
+        companies.active.find_by(DoorkeeperHub.config.doorkeeper_token_name => params[DoorkeeperHub.token_param]) ||
           raise(ActionController::RoutingError.new('Not Found'))
+
+    end
+
+    def current_user
+      warden.user
+    end
+
+    def companies
+      @companies ||= DoorkeeperHub.config
+                       .scope_model
+                       .constantize
+                       .where(DoorkeeperHub.config.doorkeeper_token_name => current_user.company_tokens)
+    end
+
+    def warden
+      request.env['warden']
     end
   end
 end

data/lib/doorkeeper_hub/version.rb

@@ -1,3 +1,3 @@
 module DoorkeeperHub
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_hub
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Jimmy Fan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: warden
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: omniauth-saml
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +83,8 @@ files:
 - app/controllers/doorkeeper_hub/omniauth_callbacks_controller.rb
 - bin/console
 - bin/setup
+- config/initializers/omniauth.rb
+- config/initializers/warden.rb
 - config/routes.rb
 - doorkeeper_hub.gemspec
 - lib/doorkeeper_hub.rb
@@ -90,7 +92,6 @@ files:
 - lib/doorkeeper_hub/engine.rb
 - lib/doorkeeper_hub/helpers.rb
 - lib/doorkeeper_hub/routes.rb
-- lib/doorkeeper_hub/saml.rb
 - lib/doorkeeper_hub/version.rb
 homepage: https://devhub.co
 licenses:

data/lib/doorkeeper_hub/saml.rb

@@ -1,42 +0,0 @@
-require 'active_support/concern'
-
-module DoorkeeperHub
-  module Saml
-    extend ActiveSupport::Concern
-
-    included do
-      devise :omniauthable, omniauth_providers: %i[saml]
-    end
-
-    class_methods do
-      def from_omniauth(auth)
-        return if !DoorkeeperHub.client_mode? && scope_results(auth).empty?
-
-        user = where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
-          user.email = auth.info.email
-        end
-
-        unless DoorkeeperHub.client_mode?
-          scope_results(auth).each do |result|
-            user.users_companies.find_or_create_by(company: result)
-          end
-        end
-
-        user
-      end
-
-      def scope_results(auth)
-        @scope_results ||= DoorkeeperHub
-                             .config.scope_model
-                             .constantize
-                             .where(scope_query(auth))
-      end
-
-      def scope_query(auth)
-        {
-          DoorkeeperHub.token_name => auth.extra.raw_info.multi(DoorkeeperHub.token_name)
-        }
-      end
-    end
-  end
-end