biola_wcms_components 0.24.3 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d5793f35913b63f422a4cc5c0ecf4eca2caea6
-  data.tar.gz: 50d025d89a7a996204448d8c94a4b8b5c2b2bfcc
+  metadata.gz: 902d9f02e6d86c98d95c2fe8ca85cb2524d0d93b
+  data.tar.gz: 7e56291ccb737692f32719f21d0b06b9a4f0ea48
 SHA512:
-  metadata.gz: e0229026ebdd636d0c806cd621bff1708f52514dc5d10c2855a4613918b2c00edf02e655b7260ac17671117da98627fc8fdeef9222b749fa844d774e9b6ad740
-  data.tar.gz: 537fa554c4835f72f7b864c6c70d28513bc2042ca30e0cefaed53c2757caed6115e30b0a23814c84dc2dbaff479cf4d33785633fbe34759468f923b1c334458c
+  metadata.gz: a87e029c0bd2155300eda9945104c265975055cfd296da92d40854bac1dc88796e6878dbd227af2fec86e0ab08e25ed5a56697dc6f7355432dc058dc01743685
+  data.tar.gz: 4f9f252b0c983a5191920365d96fd483ec2b0f72ac0950bdbf047bc1f6af069ad909c2c8375f12bd73152eae644c4418f314f964c6f0b4e0ef9cb77c47d1a7fc

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ### Master (unreleased)
 
+### 0.25.0
+
+* Removes support for RubyCAS
+* Adds support for JavaCAS
+
 ### 0.24.3
 
 * Fix nav_link helper method. You have to pass '' for script_name option instead of nil.

data/app/controllers/wcms_application_controller.rb

@@ -41,7 +41,7 @@ class WcmsApplicationController < ActionController::Base
   end
 
   def authenticate!
-    authentication.perform or render_error_page(401)
+    authentication.perform || render_error_page(401)
   end
 
   def authentication
@@ -49,11 +49,13 @@ class WcmsApplicationController < ActionController::Base
   end
 
   def render_error_page(status)
-    render file: "#{Rails.root}/public/#{status}", formats: [:html], status: status, layout: false
+    render file: "#{Rails.root}/public/#{status}",
+           formats: [:html],
+           status: status,
+           layout: false
   end
 
   def user_not_authorized
     render_error_page(403)
   end
-
 end

data/lib/biola_wcms_components/version.rb

@@ -1,3 +1,3 @@
 module BiolaWcmsComponents
-  VERSION = "0.24.3"
+  VERSION = "0.25.0"
 end

data/lib/components/cas_authentication.rb

@@ -1,26 +1,34 @@
+##
+# Authenticate User and Create Session
 class CasAuthentication
   def initialize(session)
     @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
-    if username.present?
-      @user ||= User.find_or_initialize_by(username: username)
-    end
+    return unless username.present?
+    @user ||= User.find_or_initialize_by(username: username)
   end
 
   def perform
-    if authenticated?
-      true
-    elsif present?
-      if new_user?
-        if create_user!
-          authenticate!
-        end
-      elsif unauthenticated?
-        authenticate!
-        update_extra_attributes!
-      end
+    return true if authenticated?
+    return unless session['cas'].present?
+
+    if new_user?
+      authenticate! if create_user!
+    elsif unauthenticated?
+      authenticate!
+      update_extra_attributes!
     end
   end
 
@@ -33,7 +41,7 @@ class CasAuthentication
   end
 
   def new_user?
-    !!user.try(:new_record?)
+    user.try(:new_record?)
   end
 
   def authenticated?
@@ -49,39 +57,24 @@ class CasAuthentication
   end
 
   def update_extra_attributes!
-    user.biola_id     = extra_attr(:employeeId)            if extra_attr_has_key?(:employeeId)
-    user.first_name   = extra_attr(:eduPersonNickname)     if extra_attr_has_key?(:eduPersonNickname)
-    user.last_name    = extra_attr(:sn)                    if extra_attr_has_key?(:sn)
-    user.email        = extra_attr(:mail)                  if extra_attr_has_key?(:mail)
-    user.photo_url    = extra_attr(:url)                   if extra_attr_has_key?(:url)
-    user.entitlements = extra_attrs(:eduPersonEntitlement) if extra_attr_has_key?(:eduPersonEntitlement)
-    user.affiliations = extra_attrs(:eduPersonAffiliation) if extra_attr_has_key?(:eduPersonAffiliation)
+    USER_CAS_MAP.each do |k, v|
+      value = extra_attrs.fetch(v, nil)
+      user[k] = value unless value.blank?
+    end
+
     user.save
   end
-  alias :create_user! :update_extra_attributes!
+  alias create_user! update_extra_attributes!
 
   def username
-    session[:username] || attrs['user']
+    (session[:username] || attrs['user']).downcase
   end
 
   def attrs
     @attrs ||= (session['cas'] || {}).with_indifferent_access
   end
 
-  def extra_attributes
-    @extra_attributes ||= (attrs['extra_attributes'] || {}).with_indifferent_access
-  end
-
-  def extra_attr_has_key?(key)
-    extra_attributes.has_key? key
-  end
-
-  def extra_attr(key)
-    # Many values come back as arrays but don't really need to be
-    extra_attrs(key).first
-  end
-
-  def extra_attrs(key)
-    Array(extra_attributes[key]).map(&:to_s)
+  def extra_attrs
+    @extra_attrs ||= (attrs[:extra_attributes] || {}).with_indifferent_access
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biola_wcms_components
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0
 platform: ruby
 authors:
 - Ryan Hall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-rails-ap
@@ -310,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Reusable UX components for use in or WCMS projects