cfoundry 0.3.30 → 0.3.31

data/lib/cfoundry/baseclient.rb

@@ -31,6 +31,20 @@ module CFoundry
       request(method, path, options)
     end
 
+    # grab the metadata from a token that looks like:
+    #
+    # bearer (base64 ...)
+    def token_data
+      tok = Base64.decode64(@token.sub(/^bearer\s+/, ""))
+      tok.sub!(/\{.+?\}/, "") # clear algo
+      MultiJson.load(tok[/\{.+?\}/], :symbolize_keys => true)
+
+    # normally i don't catch'em all, but can't expect all tokens to be the
+    # proper format, so just silently fail as this is not critical
+    rescue
+      {}
+    end
+
     private
 
     def parse_json(x)

data/lib/cfoundry/uaaclient.rb

@@ -35,6 +35,16 @@ module CFoundry
       get("Users", nil => :json)
     end
 
+    def change_password(guid, new, old)
+      put(
+        { :schemas => ["urn:scim:schemas:core:1.0"],
+          :password => new,
+          :oldPassword => old
+        },
+        "User", guid, "password",
+        :json => nil)
+    end
+
     private
 
     def handle_response(response, accept)

data/lib/cfoundry/v1/user.rb

@@ -67,6 +67,19 @@ module CFoundry::V1
       manifest[:password] = str
     end
 
+    def guid
+      @guid ||= @client.base.token_data[:user_id]
+    end
+
+    def change_password!(new, old)
+      if @client.base.uaa
+        @client.base.uaa.change_password(guid, new, old)
+      else
+        self.password = new
+        update!
+      end
+    end
+
     private
 
     def manifest

data/lib/cfoundry/v2/client.rb

@@ -68,9 +68,9 @@ module CFoundry::V2
 
     # The currently authenticated user.
     def current_user
-      if guid = token_data[:user_id]
+      if guid = @base.token_data[:user_id]
         user = user(guid)
-        user.emails = [{ :value => token_data[:email] }]
+        user.emails = [{ :value => @base.token_data[:email] }]
         user
       end
     end
@@ -194,21 +194,5 @@ module CFoundry::V2
           json)
       end
     end
-
-    private
-
-    # grab the metadata from a token that looks like:
-    #
-    # bearer (base64 ...)
-    def token_data
-      tok = Base64.decode64(@base.token.sub(/^bearer\s+/, ""))
-      tok.sub!(/\{.+?\}/, "") # clear algo
-      MultiJson.load(tok[/\{.+?\}/], :symbolize_keys => true)
-
-    # normally i don't catch'em all, but can't expect all tokens to be the
-    # proper format, so just silently fail as this is not critical
-    rescue
-      {}
-    end
   end
 end

data/lib/cfoundry/v2/user.rb

@@ -25,6 +25,10 @@ module CFoundry::V2
 
     alias :admin? :admin
 
+    def change_password!(new, old)
+      @client.base.uaa.change_password(@guid, new, old)
+    end
+
     # optional metadata from UAA
     attr_accessor :emails, :name
 

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.3.30"
+  VERSION = "0.3.31"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 3
-  - 30
-  version: 0.3.30
+  - 31
+  version: 0.3.31
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-07 00:00:00 Z
+date: 2012-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client