zendesk_remote_authentication 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/zendesk_remote_authentication.rb

@@ -1,5 +1,5 @@
 require 'digest/md5'
-require 'active_support' #gives us Hash.to_query
+require 'active_support'
 
 module Zendesk
   class RemoteAuthentication
@@ -7,12 +7,12 @@ module Zendesk
       attr_writer :auth_url, :token
       
       def token
-        raise ArgumentError.new('Zendesk Token has not been set yet. Set with Zendesk::RemoteAuthentication.token = <token>') unless @token
+        raise ArgumentError.new('Set your Zendesk token with. Zendesk::RemoteAuthentication.token = <token>') unless @token
         @token
       end
   
       def auth_url
-        raise ArgumentError.new('Zendesk authentication url has not been set yet. Set with Zendesk::RemoteAuthentication.auth_url = <token>') unless @auth_url
+        raise ArgumentError.new('Set your Zendesk authentication url with, Zendesk::RemoteAuthentication.auth_url = <token>') unless @auth_url
         @auth_url
       end
       
@@ -22,31 +22,27 @@ module Zendesk
 end
 
 module RemoteAuthenticationHelper
-   #you can either pass username and email or a user object which contains email and username attributes
-   def zendesk_remote_authentication_url(params)
-     params = params.is_a?(Hash) ? params : convert_user_to_a_hash(params)
-
-     #TODO: Need a class to validate the params
-     raise ArgumentError.new("You must provide name and email address") unless (params[:name] && params[:email])
 
-     #add timestamp if none is passed in the params  
-     params[:timestamp] = Time.now.utc.to_i unless params[:timestamp]
+   def zendesk_remote_authentication_url(params)
+      raise ArgumentError.new("You must provide name and email address") unless (params[:name] && params[:email])
+      
+      timestamp   = params[:timestamp] || Time.now.to_i.to_s
+      name        = params[:name]
+      email       = params[:email].force_utf8
+      external_id = params[:external_id]
+      hash        = Digest::MD5.hexdigest(name + email + external_id + Token + now)
+      back        = params[:return_to]
 
-     params[:hash] = params[:external_id] ? generate_authentication_hash(Zendesk::RemoteAuthentication.token, params) : ''
+      auth_params = [
+        '?name='      + CGI.escape(name),
+        '&email='     + CGI.escape(email),
+        '&timestamp=' + now,
+        '&hash='      + hash,
+        '&return_to=' + back
+      ].join.force_utf8
 
-     "#{Zendesk::RemoteAuthentication.auth_url}?#{params.to_query}"
-  end
-  
-  def convert_user_to_a_hash(user)
-    params = {}
-    params[:name]  = "#{user.first_name} #{user.last_name}"
-    params[:email] = user.email
-    params[:external_id] = user.id
-    return params
-  end
-  
-  def generate_authentication_hash(token, params)
-    Digest::MD5.hexdigest(params[:name] + params[:email] + params[:external_id] + token + params[:timestamp])
+      Zendesk::RemoteAuthentication.auth_url + auth_params
+    
   end
-  
+
 end

data/zendesk_remote_authentication.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zendesk_remote_authentication}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Wachira"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zendesk_remote_authentication
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - James Wachira