cs50 0.1.2 → 0.1.3

data/lib/cs50.rb

@@ -20,24 +20,29 @@ class CS50
     # @param [String] trust_root URL that CS50 ID should prompt user to trust
     # @param [String] return_to URL to which CS50 should return user after login
     # @param session Session variable (i.e. <tt>session</tt> for Ruby on Rails)
+    # @param [Array] fields Simple registration fields
+    # @param [Array] attributes Attribute exchange fields
     # @return [String] URL for CS50 ID authentication
     #
-    def self.getLoginUrl(directory, trust_root, return_to, session)
+    def self.getLoginUrl(directory, trust_root, return_to, session, fields = ["email", "fullname"], attributes = [])
         # prepare request
         store = OpenID::Store::Filesystem.new(Pathname.new(directory))
         consumer = OpenID::Consumer.new(session, store)
         auth_request = consumer.begin("https://id.cs50.net/")
 
         # simple registration fields
-        auth_request.add_extension(OpenID::SReg::Request.new(["email"], ["fullname"]))
+        if (fields.kind_of?(Array) && fields.length > 0)
+            auth_request.add_extension(OpenID::SReg::Request.new(nil, fields))
+        end
 
-=begin AX code, removed for now due to URL length limitation in WEBrick
-        # attribute exchange attributes
-        ax_request = OpenID::AX::FetchRequest.new
-        ax_request.add(OpenID::AX::AttrInfo.new("http://axschema.org/contact/email", 1, true))
-        ax_request.add(OpenID::AX::AttrInfo.new("http://axschema.org/contact/namePerson", 2, false))
-        auth_request.add_extension(ax_request)
-=end
+        # attribute exchange fields
+        if (attributes.kind_of?(Array) && attributes.length > 0)
+            ax_request = OpenID::AX::FetchRequest.new
+            attributes.each do |attribute|
+                ax_request.add(OpenID::AX::AttrInfo.new(attribute, 1, false))
+            end
+            auth_request.add_extension(ax_request)
+        end
 
         # generate url for redirection
         return auth_request.redirect_url(trust_root, return_to)
@@ -64,30 +69,18 @@ class CS50
         response = consumer.complete(parameters, return_to)
 
         if (response.status == OpenID::Consumer::SUCCESS)
+            user = { "identity" => response.identity_url }
+
             # simple registration fields
             sreg_resp = OpenID::SReg::Response.from_success_response(response)
+            if (sreg_resp)
+                user.merge!(sreg_resp.data)
+            end
             
-=begin AX code, removed for now due to URL length limitation in WEBrick
             # get attribute exchange attributes
             ax_resp = OpenID::AX::FetchResponse.from_success_response(response)
-            data = ax_resp.data
-=end
-
-            # get user's ID from identity url
-            if (response.identity_url =~ /^https:\/\/id.cs50.net\/([0123456789abcdef]{64})$/)
-                user = { :id => $1 }
-            else
-                return false
-            end
-
-            # get user's email
-            if (sreg_resp["email"])
-                user[:email] = sreg_resp["email"]
-            end
-                
-            # get user's name
-            if (sreg_resp["fullname"])
-                user[:name] = sreg_resp["fullname"]
+            if (ax_resp)
+                user.merge!(ax_resp.data)
             end
 
             return user

metadata

@@ -2,7 +2,7 @@
 name: cs50
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tommy MacWilliam
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -07:00
+date: 2011-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Utility functions for authenticating users via CS50 ID (https://id.cs50.net/)
+description: Utility functions for authenticating users via Harvard's OpenID provider, CS50 ID (https://id.cs50.net/)
 email: macwilliamt@gmail.com
 executables: []