riddl 0.99.238 → 0.99.239

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4734d03ff365945d60743be4fdefaa041eb06b
-  data.tar.gz: a6fd62f15d4452ab9a9f06ea5ea25cf6927a575d
+  metadata.gz: c301d64e6a963f82909cbd5076cba088665079f0
+  data.tar.gz: 91cde5f65ca064ad63853d7abe78992acabf1e00
 SHA512:
-  metadata.gz: 80184d81f58e46921bfcef60d3c01ae849cd3b26ba4d99b8a55ddc8bbbcf355001b88628e2d598a53b0bbe0f6fbd5cd6d2b97011d8b1ab46f2bcb421180f9c05
-  data.tar.gz: e153177b081614e2ed62824a546c0dde996344e465a6dd568dd37fb8a1be63897da08cc88dc4909aba9262c548c2d4839543b60adc124885a43c4cbd1eeeef31
+  metadata.gz: 33cf18569dd93ba6b866fac95eb822ea5b51efbb34709284135d8bf37f5c51a064b74611dd54f3f6eb8b1e48ae7b7def3fd10f7b7b103f061e49227b11c226d9
+  data.tar.gz: f35fc142816f45ebdc2bf629b20e0e83e6211884e6f5c26ec509e80a5cc54b9396e471d6dc33405931baf845eab4bdfa45881e1b717c10bf94f49597cf8025c6

data/lib/ruby/riddl/ns/common-patterns/oauth2-univie-app/1.0/app.xml

@@ -19,7 +19,7 @@
   </message>
 
   <message name="revoke_in">
-    <parameter name="token" type="string"/>
+    <parameter name="code" type="string"/>
   </message>
 
   <message name="check">

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

@@ -64,18 +64,17 @@ module Riddl
       end
 
       module UnivieApp
-        def self::implementation(client_id, client_secret, access_tokens, refresh_tokens, adur, rdur)
+        def self::implementation(client_id, client_secret, access_tokens, refresh_tokens, codes, adur, rdur)
           Proc.new do
             run UnivieBearer::CheckAuth, client_id, client_secret, access_tokens if get 'check'
             on resource 'verify' do
-              run VerifyIdentity, access_tokens, refresh_tokens, client_id, client_secret, adur, rdur if post 'verify_in'
+              run VerifyIdentity, access_tokens, refresh_tokens, codes, client_id, client_secret, adur, rdur if post 'verify_in'
             end
             on resource 'token' do
               run RefreshToken, access_tokens, refresh_tokens, client_id, client_secret, adur, rdur if post 'refresh_token_in'
             end
             on resource 'revoke' do
-              run RevokeTokenFlow, access_tokens, refresh_tokens if get 'revoke_token_in'
-              run RevokeUserFlow, access_tokens, refresh_tokens if get 'revoke_user_in'
+              run RevokeFlow, access_tokens, refresh_tokens, codes if get 'revoke_in'
             end
           end
         end
@@ -85,10 +84,11 @@ module Riddl
             code = Base64::urlsafe_decode64 @p[0].value
             access_tokens  = @a[0]
             refresh_tokens = @a[1]
-            client_id      = @a[2]
-            client_secret  = @a[3]
-            adur           = @a[4]
-            rdur           = @a[5]
+            codes          = @a[2]
+            client_id      = @a[3]
+            client_secret  = @a[4]
+            adur           = @a[5]
+            rdur           = @a[6]
             client_pass    = "#{client_id}:#{client_secret}"
 
             user_id, decrypted = Riddl::Utils::OAuth2::Helper::decrypt_with_shared_secret(code, client_pass).split(':', 2) rescue [nil,nil]
@@ -99,6 +99,7 @@ module Riddl
               }.to_json)
             else
               token, refresh_token          = Riddl::Utils::OAuth2::Helper::generate_optimistic_token(client_id, client_pass, adur, rdur)
+              codes.set(code, refresh_token, rdur)
               access_tokens.set(token, user_id, adur)
               refresh_tokens.set(refresh_token, token, rdur)
 
@@ -113,25 +114,16 @@ module Riddl
           end
         end
 
-        class RevokeTokenFlow < Riddl::Implementation
+        class RevokeFlow < Riddl::Implementation
           def response
-            token = @p[0].value
-            access_tokens = @a[0]
-            refresh_tokens = @a[1]
-
-            access_tokens.delete(token)
-            refresh_tokens.delete_by_value(token)
-          end
-        end
-
-        class RevokeUserFlow < Riddl::Implementation
-          def response
-            user_id = @p[0].value
-            access_tokens = @a[0]
+            code           = Base64::urlsafe_decode64 @p[0].value
+            access_tokens  = @a[0]
             refresh_tokens = @a[1]
+            codes          = @a[2]
 
-            token = access_tokens.delete_by_value user_id
-            refresh_tokens.delete_by_value token
+            rt = codes.delete(code)
+            at = refresh_tokens.delete(rt)
+            access_tokens.delete(at)
           end
         end
 

data/ns/common-patterns/oauth2-univie-app/1.0/app.xml

@@ -19,7 +19,7 @@
   </message>
 
   <message name="revoke_in">
-    <parameter name="token" type="string"/>
+    <parameter name="code" type="string"/>
   </message>
 
   <message name="check">

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.238"
+  s.version          = "0.99.239"
   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.238
+  version: 0.99.239
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler