biola_wcms_components 0.25.1 → 0.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f29ca233d7b9c38afa355bd466d740f5b2188ba
-  data.tar.gz: b771c11af719e321462160be334c0d2e89ed515e
+  metadata.gz: 08f057cd72ef31f9c6c6859de0446819808e19af
+  data.tar.gz: a847ab856b8a12763358d884a6e0a9de105b79b8
 SHA512:
-  metadata.gz: 924c1c3508a2f0362586af92b03f981d1cdaf9654689116bc60c86b5df97bd97912e883a3cc97864e647a0bb00271f916ba4f11de501e1d29d7ce8362f5db4a6
-  data.tar.gz: c809523c4be832ad7e473cc3e89afc35efaac121fcd96c77f8bfe05a4cbbb728d4577a03ea7eea47492122c52612c4b07acea56a946c2cf33c3a03c871370122
+  metadata.gz: 5c41ec02388c8bac7bb2a73fb215fb3cccf3cc97ae1f734a983c04758b9c71eb47bdd9ca44efae26e1eda258d3d8e8b555a3f07d72d390619466121f0817be3f
+  data.tar.gz: a8fad43b098232738fd2423c7019e88c6292c3150297389f5ffcabe893a89e05815081e1012a10e830ff3958bc4af91523bea8a739e81993707b281cbdb23556

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### Master (unreleased)
 
+### 0.25.2
+
+* Only update CAS attributes if they exist
+
 ### 0.25.1
 
 * Enforce extra attributes to be the right type

data/lib/biola_wcms_components/version.rb

@@ -1,3 +1,3 @@
 module BiolaWcmsComponents
-  VERSION = '0.25.1'.freeze
+  VERSION = '0.25.2'.freeze
 end

data/lib/components/cas_authentication.rb

@@ -27,13 +27,13 @@ class CasAuthentication
   attr_reader :session
 
   USER_CAS_MAP = {
-    biola_id: { employeeId: Integer },
-    first_name: :eduPersonNickname,
-    last_name: :sn,
-    email: :mail,
-    photo_url: :url,
-    entitlements: { eduPersonEntitlement: Array },
-    affiliations: { eduPersonAffiliation: Array }
+    employeeId: { biola_id: Integer },
+    eduPersonNickname: :first_name,
+    sn: :last_name,
+    mail: :email,
+    url: :photo_url,
+    eduPersonEntitlement: { entitlements: Array },
+    eduPersonAffiliation: { affiliations: Array }
   }.freeze
 
   def present?
@@ -57,9 +57,12 @@ class CasAuthentication
   end
 
   def update_extra_attributes!
-    USER_CAS_MAP.each do |k, v|
-      user[k] = attr_value(v, extra_attrs)
+    USER_CAS_MAP.each do |attr_key, opt|
+      next unless extra_attrs.key?(attr_key)
+      key, type = user_key_type(opt)
+      user[key] = attr_value(extra_attrs[attr_key], type)
     end
+
     user.save
   end
   alias create_user! update_extra_attributes!
@@ -76,17 +79,15 @@ class CasAuthentication
     @extra_attrs ||= (attrs[:extra_attributes] || {}).with_indifferent_access
   end
 
-  def attr_value(key, opts = {})
-    return String(opts[key]) if key.is_a? Symbol
-    attr_hash(key, opts)
+  def attr_value(value, type = nil)
+    return Array(value).compact if type == Array
+    return Integer(value) if type == Integer &&
+                             /\A\d+\z/ =~ value.to_s
+    String(value)
   end
 
-  def attr_hash(hash, opts = {})
-    return unless hash.is_a? Hash
-
-    key, type = hash.first
-    return Array(opts.try(:[], key)).compact if type == Array
-    return Integer(opts.try(:[], key)) if type == Integer &&
-                                          /\A\d+\z/ =~ opts[key].to_s
+  def user_key_type(opt)
+    return opt if opt.is_a? Symbol
+    opt.first
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biola_wcms_components
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.2
 platform: ruby
 authors:
 - Ryan Hall