omniauth-calendly 0.0.1.alpha → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a47a1210cb70e91c44bf8f42907b44c292f101baf5ad93dc5fac58d873b0d473
-  data.tar.gz: 5c1cb8c3b4b170cd622b80412926f97d318565d1c97ffab73dd730cc517445c0
+  metadata.gz: 07db7da420c059a9aad8a228031254fca84856d76654cfe65985d02a4c5e6e8a
+  data.tar.gz: ad34222ebfcce6696565943487e2aeef521bf7171e17600011ec9e28d7b857e4
 SHA512:
-  metadata.gz: f5dc0d3b3778a0851cb0248a7e82c7d8f58186c729b855c18175c56a4c2b01679047b3dd91a6fa71142b36f421ae7cca194d0c5fb0aff58b0c685b8df922acf1
-  data.tar.gz: f5e645cfd64c4f95caa3bf9c271cd294117a08d47706fae35b4e9f3e8c262471772fcdce07ef4dced8e746113b754a859dd212438d0e5fe82fd9dd7539e65d06
+  metadata.gz: c8cb083df5432b150c61d044c9e4c0b868776bceada4371562a83c43373d294914833f83c88f61f07dd196138312cca39f6a69cbd0acefa1789176615f4acc25
+  data.tar.gz: 6c25a690bace4d4c4944a4f8ca7dddb44f35ba740c2b059c1492169e4dd1886d240ac12f71d65b98815b12cb2ecaf12798a198c07eb312050e3c55ae40f0b928

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.0
+
+- #1 extract uid from user api response.
+- #2 make coverage 100%.
+
 # 0.0.1.alpha
 
 - Initial release

data/README.md

@@ -47,7 +47,34 @@ end
 The auth hash `request.env['omniauth.auth']` would look like this:
 
 ```js
-TODO
+{
+  "result": {
+    "provider": "calendly",
+    "uid": "U12345678",
+    "info": {},
+    "credentials": {
+      "token": "ACCESS_TOKEN",
+      "refresh_token": "REFRESH_TOKEN",
+      "expires_at": 1596529477,
+      "expires": true
+    },
+    "extra": {
+      "raw_info": {
+        "resource": {
+          "avatar_url": "https://xxx.cloudfront.net/uploads/user/avatar/xxx/xxx.gif",
+          "created_at": "2020-07-17T05:36:18.596606Z",
+          "email": "hoge@example.com",
+          "name": "USER_NAME",
+          "scheduling_url": "https://calendly.com/hogehoge",
+          "slug": "hogehoge",
+          "timezone": "Asia/Tokyo",
+          "updated_at": "2020-08-03T15:28:55.101449Z",
+          "uri": "https://api.calendly.com/users/U12345678"
+        }
+      }
+    }
+  }
+}
 ```
 
 ## Contributing

data/lib/omniauth-calendly/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module Calendly
-    VERSION = '0.0.1.alpha'
+    VERSION = '0.1.0'
   end
 end

data/lib/omniauth/strategies/calendly.rb

@@ -9,7 +9,9 @@ module OmniAuth
       option :name, 'calendly'
       option :client_options, :site => 'https://auth.calendly.com'
 
-      uid { raw_info['id'] }
+      USER_API_URL = 'https://api.calendly.com/users/'
+
+      uid { extract_uid }
       extra { {:raw_info => raw_info} }
 
     private
@@ -17,16 +19,26 @@ module OmniAuth
       def raw_info
         return @raw_info if defined?(@raw_info)
 
-        endpoint = 'https://api.calendly.com/users/me'
-        @raw_info = access_token.get(endpoint).parsed
-      rescue ::OAuth2::Error => e
-        log(:error, "#{e.class} occured. message:#{e.message}")
-        @raw_info = {}
+        @raw_info = access_token.get("#{USER_API_URL}me").parsed
       end
 
       def callback_url
         full_host + script_name + callback_path
       end
+
+      def extract_uid
+        user_info = raw_info
+        return unless user_info
+        return unless raw_info['resource']
+        return unless raw_info['resource']['uri']
+
+        uri = raw_info['resource']['uri']
+        re = /\A#{USER_API_URL}(.+)\z/
+        m = re.match uri
+        return if m.nil?
+
+        m[1]
+      end
     end
   end
 end

data/omniauth-calendly.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.14.1'
   spec.add_development_dependency 'minitest-reporters', '~> 1.4.2'
   spec.add_development_dependency 'omniauth', '~> 1.9.1'
+  spec.add_development_dependency 'rack-test', '~> 1.1.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'simplecov', '~> 0.18.5'
   spec.add_development_dependency 'webmock', '~> 3.7.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-calendly
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha
+  version: 0.1.0
 platform: ruby
 authors:
 - Kenji Koshikawa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.1
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +180,7 @@ metadata:
   homepage_uri: https://github.com/koshilife/omniauth-calendly
   source_code_uri: https://github.com/koshilife/omniauth-calendly
   changelog_uri: https://github.com/koshilife/omniauth-calendly/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/omniauth-calendly/0.0.1.alpha
+  documentation_uri: https://www.rubydoc.info/gems/omniauth-calendly/0.1.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -178,9 +192,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: