cf-uaa-lib 1.3.1 → 1.3.2

data/spec/token_coder_spec.rb

@@ -18,7 +18,8 @@ module CF::UAA
 
 describe TokenCoder do
 
-  subject { TokenCoder.new("test_resource", "test_secret", OpenSSL::PKey::RSA.generate(512) ) }
+  subject { TokenCoder.new(:audience_ids => "test_resource",
+      :skey => "test_secret", :pkey => OpenSSL::PKey::RSA.generate(512) ) }
 
   before :each do
     @tkn_body = {'foo' => "bar"}
@@ -56,7 +57,7 @@ describe TokenCoder do
       2yrlT5h164jGCxqe7++1kIl4ollFCgz6QJ8lcmb/2Q==
       -----END RSA PRIVATE KEY-----
     DATA
-    coder = TokenCoder.new("test_resource", nil, pem)
+    coder = TokenCoder.new(:audience_ids => "test_resource", :pkey => pem)
     tkn = coder.encode(@tkn_body, 'RS256')
     result = coder.decode("bEaReR #{tkn}")
     result.should_not be_nil
@@ -80,13 +81,13 @@ describe TokenCoder do
   end
 
   it "raises a decode error if the token is signed by an unknown signing key" do
-    other = TokenCoder.new("test_resource", "other_secret", nil)
+    other = TokenCoder.new(:audience_ids => "test_resource", :skey => "other_secret")
     tkn = other.encode(@tkn_body)
     expect { subject.decode("bEaReR #{tkn}") }.to raise_exception(DecodeError)
   end
 
   it "raises a decode error if the token is an unknown signing algorithm" do
-    segments = [Util.json_encode64(typ: "JWT", alg:"BADALGO")]
+    segments = [Util.json_encode64(:typ => "JWT", :alg =>"BADALGO")]
     segments << Util.json_encode64(@tkn_body)
     segments << Util.encode64("BADSIG")
     tkn = segments.join('.')
@@ -115,14 +116,13 @@ describe TokenCoder do
 
   it "decodes a token without validation" do
     token = "eyJhbGciOiJIUzI1NiJ9.eyJpZCI6ImY1MTgwMjExLWVkYjItNGQ4OS1hNmQwLThmNGVjMTE0NTE4YSIsInJlc291cmNlX2lkcyI6WyJjbG91ZF9jb250cm9sbGVyIiwicGFzc3dvcmQiXSwiZXhwaXJlc19hdCI6MTMzNjU1MTc2Niwic2NvcGUiOlsicmVhZCJdLCJlbWFpbCI6Im9sZHNAdm13YXJlLmNvbSIsImNsaWVudF9hdXRob3JpdGllcyI6WyJST0xFX1VOVFJVU1RFRCJdLCJleHBpcmVzX2luIjo0MzIwMCwidXNlcl9hdXRob3JpdGllcyI6WyJST0xFX1VTRVIiXSwidXNlcl9pZCI6Im9sZHNAdm13YXJlLmNvbSIsImNsaWVudF9pZCI6InZtYyIsInRva2VuX2lkIjoiZWRlYmYzMTctNWU2Yi00YmYwLWFmM2ItMTA0OWRjNmFlYjc1In0.XoirrePfEujnZ9Vm7SRRnj3vZEfRp2tkjkS_OCVz5Bs"
-    info = TokenCoder.decode(token, nil, nil, false)
+    info = TokenCoder.decode(token, :verify => false)
     info["id"].should_not be_nil
     info["email"].should == "olds@vmware.com"
     #puts Time.at(info[:exp].to_i)
     #BaseCli.pp info
   end
 
-
 end
 
 end

data/spec/token_issuer_spec.rb

@@ -37,11 +37,12 @@ describe TokenIssuer do
         # TODO check basic auth header
         url.should == "http://test.uaa.target/oauth/token"
         method.should == :post
-        reply = {access_token: "test_access_token", token_type: "BEARER", scope: "logs.read", expires_in: 98765}
+        reply = {:access_token => "test_access_token", :token_type => "BEARER",
+            :scope => "logs.read", :expires_in => 98765}
         [200, Util.json(reply), {"content-type" => "application/json"}]
       end
       token = subject.client_credentials_grant("logs.read")
-      token.should be_an_instance_of Token
+      token.should be_an_instance_of TokenInfo
       token.info["access_token"].should == "test_access_token"
       token.info["token_type"].should =~ /^bearer$/i
       token.info["scope"].should == "logs.read"
@@ -50,7 +51,8 @@ describe TokenIssuer do
 
     it "gets all granted scopes if none specified" do
       subject.set_request_handler do |url, method, body, headers|
-        reply = {access_token: "test_access_token", token_type: "BEARER", scope: "openid logs.read", expires_in: 98765}
+        reply = {:access_token => "test_access_token", :token_type => "BEARER",
+            :scope => "openid logs.read", :expires_in => 98765}
         [200, Util.json(reply), {"content-type" => "application/json"}]
       end
       token = subject.client_credentials_grant
@@ -71,7 +73,6 @@ describe TokenIssuer do
       subject.set_request_handler { [400, '{"error":"invalid scope"}', {"content-type" => "application/json"}] }
       expect {subject.client_credentials_grant("bad.scope")}.to raise_exception TargetError
     end
