gamora 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecbfbd0d21575131451160045532e1cb22cb5706a872c0019166e7647a2421cd
-  data.tar.gz: 2014f6cd02eb8210cff2d58da6add30296bd0bf64d3baef379fccdf5d74b0f9a
+  metadata.gz: 563e700187ac79aef45f7d11aad774aee205f7917870f5431d3f1d6d63d7850b
+  data.tar.gz: 9817af7d6c4eb85abb6bdaa76d53efc0f1016f6516df95c674366b89ab920b49
 SHA512:
-  metadata.gz: af6267f7be0f268be3cfecbf1f2adab95b95d7c4bffb0d0f57673acf65dc1a420656b786d52484dc37cfa546ffd9f67e8d770c1d4abe5423073be65d69b44512
-  data.tar.gz: 2fa9ca42659f67422a8223ad0131e86e3354f2cb2b3b7d613fd638f0c51398f4a849f6eab0a42c7d75aec5d229fb05f59fbfed0b2c6ad018560836fdc7d8bef1
+  metadata.gz: 34de3119b475580ec5b65cab413d8f6ca7aed17fe433542ea81c6ef5ba314a67d9a29c384dd2aaafc9a9ff267510efbf6649a33f43fb7d41a15a0d3b7c308661
+  data.tar.gz: 2848933923aee39b310b107e77c6ec219b6642f0bda21c0e61677fbf056f3f80629f0d9bed0dbb81ea2637483d333de77292a871d86a358f19d98e1bade10b69

data/app/controllers/concerns/gamora/authorization_url.rb

@@ -0,0 +1,37 @@
+module Gamora
+  module AuthorizationUrl
+    def authorization_url(params, extra_params = {})
+      default_params = {
+        scope: Configuration.default_scope,
+        theme: Configuration.default_theme,
+        prompt: Configuration.default_prompt,
+        strategy: Configuration.default_strategy,
+        branding: Configuration.default_branding,
+        ui_locales: Configuration.ui_locales.call
+      }
+
+      data =
+        default_params.
+        merge(extra_params).
+        merge(authorization_params(params)).
+        compact_blank
+
+      Client.from_config.auth_code.authorize_url(data)
+    end
+
+    private
+
+    def authorization_params(params)
+      params.permit(
+        :scope,
+        :state,
+        :theme,
+        :prompt,
+        :max_age,
+        :strategy,
+        :branding,
+        :ui_locales
+      )
+    end
+  end
+end

data/app/controllers/gamora/authentication_controller.rb

@@ -2,32 +2,12 @@
 
 module Gamora
   class AuthenticationController < ApplicationController
-    def show
-      redirect_to authorization_url, allow_other_host: true
-    end
-
-    private
+    include AuthorizationUrl
 
-    def authorization_url
-      Client.from_config.auth_code.authorize_url({
-        scope: Configuration.default_scope,
-        theme: Configuration.default_theme,
-        prompt: Configuration.default_prompt,
-        strategy: Configuration.default_strategy,
-        ui_locales: Configuration.ui_locales.call
-      }.merge(authorization_params).compact_blank)
-    end
-
-    def authorization_params
-      params.permit(
-        :scope,
-        :state,
-        :theme,
-        :prompt,
-        :max_age,
-        :strategy,
-        :ui_locales
-      )
+    def show
+      redirect_to authorization_url(params),
+        allow_other_host: true,
+        status: :see_other
     end
   end
 end

data/app/controllers/gamora/callback_controller.rb

@@ -7,6 +7,7 @@ module Gamora
       session[:access_token] = access_token.token
       session[:refresh_token] = access_token.refresh_token
       redirect_to session.delete("gamora.origin") || main_app.root_path
+
     rescue OAuth2::Error
       render plain: "Invalid authorization code"
     end

data/app/controllers/gamora/unauthentication_controller.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Gamora
+  class UnauthenticationController < ApplicationController
+    include AuthorizationUrl
+
+    def show
+      session[:access_token] = nil
+      session[:refresh_token] = nil
+
+      redirect_to authorization_url(params, { max_age: 0 }),
+        allow_other_host: true,
+        status: :see_other
+    end
+  end
+end

data/config/routes.rb

@@ -2,5 +2,6 @@
 
 Gamora::Engine.routes.draw do
   get "amco", to: "authentication#show", as: :authentication
+  get "logout", to: "unauthentication#show", as: :logout
   get "amco/callback", to: "callback#show", as: :callback
 end

data/lib/gamora/authentication/base.rb

@@ -47,12 +47,26 @@ module Gamora
 
       def resource_owner_claims(access_token)
         return {} if access_token.blank?
-        oauth_client.userinfo(access_token)
+        resource_owner_claims!(access_token)
+      end
+
+      def resource_owner_claims!(access_token)
+        Rails.cache.fetch(cache_key(access_token), cache_options) do
+          oauth_client.userinfo(access_token)
+        end
       end
 
       def oauth_client
         Client.from_config
       end
+
+      def cache_options
+        { expires_in: Configuration.userinfo_cache_expires_in }
+      end
+
+      def cache_key(access_token)
+        "userinfo:#{Digest::SHA256.hexdigest(access_token)}"
+      end
     end
   end
 end

data/lib/gamora/configuration.rb

@@ -13,8 +13,10 @@ module Gamora
     mattr_accessor :default_scope, default: "openid profile email"
     mattr_accessor :default_prompt, default: nil
     mattr_accessor :default_strategy, default: "default"
+    mattr_accessor :default_branding, default: "amco"
     mattr_accessor :default_theme, default: "default"
     mattr_accessor :ui_locales, default: -> { I18n.locale }
+    mattr_accessor :userinfo_cache_expires_in, default: 0.seconds
 
     def setup
       yield(self) if block_given?

data/lib/gamora/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gamora
-  VERSION = "0.2.0"
+  VERSION = "0.5.0"
 end

data/lib/generators/gamora/templates/gamora.rb

@@ -15,6 +15,8 @@ Gamora.setup do |config|
   # config.default_scope = "openid profile email"
   # config.default_prompt = nil
   # config.default_strategy = "default"
+  # config.default_branding = "amco"
   # config.default_theme = "default"
   # config.ui_locales = -> { I18n.locale }
+  # config.userinfo_cache_expires_in = 0.seconds
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gamora
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Alejandro Gutiérrez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -49,9 +49,11 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/gamora/authorization_url.rb
 - app/controllers/gamora/application_controller.rb
 - app/controllers/gamora/authentication_controller.rb
 - app/controllers/gamora/callback_controller.rb
+- app/controllers/gamora/unauthentication_controller.rb
 - app/models/gamora/application_record.rb
 - config/routes.rb
 - lib/gamora.rb