Merge pull request #4 from code0-tech/3-support-objects-too-instead-of-only-lamda-functions

add a check to also allow hashes instead of only lambda blocks

Author: Knerio

README.md

@@ -31,10 +31,10 @@ require "code0/identities"
 begin
 
   identity = Code0::Identities::Provider::Discord.new(
-    -> {
-      redirect_uri : "http://localhost:8080/redirect",
-        client_id : "id"
-      client_secret : "xxxx"
+    {
+      redirect_uri: "http://localhost:8080/redirect",
+      client_id: "id",
+      client_secret: "xxxx"
     }).load_identity({ code: "a_valid_code" })
 
 rescue Code0::Error => e
@@ -70,4 +70,25 @@ identity_provider.load_identity(:gitlab, params)
 
 identity_provider.load_identity(:my_custom_gitlab_provider, params)
 
+```
+
+We also support passing in a function as a configuration instead of a hash
+
+```ruby
+
+def get_identity
+  provider = Code0::Identities::Provider::Discord.new(-> { fetch_configuration })
+
+  provider.load_identity(params)
+end
+
+def fetch_configuration
+  # Do some database action, to dynamicly load the configuration
+  {
+    redirect_uri: "http://localhost:8080/redirect",
+    client_id: "some dynamic value",
+    client_secret: "xxxx"
+  }
+end
+
 ```

lib/code0/identities/identity_provider.rb

@@ -9,12 +9,12 @@ def initialize
         @providers = {}
       end
 
-      def add_provider(provider_type, config_loader)
-        add_named_provider provider_type, provider_type, config_loader
+      def add_provider(provider_type, config)
+        add_named_provider provider_type, provider_type, config
       end
 
-      def add_named_provider(provider_id, provider_type, config_loader)
-        provider = Identities::Provider.const_get(provider_type.capitalize).new(config_loader)
+      def add_named_provider(provider_id, provider_type, config)
+        provider = Identities::Provider.const_get(provider_type.capitalize).new(config)
         providers[provider_id] = provider
       end
 

lib/code0/identities/provider/base_oauth.rb

@@ -66,6 +66,12 @@ def check_response(response)
         def create_identity(*)
           raise NotImplementedError
         end
+
+        def config
+          return config_loader.call if config_loader.is_a?(Proc)
+
+          config_loader
+        end
       end
     end
   end

lib/code0/identities/provider/discord.rb

@@ -9,7 +9,6 @@ def token_url
         end
 
         def token_payload(code)
-          config = config_loader.call
           { code: code,
             grant_type: "authorization_code",
             redirect_uri: config[:redirect_uri],
@@ -22,7 +21,6 @@ def user_details_url
         end
 
         def authorization_url
-          config = config_loader.call
           "https://discord.com/oauth2/authorize?client_id=#{config[:client_id]}&response_type=code&redirect_uri=#{URI.encode_uri_component(config[:redirect_uri])}&scope=identify+openid+email"
         end
 

lib/code0/identities/provider/github.rb

@@ -9,7 +9,6 @@ def token_url
         end
 
         def token_payload(code)
-          config = config_loader.call
           { code: code,
             redirect_uri: config[:redirect_uri],
             client_id: config[:client_id],
@@ -21,7 +20,6 @@ def user_details_url
         end
 
         def authorization_url
-          config = config_loader.call
           "https://github.com/login/oauth/authorize?client_id=#{config[:client_id]}&redirect_uri=#{URI.encode_uri_component(config[:redirect_uri])}&scope=read:user+user:email"
         end
 

lib/code0/identities/provider/gitlab.rb

@@ -5,7 +5,6 @@ module Identities
     module Provider
       class Gitlab < BaseOauth
         def base_url
-          config = config_loader.call
           config[:base_url]
         end
 
@@ -14,7 +13,6 @@ def token_url
         end
 
         def token_payload(code)
-          config = config_loader.call
           { code: code,
             grant_type: "authorization_code",
             redirect_uri: config[:redirect_uri],
@@ -27,7 +25,6 @@ def user_details_url
         end
 
         def authorization_url
-          config = config_loader.call
           # rubocop:disable Layout/LineLength
           base_url + "/oauth/authorize?client_id=#{config[:client_id]}&response_type=code&redirect_uri=#{URI.encode_uri_component(config[:redirect_uri])}&scope=read_user"
           # rubocop:enable Layout/LineLength

lib/code0/identities/provider/google.rb

@@ -13,7 +13,6 @@ def token_url
         end
 
         def token_payload(code)
-          config = config_loader.call
           {
             code: code,
             grant_type: "authorization_code",
@@ -28,7 +27,6 @@ def user_details_url
         end
 
         def authorization_url
-          config = config_loader.call
           # rubocop:disable Layout/LineLength
           base_url + "/o/oauth2/v2/auth?client_id=#{config[:client_id]}&response_type=code&redirect_uri=#{URI.encode_www_form_component(config[:redirect_uri])}&scope=openid%20email%20profile"
           # rubocop:enable Layout/LineLength

lib/code0/identities/provider/microsoft.rb

@@ -13,7 +13,6 @@ def token_url
         end
 
         def token_payload(code)
-          config = config_loader.call
           { code: code,
             grant_type: "authorization_code",
             redirect_uri: config[:redirect_uri],
@@ -26,7 +25,6 @@ def user_details_url
         end
 
         def authorization_url
-          config = config_loader.call
           "https://login.microsoftonline.com/consumers/oauth2/v2.0/authorize?client_id=#{config[:client_id]}&response_type=code&redirect_uri=#{config[:redirect_uri]}&response_mode=query&scope=email%20profile%20openid"
         end
 

spec/code0/identities/identity_provider_spec.rb

@@ -7,14 +7,14 @@
 
   describe "#add_provider" do
     it "adds the correct class" do
-      instance.add_provider :google, -> {}
+      instance.add_provider :google, {}
       expect(instance.providers).to match(google: an_instance_of(Code0::Identities::Provider::Google))
     end
   end
 
   describe "#load_identity" do
     it "calls the right provider" do
-      provider = Code0::Identities::Provider::Google.new(-> {})
+      provider = Code0::Identities::Provider::Google.new({})
       allow(provider).to receive(:load_identity)
       instance.providers[:google] = provider
       instance.load_identity(:google, { test: 1 })

spec/code0/identities/provider/discord_spec.rb

@@ -2,13 +2,11 @@
 
 RSpec.describe Code0::Identities::Provider::Discord do
   subject(:service_response) do
-    described_class.new(lambda {
-      {
-        redirect_uri: redirect_uri,
-        client_id: client_id,
-        client_secret: client_secret
-      }
-    }).load_identity(code: code)
+    described_class.new({
+                          redirect_uri: redirect_uri,
+                          client_id: client_id,
+                          client_secret: client_secret
+                        }).load_identity(code: code)
   end
 
   let(:redirect_uri) { SecureRandom.hex }
@@ -34,7 +32,7 @@
     end
   end
 
-  context "when everything is valid" do
+  shared_examples "when everything is valid" do
     let(:access_token) { SecureRandom.hex }
     let(:response_body) { { id: 1, username: "name", email: "example@code0.tech" }.to_json }
 
@@ -65,4 +63,22 @@
       expect(service_response.email).to eq("example@code0.tech")
     end
   end
+
+  context "when config is Proc" do
+    subject(:service_response) do
+      described_class.new(lambda {
+                            {
+                              redirect_uri: redirect_uri,
+                              client_id: client_id,
+                              client_secret: client_secret
+                            }
+                          }).load_identity(code: code)
+    end
+
+    it_behaves_like "when everything is valid"
+  end
+
+  context "when config is a hash" do
+    it_behaves_like "when everything is valid"
+  end
 end