go_sso 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5699d1f30c56dc29ad69891e7e0e5f78328ebbc77be73bf064a98d910f2f5f2a
-  data.tar.gz: 3a0a7805c36f40ff2ac6b15fb46da68af237f3fa1b3ef51eb546c1833db6c1ff
+  metadata.gz: 74e802c1f65aec69060e5b79aa378ab4d2470c0a4f3adf7466add39a2875c569
+  data.tar.gz: 60a13a8e3b6045086887e3c1687cf5ae7f03f677d47eee2fc630b19c28a91a01
 SHA512:
-  metadata.gz: 8ee99a7199532820c1cf592af33afb156d9c783daa091fb1c88b6a7fb20fbd5cf75a5dc4b1aa0019bd1e2f277abc61842df13f276dd5fe472ab3b57c505676df
-  data.tar.gz: 69f5d732f77dcb087796457b5776d9052a8d5b1823153633269b4d9950ba4ccb40717650d278b0d51974474feb11e5331447a118f27156c646a966a5f96ed520
+  metadata.gz: 17746ae23a5d433886c56c60b922cb7a43b0abcab8a4f8907badac7107000b2252a3066a951094540a2217515139c303f2dae8830c54fcbd346c46fda4289dca
+  data.tar.gz: 88136bf0a22d248db516aded9bd146efd6c0d3bfbe5458119144604e71e9f00b2d440e49fb1de0fdc706ed725ff1acd24096dbec5a0fa9f28a33ba607a98d19a

data/app/controllers/go_sso/application_controller.rb

@@ -2,44 +2,8 @@ module GoSso
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
 
-    before_action do
-      GoSso::Current.host = request.base_url
-    end
-
-    def auth
-      session[:go_sso_referrer] = params[:redirect_url] || request.referrer || request.base_url
-      if GoSso.test_mode?
-        redirect_to go_sso_callback_url
-      else
-        redirect_to GoSso.authorize_url
-      end
-    end
-
     def callback
-      token = GoSso.test_mode? ? GoSso.generate_fake_token : GoSso.get_token(params[:code])
-      set_sso_token(token.token, expires_at: token.expires_at)
-      GoSso.after_login.call(self)
       redirect_to session.delete(:go_sso_referrer) || request.base_url
-    rescue OAuth2::Error => error
-      render json: {
-        code: error.code,
-        description: error.description
-      }
-    end
-
-    def logout
-      set_sso_token(nil)
-      redirect_to params[:redirect_url] || request.referrer || request.base_url
-    end
-
-    private
-    def set_sso_token(token, expires_at: nil)
-      if token
-        session[:go_sso_token] = token
-        session[:go_sso_token_expires_at] = expires_at
-      else
-        session[:go_sso_token] = session[:go_sso_token_expires_at] = nil
-      end
     end
   end
 end

data/config/routes.rb

@@ -1,7 +1,8 @@
 Rails.application.routes.draw do
   scope GoSso.routes_prefix do
-    get :auth, to: 'go_sso/application#auth', as: :go_sso_auth
-    get :callback, to: 'go_sso/application#callback', as: :go_sso_callback
-    delete :logout, to: 'go_sso/application#logout', as: :go_sso_logout
+    controller = GoSso.controller.to_s.underscore.delete_suffix("_controller")
+    get :auth, controller: controller, as: :go_sso_auth
+    get :callback, controller: controller, as: :go_sso_callback
+    delete :logout, controller: controller, as: :go_sso_logout
   end
 end

data/lib/go_sso/engine.rb

@@ -4,6 +4,10 @@ module GoSso
       GoSso.set_default_options!
     end
 
+    initializer "go_sso.middleware" do |app|
+      app.middleware.use GoSso::Middleware
+    end
+
     initializer "go_sso.helpers" do
       ActiveSupport.on_load(:action_controller) do
         include Controllers::Helpers

data/lib/go_sso/middleware.rb

@@ -0,0 +1,97 @@
+module GoSso
+  class Middleware
+    def initialize(app)
+      @app = app
+      @env = nil
+    end
+
+    def call(env)
+      dup.call!(env)
+    end
+
+    def call!(env)
+      @env = env
+
+      GoSso::Current.host = request.base_url
+      begin
+        return request_call if on_path?("#{GoSso.routes_prefix}/auth")
+        return logout_call if on_path?("#{GoSso.routes_prefix}/logout") && delete_request?
+        return callback_call if on_path?("#{GoSso.routes_prefix}/callback")
+      end
+
+      @app.call(env)
+    end
+
+    def session
+      @env['rack.session']
+    end
+
+    private
+
+    def delete_request?
+      request.request_method == "DELETE"
+    end
+
+    def request_call
+      session[:go_sso_referrer] = request.params["redirect_url"] || request.referrer || request.base_url
+      if GoSso.test_mode?
+        redirect callback_path
+      else
+        redirect GoSso.authorize_url
+      end
+    end
+
+    def logout_call
+      set_sso_token(nil)
+      redirect request.params["redirect_url"] || request.referrer || request.base_url
+    end
+
+    def callback_call
+      token = GoSso.test_mode? ? GoSso.generate_fake_token : GoSso.get_token(request.params["code"])
+      set_sso_token(token.token, expires_at: token.expires_at)
+      @app.call(@env)
+    rescue OAuth2::Error => error
+      fail!({ code: error.code, description: error.description })
+    end
+
+    def callback_path
+      "#{GoSso.routes_prefix}/callback"
+    end
+
+    def on_path?(path)
+      current_path.casecmp(path).zero?
+    end
+
+    CURRENT_PATH_REGEX = %r{/$}.freeze
+    EMPTY_STRING       = ''.freeze
+    def current_path
+      @current_path ||= request.path.downcase.sub(CURRENT_PATH_REGEX, EMPTY_STRING)
+    end
+
+    def request
+      @request ||= Rack::Request.new(@env)
+    end
+
+    def redirect(uri)
+      r = Rack::Response.new
+
+      r.write("Redirecting to #{uri}...")
+      r.redirect(uri)
+
+      r.finish
+    end
+
+    def set_sso_token(token, expires_at: nil)
+      if token
+        session[:go_sso_token] = token
+        session[:go_sso_token_expires_at] = expires_at
+      else
+        session[:go_sso_token] = session[:go_sso_token_expires_at] = nil
+      end
+    end
+
+    def fail!(hash)
+      [200, { 'Content-Type' => 'application/json' }, [hash.to_json]]
+    end
+  end
+end

data/lib/go_sso/version.rb

@@ -1,3 +1,3 @@
 module GoSso
-  VERSION = '0.3.0'
+  VERSION = '0.4.2'
 end

data/lib/go_sso.rb

@@ -1,9 +1,10 @@
 require "oauth2"
+require "rack"
 
 module GoSso
   autoload :User, 'go_sso/user'
   autoload :Current, 'go_sso/current'
-
+  autoload :Middleware, 'go_sso/middleware'
   module Controllers
     autoload :Helpers, 'go_sso/controllers/helpers'
   end
@@ -16,8 +17,8 @@ module GoSso
   mattr_accessor :main_app_module_name
   mattr_accessor :host
   mattr_accessor :fake_user_json
-  mattr_accessor :after_login, default: ->(ctx){}
   mattr_accessor :routes_prefix, default: "/go_sso"
+  mattr_accessor :controller, default: "GoSso::ApplicationController"
 
   def self.setup
     yield self
@@ -27,7 +28,7 @@ module GoSso
     self.client_id = ENV['GO_SSO_CLIENT_ID']
     self.client_secret = ENV['GO_SSO_CLIENT_SECRET']
     self.site = ENV['GO_SSO_CLIENT_SITE']
-    self.main_app_module_name = if Rails::VERSION::MAJOR == 6
+    self.main_app_module_name = if Rails::VERSION::MAJOR >= 6
       Rails.application.class.module_parent.to_s
     else
       Rails.application.class.parent.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: go_sso
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Yi Feng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -130,6 +130,7 @@ files:
 - lib/go_sso/controllers/helpers.rb
 - lib/go_sso/current.rb
 - lib/go_sso/engine.rb
+- lib/go_sso/middleware.rb
 - lib/go_sso/user.rb
 - lib/go_sso/version.rb
 - lib/tasks/go_sso_tasks.rake
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Summary of GoSso.