omniauth-alephx 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2Q5N2VhNjc5ZTNlNmE1YmRlOWNhODdmYjg3NzU3ZTUyNDI3YjA1Mg==
+    ZDBlNTUwODgyOTlkYWI1MzVjNTQwMzQ4NjgzNmNlNTdkMWQ2NDY3Mg==
   data.tar.gz: !binary |-
-    Y2NjMWJhNmZiYmNmMjExMDcxMmM0M2IxNzUxNDdkYTAwYmM3ODY0MA==
+    NmUxOTg0YzVjM2JiMzlhZmYwY2YxMmEyYzk5ZDkzYzZjZTliYjRjMg==
 SHA512:
   metadata.gz: !binary |-
-    ZTM3NTM5MGNjM2U4MTBmYjk4YjA2ZjcyODU4YjczZjNjNDM5ZDJmOTlkOWFi
-    YjhmZTFjY2QxNzFiMzUxNmE2MTdlMTk3YmI2MDEzYjFmNGZkYmRhZjEwNmI4
-    ZmRmYzA5MGQ5NjFkM2U1NzUxYmQwZGRiMWZmZWZmZTM2YWJlODY=
+    YWVkMjUzZGEyODIyZjc0ZWU0YTU5MWEyODQxZDU3MGVhMTQ2YWJkY2RhZWZm
+    OTg3YmM4MmJhNWY4ODA3NDg4YTY3ZWI5ZjE0MzA3YWMyZjllMjgwNTI2NTE5
+    YWM2ZDI0MWYzZTM3N2FjM2YxNDVhYjkxNGEyMjUzNWJhZDNlZWQ=
   data.tar.gz: !binary |-
-    YThkMzBkNjg4YjY1MTI2OTEyYzQxZjQzYWRhZWNiOWNmN2NmNDQ1NmVkN2Rh
-    MTg5MWYzZWUyMjM5N2EyZmMyNjUyZGJmOWQ2OTJkYzM1ZDFiNmYwZTJkMzlk
-    ZDU2NTNiM2JhY2FiMzJkZGVlOGU1NmU1ZjBmZGQ0MmM0ZjkxYTE=
+    OTdkNTA0YWE2Y2ExNzEzNDg1MTJkOTJiYmNjYWMyMTljNTc3NzE1N2E5MmEy
+    YzI0OGJiOWI2ZjFkOTNlYWZiZGRiYWI1OWMwZWE4M2UyN2FkNTZiMTliNDQw
+    ZmE5NDU5OTk4MDhiZGFjYjFiZDI5YmIwNTUwM2U3YzRjMDg1MTE=

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/omniauth/strategies/alephx.rb

@@ -1,5 +1,6 @@
 require 'omniauth'
 require 'xmlsimple'
+require 'uri'
 
 module OmniAuth
   module Strategies
@@ -19,7 +20,8 @@ module OmniAuth
       @user_info = {}
 
       class << self
-        attr_accessor :filters
+        attr_accessor :filters,:on_error
+        
         def add_filter(&block)
           @filters = [] if @filters.nil?
           @filters << block
@@ -31,7 +33,7 @@ module OmniAuth
       }
       info {
         { 
-          :name => @user_info[:bor_id],
+          :name => @user_info[:name],
           :email => @user_info[:email]
         }
       }
@@ -54,14 +56,18 @@ module OmniAuth
 
       def callback_phase          
 
+        params = request.params
+
+        rp = request_path+"?"+{ :username => params['username'] }.to_query
+
         if missing_credentials?
           session['omniauth.alephx.error'] = :missing_credentials
-          return redirect(request_path)
+          self.class.on_error.call(:missing_credentials) unless self.class.on_error.nil?
+          return redirect(rp)
         end
 
         begin
 
-          params = request.params
 
           unless self.class.filters.nil?
             self.class.filters.each do |filter|
@@ -74,14 +80,18 @@ module OmniAuth
           
           unless bor_auth(username,password)                
             session['omniauth.alephx.error'] = :invalid_credentials
-            return redirect(request_path)
+            self.class.on_error.call(:invalid_credentials) unless self.class.on_error.nil?
+            return redirect(rp)
           end
 
         rescue Exception => e
           session['omniauth.alephx.error'] = :invalid_credentials
-          return redirect(request_path)
+          self.class.on_error.call(:invalid_credentials) unless self.class.on_error.nil?
+          return redirect(rp)
         end
 
+        session.delete('omniauth.alephx.error')
+
         super
       end
 
@@ -105,7 +115,8 @@ module OmniAuth
         return false if document['error']
 
         @user_info = {
-          :bor_id => username,
+          #user pwd to communicate with aleph (cannot extract cas username or barcode from alephx!)
+          :bor_id => document['z303']['z303-id'],
           :name => document['z303']['z303-name'],
           :email => document['z304']['z304-email-address']
         }          

data/lib/omniauth-alephx/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Alephx
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/omniauth-alephx.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: omniauth-alephx 0.1.2 ruby lib
+# stub: omniauth-alephx 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "omniauth-alephx"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nicolas Franck"]
-  s.date = "2014-06-10"
+  s.date = "2014-09-05"
   s.description = "omniauth strategy for authenticating against AlephX Service"
   s.email = "nicolas.franck@ugent.be"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-alephx
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nicolas Franck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -58,48 +58,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4xMg==
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4xMg==
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4w
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4w
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi4wLjE=
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi4wLjE=
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement