omniauth-cronofy 0.10.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cad2832b9dd16bab6becf86df66186a7e851b64c
-  data.tar.gz: a5e3c5ebe071bb7f913b0cda338ea890465ff46c
+SHA256:
+  metadata.gz: 9a45cf338505b370434de749e7a7f79765384ca1ada75fd4916c6d6e3487d1bf
+  data.tar.gz: f18971e46e2cb89a08a0fa765e62ecf0c14d031016e43d6cd83a55f23a8ee932
 SHA512:
-  metadata.gz: 8095810326d3e95d44183f1041339220cc3bd581e5d4084d24bf83788a504ad1e61d90cccc67ae29bb5dfe5328e21913a0e8f89c6e8fe2cc8b6230bf4b4ee120
-  data.tar.gz: 34c69347289fa38479fada85fff971dcebf9a2053deea4ab6b7e38bc150e78c1f2f21f0da63d00a2fc189b4b087688c97ef2117c473e11db275dd1dae7a85546
+  metadata.gz: 4bd27e6c335773d273a516c93789dcada4ef8905c427cf12c9c641235d00c2529eabbac6b1408f209dfaf0f6272a27885eb9d942f4f0b883eb9f9659320c81cf
+  data.tar.gz: 7c707b2992990998a1ab21266a8392843e2ed8dbf576d62a06349503769510353ddbbd9d829f26bf3ab762fbff8ec83211bcb7006a31221104832675ab630d67

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+## [0.14.0]
+
+* Add support for new data centers: 'au', 'ca', 'sg', and 'uk'
+
+## [0.13.1]
+
+* Loosen dependencies for OmniAuth 2.x
+
+[0.13.1]: https://github.com/cronofy/omniauth-cronofy/releases/tag/v0.13.1
+[0.14.0]: https://github.com/cronofy/omniauth-cronofy/releases/tag/v0.14.0

data/README.md

@@ -43,11 +43,26 @@ Then to auth with Cronofy you would navigate to `/auth/cronofy`.
 
 #### Explicit Linking
 
-Cronofy supports [explicit linking of calendar accounts](https://www.cronofy.com/developers/api/alpha/#auth-explicit-linking) by passing a `link_token` to the auth flow. This strategy supports that token be passed as a query string parameter to the auth redirect.
+Cronofy supports [explicit linking of calendar accounts](https://docs.cronofy.com/developers/api-alpha/explicit-linking/) by passing a `link_token` to the auth flow. This strategy supports that token be passed as a query string parameter to the auth redirect.
 
 ```
 /auth/cronofy?link_token=hga672376....
 ```
+#### Avoid Linking
+
+Cronofy supports [to avoid profiles to be linked](https://docs.cronofy.com/developers/api/authorization/request-authorization/#avoid_linking) by passing an `avoid_linking` param with `true` value to the auth flow.
+
+```
+/auth/cronofy?avoid_linking=true
+```
+
+#### Provider Name
+
+Cronofy allows the [pre-selection of a calendar provider](https://docs.cronofy.com/developers/api/authorization/request-authorization/#provider_name) in the auth flow using the `provider_name` param with one of the documented values.
+
+```
+/auth/cronofy?provider_name=office365
+```
 
 ### Configuration
 
@@ -123,6 +138,7 @@ Configurable options
     :provider => "cronofy_service_account",
     :uid => "ser_382374827234",
     :info => {
+      :common_name => "company.com",
       :domain => "company.com"
     },
     :credentials => {
@@ -141,6 +157,8 @@ Configurable options
   }
 ```
 
+The `info` element may contain different elements, `domain` and/or `email` depending on the calendar service being integrated with. `common_name` is always returned.
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/omniauth-cronofy/fork )

data/lib/omniauth-cronofy/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Cronofy
-    VERSION = '0.10.0'.freeze
+    VERSION = '0.14.0'.freeze
   end
 end

data/lib/omniauth/strategies/cronofy.rb

@@ -1,6 +1,12 @@
 module OmniAuth
   module Strategies
     class Cronofy < CronofyBase
+      WHITELISTED_AUTHORIZE_PARAMS = %w{
+        avoid_linking
+        link_token
+        provider_name
+      }
+
       option :name, "cronofy"
 
       uid { raw_info['account_id'] }
@@ -28,11 +34,20 @@ module OmniAuth
       end
 
       def request_phase
-        link_token = session['omniauth.params']['link_token']
-        if link_token && !link_token.empty?
-          options[:authorize_params] ||= {}
-          options[:authorize_params].merge!(:link_token => link_token)
+        session_params = session['omniauth.params']
+        params = {}
+
+        WHITELISTED_AUTHORIZE_PARAMS.each do |param|
+          next unless session_params[param]
+          params[param] = session_params[param]
         end
+
+        if options[:authorize_params]
+          options[:authorize_params].merge!(params)
+        else
+          options[:authorize_params] = params
+        end
+
         super
       end
     end

data/lib/omniauth/strategies/cronofy_base.rb

@@ -17,7 +17,9 @@ module OmniAuth
 
       def data_center_url(type, value)
         case value.to_s
-        when 'de'
+        when "", "us"
+          "https://#{type}.cronofy.com"
+        else
           "https://#{type}-#{value}.cronofy.com"
         end
       end

data/lib/omniauth/strategies/cronofy_service_account.rb

@@ -15,9 +15,12 @@ module OmniAuth
       uid { raw_info['sub'] }
 
       info do
-        {
-          :domain => raw_info['cronofy.service_account.domain'],
+        data = {
+          :common_name => raw_info['cronofy.service_account.domain'] || raw_info['cronofy.service_account.email']
         }
+        data[:domain] = raw_info['cronofy.service_account.domain'] if raw_info['cronofy.service_account.domain']
+        data[:email] = raw_info['cronofy.service_account.email'] if raw_info['cronofy.service_account.email']
+        data
       end
 
       def callback_url

data/omniauth-cronofy.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "omniauth", "~> 1.2"
+  spec.add_dependency "omniauth", "> 1.2", "< 3"
   spec.add_dependency "omniauth-oauth2", "~> 1.3"
-  spec.add_development_dependency "bundler", "~> 1.8"
+  spec.add_development_dependency "bundler", "> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "> 3"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-cronofy
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Adam Bird
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -42,14 +48,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
@@ -66,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: OmniAuth strategy for authenticating with Cronofy
 email:
 - support@cronofy.com
@@ -77,6 +97,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -95,7 +116,7 @@ homepage: https://github.com/cronofy/omniauth-cronofy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,9 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: OmniAuth strategy for authenticating with Cronofy
 test_files: []