uservoice-ruby 0.0.7 → 0.0.8

data/lib/uservoice/user_voice.rb

@@ -19,10 +19,14 @@ module UserVoice
   ApplicationError = Class.new(APIError)
  
   def self.generate_sso_token(subdomain_key, sso_key, user_hash, valid_for = 5 * 60)
-    user_hash[:expires] ||= (Time.now.utc + valid_for).to_s unless valid_for.nil?
-    unless user_hash[:email].to_s.match(EMAIL_FORMAT)
-      raise Unauthorized.new("'#{user_hash[:email]}' is not a valid email address")
+    expiration_key = user_hash['expires'].nil? ? :expires : 'expires'
+    user_hash[expiration_key] ||= (Time.now.utc + valid_for).to_s unless valid_for.nil?
+    email = (user_hash[:email] || user_hash['email'])
+
+    unless email.to_s.match(EMAIL_FORMAT)
+      raise Unauthorized.new("'#{email}' is not a valid email address")
     end
+
     unless sso_key.to_s.length > 1
       raise Unauthorized.new("Please specify your SSO key")
     end
@@ -33,4 +37,9 @@ module UserVoice
 
     return CGI.escape(encoded)
   end
+
+  def self.decrypt_sso_token(subdomain_key, sso_key, encoded)
+    encrypted = Base64.decode64(CGI.unescape(encoded))
+    return JSON.parse(EzCrypto::Key.with_password(subdomain_key, sso_key).decrypt(encrypted))
+  end
 end

data/lib/uservoice/version.rb

@@ -1,3 +1,3 @@
 module Uservoice
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/lib/user_voice_spec.rb

@@ -2,14 +2,21 @@ require 'spec_helper'
 
 describe UserVoice do
 
-  it "should generate SSO token" do
-    token = UserVoice.generate_sso_token(config['subdomain_name'], config['sso_key'], {
-      :display_name => "User Name",
-      :email => 'mailaddress@example.com'
-    })
-    encrypted_raw_data = Base64.decode64(CGI.unescape(token))
-
-    key = EzCrypto::Key.with_password(config['subdomain_name'], config['sso_key'])
-    key.decrypt(encrypted_raw_data).should match('mailaddress@example.com')
+  context 'having an SSO token for User Name' do
+    let(:user_attributes) do
+      { :display_name => "User Name", :email => 'mailaddress@example.com' }
+    end
+
+    it "should generate SSO token" do
+      token = UserVoice.generate_sso_token(config['subdomain_name'], config['sso_key'], user_attributes)
+      encrypted_raw_data = Base64.decode64(CGI.unescape(token))
+      key = EzCrypto::Key.with_password(config['subdomain_name'], config['sso_key'])
+      key.decrypt(encrypted_raw_data).should match('mailaddress@example.com')
+    end
+
+    it "should decrypt SSO token" do
+      token = UserVoice.generate_sso_token(config['subdomain_name'], config['sso_key'], user_attributes)
+      UserVoice.decrypt_sso_token(config['subdomain_name'], config['sso_key'], token)['display_name'].should match('User Name')
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uservoice-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec