biola_wcms_components 0.25.0 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 902d9f02e6d86c98d95c2fe8ca85cb2524d0d93b
-  data.tar.gz: 7e56291ccb737692f32719f21d0b06b9a4f0ea48
+  metadata.gz: 5f29ca233d7b9c38afa355bd466d740f5b2188ba
+  data.tar.gz: b771c11af719e321462160be334c0d2e89ed515e
 SHA512:
-  metadata.gz: a87e029c0bd2155300eda9945104c265975055cfd296da92d40854bac1dc88796e6878dbd227af2fec86e0ab08e25ed5a56697dc6f7355432dc058dc01743685
-  data.tar.gz: 4f9f252b0c983a5191920365d96fd483ec2b0f72ac0950bdbf047bc1f6af069ad909c2c8375f12bd73152eae644c4418f314f964c6f0b4e0ef9cb77c47d1a7fc
+  metadata.gz: 924c1c3508a2f0362586af92b03f981d1cdaf9654689116bc60c86b5df97bd97912e883a3cc97864e647a0bb00271f916ba4f11de501e1d29d7ce8362f5db4a6
+  data.tar.gz: c809523c4be832ad7e473cc3e89afc35efaac121fcd96c77f8bfe05a4cbbb728d4577a03ea7eea47492122c52612c4b07acea56a946c2cf33c3a03c871370122

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### Master (unreleased)
 
+### 0.25.1
+
+* Enforce extra attributes to be the right type
+
 ### 0.25.0
 
 * Removes support for RubyCAS

data/lib/biola_wcms_components/version.rb

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

data/lib/components/cas_authentication.rb

@@ -5,16 +5,6 @@ class CasAuthentication
     @session = session
   end
 
-  USER_CAS_MAP = {
-    biola_id: :employeeId,
-    first_name: :eduPersonNickname,
-    last_name: :sn,
-    email: :mail,
-    photo_url: :url,
-    entitlements: :eduPersonEntitlement,
-    affiliations: :eduPersonAffiliation
-  }.freeze
-
   def user
     return unless username.present?
     @user ||= User.find_or_initialize_by(username: username)
@@ -36,6 +26,16 @@ 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 }
+  }.freeze
+
   def present?
     session['cas'].present?
   end
@@ -58,23 +58,35 @@ class CasAuthentication
 
   def update_extra_attributes!
     USER_CAS_MAP.each do |k, v|
-      value = extra_attrs.fetch(v, nil)
-      user[k] = value unless value.blank?
+      user[k] = attr_value(v, extra_attrs)
     end
-
     user.save
   end
   alias create_user! update_extra_attributes!
 
   def username
-    (session[:username] || attrs['user']).downcase
+    (session[:username] || attrs[:user]).downcase
   end
 
   def attrs
-    @attrs ||= (session['cas'] || {}).with_indifferent_access
+    @attrs ||= (session[:cas] || {}).with_indifferent_access
   end
 
   def extra_attrs
     @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)
+  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
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biola_wcms_components
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Ryan Hall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-rails-ap