omniauth-aid 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55868809ab0259b17ba70a6a94891272b23750a8
-  data.tar.gz: a64ddcd0286bca003198965948cf657f150606ac
+  metadata.gz: 1550ab83b145950553e634f284ae678696b9b9eb
+  data.tar.gz: 60d2bd9b52a1772c04972ed132ff8c1a27d4b28a
 SHA512:
-  metadata.gz: ba48fb11312488195f5b6017131eadd65cea71cdf1e774f8c9b032f390c65229bfd9b5637094b99bd31ad0bf8c64bb35dec859cb311ec03e785e3c6e60e4d95d
-  data.tar.gz: b42b289d7b4b250d36326e44a26f041b0db10de06ab920b7470600d5ff07d054deab01d71e7071e10e9d75218656965a7c9b80c93cfe5236b573cc85d08b760a
+  metadata.gz: 6f59f5443f132eb7cb5e0914be568790fc9bbe570e783177aff7ee5137d088d9aa18ff9b7a4662ac3714bab19ffe6aaec29fe50e50771e8317707390139a8a70
+  data.tar.gz: 4eb2a49757bce3c0d2f53422dc5cf7e1bab2c19f99cfecce70e895d4051999594095b6c200130266f2370b5c38b3586d0de603bb265bcf0e6453b98c6241014d

data/LICENSE

@@ -0,0 +1,21 @@
+MIT LICENSE
+
+Copyright (c)  Jonas Helgemo <jonas.helgemo@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -38,7 +38,7 @@ You can configure several options, which you pass in to the `provider` method vi
 
 Hash name | Default | Explanation
 --- | --- | ---
-`scope`, `name` | A space-separated list of permissions you want to request from the user. Optional scopes are: `email`, `phone`, `birth_date`, `tracking_key`, `access`, `external_accounts`, `customer`, `avatar`
+`scope` | `id name` | A space-separated list of permissions you want to request from the user. Optional scopes are: `email`, `phone`, `birth_date`, `tracking_key`, `access`, `external_accounts`, `customer`, `avatar`
 
 For example, to request `name`, `birth_date` and `email` permissions and display the authentication page:
 

data/lib/omniauth/aid/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Aid
-      VERSION = "1.0.0"
+      VERSION = "2.0.0"
   end
 end

data/lib/omniauth/strategies/aid.rb

@@ -1,25 +1,42 @@
 require 'omniauth/strategies/oauth2'
+require 'json'
 
 module OmniAuth
   module Strategies
-    class Aid  < OmniAuth::Strategies::OAuth2
+    # Class used to parse and return omniauth responses from aID
+    class Aid < OmniAuth::Strategies::OAuth2
       option :name, :aid
       option :authorize_options, [:scope]
 
-      option :client_options, {
-               site: "https://www.aid.no",
-               authorize_url: "/api/portunus/v1/oauth/authorize",
-               token_url: "/api/portunus/v1/oauth/token"
-             }
+      option :client_options,
+             site: 'https://www.aid.no',
+             authorize_url: '/api/portunus/v1/oauth/authorize',
+             token_url: '/api/portunus/v1/oauth/token'
 
-      uid { raw_info.fetch("data"){ {} }["id"] }
+      uid { raw_info['uuid'] || raw_info.key['id'] }
 
       info do
-        raw_info.fetch("data"){ {} }.fetch("attributes"){ {} }.to_h
+        prune!('id' => raw_info['id'],
+               'uuid' => raw_info['uuid'],
+               'nickname' => raw_info['name'],
+               'email' => raw_info['email'],
+               'name' => raw_info['name'],
+               'image' => raw_info
+                         .fetch('_links') { {} }
+                         .fetch('avatar') { {} }['href']
+              )
+      end
+
+      def prune!(hash)
+        hash.delete_if do |_, value|
+          prune!(value) if value.is_a?(Hash)
+          value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/api/mercury/v2/users/me').parsed || {}
+        response_body = access_token.get('/api/mercury/v2/users/me').body
+        @raw_info ||= JSON.parse(response_body) || {}
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-aid
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jonas Helgemo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Omniauth-strategy for using aID as an OAuth2-provider