-
   end
 
   context "with owner password grant" do
@@ -83,11 +84,12 @@ describe TokenIssuer do
         # TODO check basic auth header
         url.should == "http://test.uaa.target/oauth/token"
         method.should == :post
-        reply = {access_token: "test_access_token", token_type: "BEARER", scope: "openid", expires_in: 98765}
+        reply = {:access_token => "test_access_token", :token_type => "BEARER",
+            :scope => "openid", :expires_in => 98765}
         [200, Util.json(reply), {"content-type" => "application/json"}]
       end
       token = subject.owner_password_grant("joe+admin", "?joe's%password$@ ", "openid")
-      token.should be_an_instance_of Token
+      token.should be_an_instance_of TokenInfo
       token.info["access_token"].should == "test_access_token"
       token.info["token_type"].should =~ /^bearer$/i
       token.info["scope"].should == "openid"
@@ -100,7 +102,7 @@ describe TokenIssuer do
 
     it "gets the prompts for credentials used to authenticate implicit grant" do
       subject.set_request_handler do |url, method, body, headers|
-        info = { prompts: {username: ["text", "Username"], password: ["password","Password"]} }
+        info = { :prompts => {:username => ["text", "Username"], :password => ["password","Password"]} }
         [200, Util.json(info), {"content-type" => "application/json"}]
       end
       result = subject.prompts
@@ -126,8 +128,8 @@ describe TokenIssuer do
             "expires_in=98765&scope=openid+logs.read&state=#{state}"
         [302, nil, {"content-type" => "application/json", "location" => location}]
       end
-      token = subject.implicit_grant_with_creds(username: "joe+admin", password: "?joe's%password$@ ")
-      token.should be_an_instance_of Token
+      token = subject.implicit_grant_with_creds(:username => "joe+admin", :password => "?joe's%password$@ ")
+      token.should be_an_instance_of TokenInfo
       token.info["access_token"].should == "test_access_token"
       token.info["token_type"].should =~ /^bearer$/i
       Util.arglist(token.info["scope"]).to_set.should == Util.arglist("openid logs.read").to_set
@@ -141,8 +143,8 @@ describe TokenIssuer do
             "expires_in=98765&scope=openid+logs.read&state=bad_state"
         [302, nil, {"content-type" => "application/json", "location" => location}]
       end
-      expect {token = subject.implicit_grant_with_creds(username: "joe+admin",
-              password: "?joe's%password$@ ")}.to raise_exception BadResponse
+      expect {token = subject.implicit_grant_with_creds(:username => "joe+admin",
+          :password => "?joe's%password$@ ")}.to raise_exception BadResponse
     end
 
   end
@@ -153,7 +155,7 @@ describe TokenIssuer do
       redir_uri = "http://call.back/uri_path"
       uri_parts = subject.authcode_uri(redir_uri).split('?')
       uri_parts[0].should == "http://test.uaa.target/oauth/authorize"
-      params = Util.decode_form_to_hash(uri_parts[1])
+      params = Util.decode_form(uri_parts[1])
       params["response_type"].should == "code"
       params["client_id"].should == "test_client"
       params["scope"].should be_nil
@@ -168,7 +170,8 @@ describe TokenIssuer do
         # TODO check basic auth header
         url.should match "http://test.uaa.target/oauth/token"
         method.should == :post
-        reply = {access_token: "test_access_token", token_type: "BEARER", scope: "openid", expires_in: 98765}
+        reply = {:access_token => "test_access_token", :token_type => "BEARER",
+            :scope => "openid", :expires_in => 98765}
         [200, Util.json(reply), {"content-type" => "application/json"}]
       end
       cburi = "http://call.back/uri_path"
@@ -176,7 +179,7 @@ describe TokenIssuer do
       state = /state=([^&]+)/.match(redir_uri)[1]
       reply_query = "state=#{state}&code=kz8%2F5gQZ2pc%3D"
       token = subject.authcode_grant(redir_uri, reply_query)
-      token.should be_an_instance_of Token
+      token.should be_an_instance_of TokenInfo
       token.info["access_token"].should == "test_access_token"
       token.info["token_type"].should =~ /^bearer$/i
       token.info["scope"].should == "openid"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaa-lib
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -64,7 +64,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -143,6 +159,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client library for interacting with the CloudFoundry User Account and
   Authorization (UAA) server.  The UAA is an OAuth2 Authorization Server so it can
   be used by webapps and command line apps to obtain access tokens to act on behalf
@@ -160,6 +192,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE.TXT
+- NOTICE.TXT
 - README.md
 - Rakefile
 - cf-uaa-lib.gemspec
@@ -172,6 +206,7 @@ files:
 - lib/uaa/util.rb
 - lib/uaa/version.rb
 - spec/http_spec.rb
+- spec/integration_spec.rb
 - spec/misc_spec.rb
 - spec/scim_spec.rb
 - spec/spec_helper.rb
@@ -191,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3747087268217165493
+      hash: -1911536519495271904
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -200,11 +235,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3747087268217165493
+      hash: -1911536519495271904
 requirements: []
 rubyforge_project: cf-uaa-lib
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client library for CloudFoundry UAA
 test_files: []
+has_rdoc: