cul_omniauth 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5c1805d9d83aa9df667abb8df5e5aed6c1a3421
-  data.tar.gz: a0d99e89e40921bff1d81724109fc97c84e336dc
+  metadata.gz: 2bbef3d6b587426dc435819aae1c1f6840f160b9
+  data.tar.gz: 26e3cf4f4f3aaca65e525ebf4914407f56d48b75
 SHA512:
-  metadata.gz: 5567910040ad0349764cac904e5f921afb7ff104862cfbfe77c79037aae0b76f675a50b11aa73c410f0dbfdc34b874840b1a7d8361b45560ee87514c3b9d5473
-  data.tar.gz: da1a4d534b2af97a107e8a3aef97ae126544c1fc56e5cb79711031aa93728ca96bee2b6b1e6ea9d4a3bc8a3e41c165f47f11393628066c9722ec014ff3567af8
+  metadata.gz: 4a0f992990196939a48603a641e515942b0db1d78a1b424bc80f6b6a56705960a4d33a2899a3596c878ac4eaa29c59ece546e02426890431122a1348e5fc6ccc
+  data.tar.gz: 2f36f41843f1a679a851a012f6ed697be35ff986248ada13e2db7ac7bcf53d12c50045b19f27bd32f549b659a011a4b3fcde1e9cbe22a736c66c866ced4ed111

data/app/models/concerns/cul/omniauth/abilities.rb

@@ -12,7 +12,7 @@ module Cul::Omniauth::Abilities
         roles.include?(role) or user.role?(role)
       end
       role_permissions[:'*'] = self.class.config.fetch(:*,Empty::HASH)
-      opts = {user_id: user.login}.merge(opts)
+      opts = {user_id: user.uid}.merge(opts)
     else
       role_permissions = {:'*' => self.class.config.fetch(:*,Empty::HASH)}
     end

data/app/models/concerns/cul/omniauth/users.rb

@@ -8,12 +8,18 @@ module Cul::Omniauth::Users
     mod.devise :registerable, :recoverable, 
     :rememberable, :trackable, :validatable, :omniauthable
 
+    #mod.attr_accessible :password
     #mod.attr_accessible :username, :uid, :provider
     #mod.attr_accessible :email, :guest
   
     mod.delegate :can?, :cannot?, :to => :ability
   end
 
+
+  def full_name
+    return self.first_name + ' ' + self.last_name
+  end
+
   def role? role_sym
     role_sym == :*
   end
@@ -24,20 +30,20 @@ module Cul::Omniauth::Users
 
   module ClassMethods
     def find_for_cas(token, resource=nil)
-      user = where(:login => token.uid).first
+      user = where(:uid => token.uid).first
       # create new user if necessary
       unless user
-        user = create(whitelist(:login => token.uid))
+        user = create(whitelist(:uid => token.uid))
         # can we add groups or roles here?
       end
       user
     end
 
     def find_for_saml(token, resource=nil)
-      user = where(:login => token.uid).first
+      user = where(:uid => token.uid).first
       # create new user if necessary
       unless user
-        user = create(whitelist(:login => token.uid))
+        user = create(whitelist(:uid => token.uid))
         # can we add groups or roles here?
       end
 
@@ -45,10 +51,10 @@ module Cul::Omniauth::Users
     end
 
     def find_for_wind(token, resource=nil)
-      user = where(:login => token.uid).first
+      user = where(:uid => token.uid).first
       # create new user if necessary
       unless user
-        user = create(whitelist(:login => token.uid))
+        user = create(whitelist(:uid => token.uid))
         # can we add groups or roles here?
       end
 
@@ -66,7 +72,7 @@ module Cul::Omniauth::Users
 
     private
     def whitelist(params=nil)
-      params.permit(:login,:uid,:provider,:email,:guest) if params.respond_to? :permit
+      params.permit(:uid,:provider,:email,:guest) if params.respond_to? :permit
       params || {}
     end
   end

data/lib/cul/omniauth/version.rb

@@ -1,5 +1,5 @@
 module Cul
   module Omniauth
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/omni_auth/strategies/saml.rb

@@ -43,7 +43,7 @@ module OmniAuth
       # @return [Hash] Extra user info
       option :fetch_raw_info,       Proc.new { Hash.new }
       # Make all the keys configurable with some defaults set here
-      option :uid_field, 'user'
+      option :uid_field, 'uid'
       option :name_key, 'name'
       option :email_key, 'email'
       option :nickname_key, 'user'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cul_omniauth
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - barmintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails