omniauth-mapsme 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf188cbd8ce5954c90fe16ab1c73ae8f70f8eda
-  data.tar.gz: 0686d890cb7c6d6085f1c83c0e9c695559158909
+  metadata.gz: 60878dea9c9ac5271ba296199ee84492569496ea
+  data.tar.gz: 95f466ca93b9e2ec17143434a4d178123c63198c
 SHA512:
-  metadata.gz: bbfd385d2d3b2885cb205b3be5c4f484d387d5694d0f4a7ae5f8ec13104e7b564e8f605666711cee4c82d0bede32c587fb861f1fb7a88f06c8585d8994aa1b32
-  data.tar.gz: 61626badcbf0f1b5719a348431044e09c35e5c0ecc50c008f322a97da28462840ba90e65f225f041cfd7a68b3fbdb56e0377c04a72de19bb2bc8e80544c6a5ca
+  metadata.gz: 00c5c31b1ada72fd7f3385733351e541d2b262cb08748cd5b08aee98a51060437c60890b682c475a85c3d0c6dab431d8b36231b120de9eba78fba937f811c188
+  data.tar.gz: 9c826898ff1efa97881230c59f90e987ba80c1a9f232fed680d72140eb74bd63c0e230d3b9afa71e1c4912d1de7e5c6448f7def3e77d961735bc1067dedb57bb

data/lib/omniauth-mapsme/version.rb

@@ -1,6 +1,6 @@
 module OmniAuth
   module MapsMe
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 
   module MapsMeToken

data/lib/omniauth/strategies/mapsme-base.rb

@@ -2,12 +2,30 @@ module OmniAuth
   module Strategies
     module MapsMeBase
       MAPSME_BASE = 'https://passport.maps.me'
+      MAPSME_DEFAULT_SCOPE = 'read'
+      MAPSME_USER_DETAILS = '/user_details/'
 
       MAPSME_CLIENT_OPTIONS = {
         :site => MAPSME_BASE,
         :authorize_url => "#{MAPSME_BASE}/oauth/authorize",
-        :token_url => "#{MAPSME_BASE}/oauth/token"
+        :token_url => "#{MAPSME_BASE}/oauth/token/"
       }
+
+      def extract_name(raw_info)
+        first_name = raw_info['first_name']
+        last_name = raw_info['last_name']
+        username = raw_info['username']
+
+        if first_name
+          if last_name
+            "#{first_name} #{last_name}"
+          else
+            first_name
+          end
+        else
+          username
+        end
+      end
     end
   end
 end

data/lib/omniauth/strategies/mapsme-token.rb

@@ -24,12 +24,12 @@ module OmniAuth
 
       attr_accessor :access_token
 
-      uid { raw_info['uid'].to_s }
+      uid { raw_info['username'] }
 
       info do
         prune!({
           'email' => raw_info['email'],
-          'name' => raw_info['name']
+          'name' => extract_name(raw_info)
         })
       end
 
@@ -47,12 +47,12 @@ module OmniAuth
 
       def authorize_params
         super.tap do |params|
-          params[:scope] = 'user mail'
+          params[:scope] = MAPSME_DEFAULT_SCOPE
         end
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/user').parsed || {}
+        @raw_info ||= access_token.get(MAPSME_USER_DETAILS).parsed || {}
       end
 
       def info_options

data/lib/omniauth/strategies/mapsme.rb

@@ -10,12 +10,12 @@ module OmniAuth
 
       option :client_options, MAPSME_CLIENT_OPTIONS
 
-      uid { raw_info['uid'].to_s }
+      uid { raw_info['username'] }
 
       info do
         {
           'email' => raw_info['email'],
-          'name' => raw_info['name']
+          'name' => extract_name(raw_info)
         }
       end
 
@@ -25,12 +25,12 @@ module OmniAuth
 
       def authorize_params
         super.tap do |params|
-          params[:scope] = 'user mail'
+          params[:scope] = MAPSME_DEFAULT_SCOPE
         end
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/user').parsed || {}
+        @raw_info ||= access_token.get(MAPSME_USER_DETAILS).parsed || {}
       end
 
       # Fix omniauth-oauth2 issue https://github.com/intridea/omniauth-oauth2/issues/76

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-mapsme
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ilya Zverev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth