riddl 0.99.216 → 0.99.217

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ad39cac2c5fac6d11ae73767ba06d0f960cd896
-  data.tar.gz: a53bd4630af8a23ff85df248e1dbc0ae7cb71db2
+  metadata.gz: 1e50e2c0810b8d257a762416cc885ca7f744ca30
+  data.tar.gz: 955760f2f27cb7b020b6b58b863ca6ede7629c71
 SHA512:
-  metadata.gz: 6b127ff50333232a2bcbbb4fa1065a60a6b58ca3c36ba3188b2ef27c2c3976a998ba710c1e15ea2fc85482a1652a6729284bb67f1308533813995eced4fddef9
-  data.tar.gz: b92a629b242f62c1aee5678c436e5ccdbcddb66d0bf0a899615463b5d549adef1eb844de88061552392b526aa36c924f813d4293dcb492baf656bc07ef51fa33
+  metadata.gz: b594d20e57e17c71fa73f74d30f654fcddf7b4a89ccbee93b512b79a18fb17c93bcaf819ea9ec160456883140f1c9690ee42813a3a8da8eea14b81f319ff2c69
+  data.tar.gz: 6b2f13d927ff84be0fc26c4ded893db0aff9e40005bd8b7bc85b466cd44474b7be2fb87fc5e387109634b256250edec9f183da398c5d6628512d07bc48e5a18c

data/lib/ruby/riddl/utils/oauth2-helper.rb

@@ -40,7 +40,9 @@ module Riddl
           end
 
           def write
-            File.write(@tfile, JSON::pretty_generate(@tokens)) rescue {}
+            EM.defer {
+              File.write(@tfile, JSON::pretty_generate(@tokens)) rescue {}
+            }
             @changed = changed
           end
           private :write
@@ -133,4 +135,4 @@ module Riddl
       end
     end
   end
-end  
+end

data/lib/ruby/riddl/utils/oauth2-univie.rb

@@ -72,7 +72,6 @@ module Riddl
             raise "client_id, client_secret or token storage not available."
           end
           Proc.new do
-            run Riddl::Utils::OAuth2::UnivieBearer::CheckAuth, client_id, client_secret, access_tokens if get
             on resource 'verify' do
               run VerifyIdentity, access_tokens, refresh_tokens, client_id, client_secret if post 'verify_in'
             end
@@ -131,6 +130,42 @@ module Riddl
             refresh_tokens.delete_by_token token
           end
         end
+
+        class RefreshToken < Riddl::Implementation
+          def response
+            refresh_token = @p[1].value
+            access_tokens = @a[0]
+            refresh_tokens = @a[1]
+            client_id = @a[2]
+            client_secret = @a[3]
+
+            token, _ = refresh_token.split '.'
+            token_data = JSON::parse(Base64::urlsafe_decode64 token)
+
+            if token_data['iss'] != client_id
+              @status = 401
+              return Riddl::Parameter::Complex.new('data', 'application/json', {
+                :error => 'Token must be refreshed by issuer.'
+              }.to_json)
+            elsif refresh_tokens[refresh_token].nil? || token_data['exp'] <= Time.now.to_i
+              @status = 403
+              puts "i dont know #{refresh_token}", "#{refresh_tokens[refresh_token]}"
+              return Riddl::Parameter::Complex.new('data', 'application/json', {
+                :error => 'Invalid refresh token.'
+              }.to_json)
+            end
+
+            old_token = refresh_tokens[refresh_token]
+            user = access_tokens.delete old_token
+
+            token = OAuth2Fed::make_access_token(client_id, client_id + ':' + client_secret)
+
+            refresh_tokens[refresh_token] = token
+            access_tokens[token] = user
+
+            Riddl::Parameter::Complex.new('data', 'application/json', { :token => token }.to_json)
+          end
+        end
       end
 
     end  

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.216"
+  s.version          = "0.99.217"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.216
+  version: 0.99.217
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart