omniauth-blockstack 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18504d2409da70a8f58bfd3062c6ee91421d294e
-  data.tar.gz: 204f6056ca5f183da7a942c6c4e96886aaec2251
+  metadata.gz: ee8e420a1f50250e8dc92e239efb5770aba60f7a
+  data.tar.gz: 8ae852e1d4861afd79a6667aee564553f79f83d3
 SHA512:
-  metadata.gz: bc7d5f5bbb209461a8f7a8e163b31235725038b33213f38136a1e0599992a5e3a36cbe6ed4c6c5ed7235737a408aeaadaa5d6d0a5cea35fa5923865c9cea2b8b
-  data.tar.gz: 03bface310a157b1d88be5cd953a248ccb80fa713e78a0264a0d7d90b0e85b207742eaf0203aa060dd93ffb00a5c4fb22e3ebb988bd53eb086a7433bb5a8eff9
+  metadata.gz: 2eaedb263decd0751ab70dac0864545a2707cf1ffca20af77092890aa3ce4c10e66920c533ef70a23dc7536e2727a0af270c20536976725c3f996a6c78871ee8
+  data.tar.gz: 1227d23e58ec20d81df3dc37abb7721976672d0d6163239b8ff5948e8fb11cce50c4280da39bdbc1f038e8869c5c5323cce451f6ea47d210f60da3eea75e9d41

data/Gemfile.lock

@@ -1,20 +1,18 @@
 PATH
   remote: .
   specs:
-    omniauth-blockstack (0.9.0)
-      blockstack (~> 0.5)
+    omniauth-blockstack (0.9.2)
+      blockstack (= 0.5.7)
       omniauth (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bitcoin (0.2.0)
-      bitcoin-ruby
     bitcoin-ruby (0.0.10)
-    blockstack (0.5.4)
-      bitcoin
+    blockstack (0.5.7)
+      bitcoin-ruby
       faraday
-      jwt
+      jwt-blockstack (= 2.0.0.beta2)
     coderay (1.1.1)
     diff-lcs (1.3)
     faraday (0.11.0)
@@ -36,7 +34,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashie (3.5.5)
-    jwt (1.5.6)
+    jwt-blockstack (2.0.0.beta2)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)

data/lib/omniauth/blockstack/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Blockstack
-    VERSION = "0.9.1"
+    VERSION = "0.9.2"
   end
 end

data/lib/omniauth/strategies/blockstack.rb

@@ -11,7 +11,6 @@ module OmniAuth
       args [:app_name, :blockstack_api]
 
       option :uid_claim, 'iss'
-      option :info_map, {"name" => "username"}
       option :leeway, nil
       option :valid_within, nil
       option :blockstack_api, nil
@@ -54,7 +53,7 @@ module OmniAuth
         ::Blockstack.leeway = options.leeway
         ::Blockstack.valid_within = options.valid_within
         @decoded_token = ::Blockstack.verify_auth_response auth_response
-        puts "decoded_token: #{decoded_token}"
+
         super
 
       rescue ::Blockstack::InvalidAuthResponse => error
@@ -67,11 +66,46 @@ module OmniAuth
         {:raw_info => decoded_token}
       end
 
+      credentials do
+        token = nil # In future store token to access Blockstack Core node/storage here
+        {:token => token}
+      end
+
       info do
-        options.info_map.inject({}) do |h,(k,v)|
-          h[k.to_s] = decoded_token[v.to_s]
-          h
-        end
+        {
+          :nickname => decoded_token["username"],
+          :first_name => decoded_token["profile"].try(:[],"givenName"),
+          :last_name => decoded_token["profile"].try(:[],"familyName"),
+          :location => decoded_token["profile"].try(:[],"address").try(:[],"addressLocality"),
+          :description => decoded_token["profile"].try(:[],"description"),
+          :image => lambda {|images|
+            return nil if images.nil?
+            for image in images
+              if image && image.try(:[],"name") == "avatar"
+                avatar_url = image.try(:[],"contentUrl")
+                if avatar_url && !avatar_url.blank?
+                  return avatar_url
+                end
+              end
+            end
+            nil
+          }.call(decoded_token["profile"].try(:[],"image")),
+          :urls => lambda {|websites|
+            urls = {}
+            return urls if websites.nil?
+            count = 0
+            websites.each {|website|
+              if website.try(:[],"@type") == "WebSite"
+                if !website.try(:[],"url").nil?
+                  count++
+                  urls["site-#{count}"] = website["url"]
+                end
+              end
+              urls
+            }
+            return nil
+          }.call(decoded_token["profile"].try(:[],"website"))
+        }
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-blockstack
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Larry Salibra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler