omniauth-cronofy 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b0524078fb30dd649fd277e61c045522abd3625
-  data.tar.gz: 1f01a581e52d6813531e945dcd831601a81fe3e1
+  metadata.gz: 3e0e7501a9711c3f3d141dda702bfbf5c37ee617
+  data.tar.gz: 92784956009981fc95d5f9b3e45eaf13ebab8932
 SHA512:
-  metadata.gz: bc3bcd9c0c48cc69d9ba8bc60a5c9364f79e96ee229d188860a1897262eb40af55aa026ecb54c184e7c40ad7280847e6a0afe6df9297bfc99f5ccf5b6a9f6c5d
-  data.tar.gz: c9eb4f754a336df1e73e8099f0ef5814b9b097501f0663970194c7738e42a4e71af2cb82a67bddcf7a28b3ca7c644fc0b0521b7edde8b1abd3e986661927c3e2
+  metadata.gz: 943321f4df579cd5a26c705a9c954d0380c0936ec1d938391763076c9aad57eda56e4e2beaf59ffbc33971b44a5b723c2118618705e3645d38584ce798f5aac3
+  data.tar.gz: 488e4b202f99f511e9a911a9ecba76470642bbb92faa12deff3cd4e1e5fcc8b1f8d8b620d2269227b116cb4753d054551bfeb8452926e3ad9b5adbcef117ed50

data/lib/omniauth-cronofy.rb

@@ -1,5 +1,6 @@
 require "omniauth"
 require "omniauth-oauth2"
 require "omniauth-cronofy/version"
+require "omniauth/strategies/cronofy_base"
 require "omniauth/strategies/cronofy"
 require "omniauth/strategies/cronofy_service_account"

data/lib/omniauth-cronofy/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Cronofy
-    VERSION = '0.8.0'.freeze
+    VERSION = '0.9.0'.freeze
   end
 end

data/lib/omniauth/strategies/cronofy.rb

@@ -1,43 +1,9 @@
 module OmniAuth
   module Strategies
-    class Cronofy < OmniAuth::Strategies::OAuth2
+    class Cronofy < CronofyBase
       option :name, "cronofy"
 
-      def self.api_url
-        @api_url ||= (ENV['CRONOFY_API_URL'] || data_centre_api_url || "https://api.cronofy.com")
-      end
-
-      def self.data_centre_api_url
-        case ENV['CRONOFY_DATA_CENTRE']
-        when 'de'
-          "https://api-#{ENV['CRONOFY_DATA_CENTRE']}.cronofy.com"
-        end
-      end
-
-      def self.api_url=(value)
-        @api_url = value
-      end
-
-      def self.app_url
-        @app_url ||= (ENV['CRONOFY_APP_URL'] || data_centre_app_url || "https://app.cronofy.com")
-      end
-
-      def self.data_centre_app_url
-        case ENV['CRONOFY_DATA_CENTRE']
-        when 'de'
-          "https://app-#{ENV['CRONOFY_DATA_CENTRE']}.cronofy.com"
-        end
-      end
-
-      def self.app_url=(value)
-        @app_url = value
-      end
-
-      option :client_options, {
-        :site => ::OmniAuth::Strategies::Cronofy.app_url
-      }
-
-      uid{ raw_info['account_id'] }
+      uid { raw_info['account_id'] }
 
       info do
         {
@@ -58,7 +24,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get("#{::OmniAuth::Strategies::Cronofy.api_url}/v1/account").parsed['account']
+        @raw_info ||= access_token.get("#{client_options[:api_url]}/v1/account").parsed['account']
       end
     end
   end

data/lib/omniauth/strategies/cronofy_base.rb

@@ -0,0 +1,58 @@
+module OmniAuth
+  module Strategies
+    class CronofyBase < OmniAuth::Strategies::OAuth2
+      option :data_center, nil
+
+      def api_url
+        ENV['CRONOFY_API_URL'] || data_center_url(:api, data_center_env) || "https://api.cronofy.com"
+      end
+
+      def app_url
+        ENV['CRONOFY_APP_URL'] || data_center_url(:app, data_center_env) || "https://app.cronofy.com"
+      end
+
+      def data_center_env
+        ENV['CRONOFY_DATA_CENTER'] || ENV['CRONOFY_DATA_CENTRE']
+      end
+
+      def data_center_url(type, value)
+        case value.to_s
+        when 'de'
+          "https://#{type}-#{value}.cronofy.com"
+        end
+      end
+
+      def client_options
+        client_options = deep_symbolize(options.client_options)
+
+        unless client_options[:site]
+          if options.data_center
+            client_options[:site] = data_center_url(:app, options.data_center)
+          end
+
+          unless client_options[:site]
+            client_options[:site] = app_url
+          end
+        end
+
+        unless client_options[:api_url]
+          if options.data_center
+            client_options[:api_url] = data_center_url(:api, options.data_center)
+          end
+
+          unless client_options[:api_url]
+            client_options[:api_url] = api_url
+          end
+        end
+
+        log :debug, "site: #{client_options[:site]}, api_url: #{client_options[:api_url]}"
+
+        client_options
+      end
+
+      def client
+        ::OAuth2::Client.new(options.client_id, options.client_secret, client_options)
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/cronofy_service_account.rb

@@ -1,11 +1,10 @@
 module OmniAuth
   module Strategies
-    class CronofyServiceAccount < OmniAuth::Strategies::OAuth2
+    class CronofyServiceAccount < CronofyBase
       option :name, "cronofy_service_account"
 
       option :client_options, {
-        :site => ::OmniAuth::Strategies::Cronofy.app_url,
-        :authorize_url => "#{::OmniAuth::Strategies::Cronofy.app_url}/enterprise_connect/oauth/authorize",
+        :authorize_url => "/enterprise_connect/oauth/authorize",
       }
 
       def request_phase
@@ -13,7 +12,7 @@ module OmniAuth
         super
       end
 
-      uid{ raw_info['sub'] }
+      uid { raw_info['sub'] }
 
       info do
         {
@@ -32,7 +31,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get("#{::OmniAuth::Strategies::Cronofy.api_url}/v1/userinfo").parsed
+        @raw_info ||= access_token.get("#{client_options[:api_url]}/v1/userinfo").parsed
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-cronofy
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Adam Bird
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -88,6 +88,7 @@ files:
 - lib/omniauth-cronofy/version.rb
 - lib/omniauth/.DS_Store
 - lib/omniauth/strategies/cronofy.rb
+- lib/omniauth/strategies/cronofy_base.rb
 - lib/omniauth/strategies/cronofy_service_account.rb
 - omniauth-cronofy.gemspec
 homepage: https://github.com/cronofy/omniauth-cronofy