cul_omniauth 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bbef3d6b587426dc435819aae1c1f6840f160b9
-  data.tar.gz: 26e3cf4f4f3aaca65e525ebf4914407f56d48b75
+  metadata.gz: 8d2dab9b5dfce51d5c97dd89c2fcfe267c597ae4
+  data.tar.gz: 2ad40620bef5ca4f8b2f5c7a593eca533348af74
 SHA512:
-  metadata.gz: 4a0f992990196939a48603a641e515942b0db1d78a1b424bc80f6b6a56705960a4d33a2899a3596c878ac4eaa29c59ece546e02426890431122a1348e5fc6ccc
-  data.tar.gz: 2f36f41843f1a679a851a012f6ed697be35ff986248ada13e2db7ac7bcf53d12c50045b19f27bd32f549b659a011a4b3fcde1e9cbe22a736c66c866ced4ed111
+  metadata.gz: ecc7bfc408966b58c0f29f05a556b48f3767e94ab69a1112bad82e22098bbc2b7f4db2879808f2ac99f1838a07d7bc223a25a12c6bfeb6f02987ec74153fa78d
+  data.tar.gz: 69664fda446bab1387bc0e86bbd94dae3340fe527e0c1e42be14942f675ffcf8fddd83bfc298fa01917b21b1395c229fed2c63b46cc573fa44d137711b173c9b

data/app/controllers/concerns/cul/omniauth/authorizing_controller.rb

@@ -1,6 +1,10 @@
 module Cul::Omniauth::AuthorizingController
   extend ActiveSupport::Concern
 
+  included do
+    devise_group :user, contains: [:user]
+  end
+
   def store_location
     session[:return_to] = "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
   end

data/app/controllers/concerns/cul/omniauth/callbacks.rb

@@ -1,5 +1,8 @@
 module Cul::Omniauth::Callbacks
   extend ActiveSupport::Concern
+
+  OMNIAUTH_REQUEST_KEY = 'omniauth.auth'.freeze
+
   def cas
     find_user('CAS')
   end
@@ -16,17 +19,22 @@ module Cul::Omniauth::Callbacks
 
   def find_user(auth_type)
     find_method = "find_for_#{auth_type.downcase}".to_sym
-    current_user ||= User.send(find_method,request.env["omniauth.auth"], current_user)
-    affils = ["#{request.env["omniauth.auth"].uid}:users.cul.columbia.edu"]
-    affils << "staff:cul.columbia.edu" if current_user.respond_to?(:cul_staff?) and  current_user.cul_staff?
-    affils += (request.env["omniauth.auth"].extra.affiliations || [])
-    affiliations(current_user,affils)
+    # omniauth puts a hash of information with string keys in the request env
+    oa_data = request.env.fetch(OMNIAUTH_REQUEST_KEY,{})
+    @current_user ||= User.send(find_method,oa_data, @current_user)
+    affils = ["#{oa_data['uid']}:users.cul.columbia.edu"]
+    affils << "staff:cul.columbia.edu" if @current_user.respond_to?(:cul_staff?) and @current_user.cul_staff?
+    affils += (oa_data.fetch('extra',{})['affiliations'] || [])
+    affiliations(@current_user,affils)
     session["devise.roles"] = affils
-    if current_user.persisted?
-      flash[:notice] = I18n.t "devise.omniauth_callbacks.success", :kind => auth_type
-      sign_in_and_redirect current_user, :event => :authentication
+    if @current_user && @current_user.persisted?
+      flash[:notice] = I18n.t "devise.omniauth_callbacks.success", kind: auth_type
+      sign_in_and_redirect @current_user, :event => :authentication
     else
-      session["devise.#{auth_type.downcase}_data"] = request.env["omniauth.auth"]
+      reason = @current_user ? 'no persisted user for id' : 'no uid in token'
+      Rails.logger.warn("#{reason} #{oa_data.inspect}")
+      flash[:notice] = I18n.t "devise.omniauth_callbacks.failure", kind: auth_type, reason: reason
+      session["devise.#{auth_type.downcase}_data"] = oa_data
       redirect_to root_url
     end
   end

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

@@ -29,44 +29,34 @@ module Cul::Omniauth::Users
   end
 
   module ClassMethods
-    def find_for_cas(token, resource=nil)
-      user = where(:uid => token.uid).first
+    # token is an omniauth hash
+    def find_for_provider(token, provider)
+      return nil unless token['uid']
+      props = {:uid => token['uid'].downcase, provider: provider.downcase}
+      user = where(props).first
       # create new user if necessary
       unless user
-        user = create(whitelist(:uid => token.uid))
+        user = create!(whitelist(props))
         # can we add groups or roles here?
       end
       user
     end
+    def find_for_cas(token, resource=nil)
+      find_for_provider(token, 'cas')
+    end
 
     def find_for_saml(token, resource=nil)
-      user = where(:uid => token.uid).first
-      # create new user if necessary
-      unless user
-        user = create(whitelist(:uid => token.uid))
-        # can we add groups or roles here?
-      end
-
-      user
+      find_for_provider(token, 'saml')
     end
 
     def find_for_wind(token, resource=nil)
-      user = where(:uid => token.uid).first
-      # create new user if necessary
-      unless user
-        user = create(whitelist(:uid => token.uid))
-        # can we add groups or roles here?
-      end
-
-      user
+      find_for_provider(token, 'wind')
     end
 
     def from_omniauth(auth)
-      where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
-        user.email = auth.info.email
+      where(provider: token['provider'].downcase, uid: token['uid'].downcase).first_or_create do |user|
+        user.email = token['info']['email']
         user.password = Devise.friendly_token[0,20]
-        user.name = auth.info.name   # assuming the user model has a name
-        user.image = auth.info.image # assuming the user model has an image
       end
     end
 

data/lib/cul/omniauth/version.rb

@@ -1,5 +1,5 @@
 module Cul
   module Omniauth
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   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, 'uid'
+      option :uid_field, 'user'
       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.1
+  version: 0.4.2
 platform: ruby
 authors:
 - barmintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails