go_sso 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae7a310b964f3781f1d0e26f7162c4f75d31b2e257c361c102529275fa5090ab
-  data.tar.gz: 5c1d80f3c43a2e10b4913a706007702c0dfc3fc0b063a9b9068fe46fd4db73cd
+  metadata.gz: f1a35e3822cedfdf02950daabb9e122a8a7e4b8bbac300b75101a8a397a2b1d0
+  data.tar.gz: 998f461530017c647a1cd8aa46eee90d80e7647b4c7190a5b1551dc75c694028
 SHA512:
-  metadata.gz: 34709f152bfc2c0034875c305c422b21a79c5b9864316ee65cbd31a3efb7398f88e3471e26b080243a47e62bb282c5fe8f709449949cf041894324a24d9bb363
-  data.tar.gz: 7c09b572fed55d05d3453cc4dc7783a5120ab65fd7f987a7e5908d9c1dd78a0a970ff885b025ae43a7d23156b50943a9dc86db748a608e18090742f1122bceb8
+  metadata.gz: 93b3d53c98dea6ddfe286a9253c428a75abfc48a0ecb88fc39ce3c147ea324a9dc98e751f6835f277eee7f27d82086c4a546c09b6c6a44531a4c302efd103454
+  data.tar.gz: 393499ac4f6cd7316f1b007c0acf350455bd9001da4b90657f263100347b8a686a952b423bf51319470a0b79d0383187af73f20e84a1595948197b97882ffa64

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(host: GoSso::Current.host)
-      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.1'
+  VERSION = '0.4.0'
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: go_sso
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Yi Feng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-10-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