user: Use either capitalisation for email attr

It looks like CalNet may be sending *either* capitalisation for the
email attribute, as sometimes users have emails set and other times
they don't (even the same user).

Ref: AP-583

Author: awilfox

.idea/altmedia.iml

@@ -23,7 +23,7 @@ def from_omniauth(auth)
 
     private
 
-    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def auth_params_from(auth)
       auth_extra = auth['extra']
       cal_groups = auth_extra['berkeleyEduIsMemberOf'] || []
@@ -34,7 +34,7 @@ def auth_params_from(auth)
         cs_id: auth_extra['berkeleyEduCSID'],
         department_number: auth_extra['departmentNumber'],
         display_name: auth_extra['displayName'],
-        email: auth_extra['berkeleyEduAlternateID'],
+        email: auth_extra['berkeleyEduAlternateID'] || auth_extra['berkeleyEduAlternateId'],
         employee_id: auth_extra['employeeNumber'],
         given_name: auth_extra['givenName'],
         student_id: auth_extra['berkeleyEduStuID'],
@@ -45,7 +45,7 @@ def auth_params_from(auth)
         alma_admin: cal_groups.include?(ALMA_ADMIN_GROUP)
       }
     end
-    # rubocop:enable Metrics/MethodLength
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end
 
   # Affiliations per CalNet (attribute `berkeleyEduAffiliations` e.g.

app/models/user.rb

@@ -88,6 +88,38 @@
       expect(user.framework_admin).to eq(false)
       expect(user.alma_admin).to eq(false)
     end
+
+    it 'handles a user with old style email attribute' do
+      auth = {
+        'provider' => 'calnet',
+        'extra' => {
+          'berkeleyEduAffiliations' => 'expected affiliation',
+          'departmentNumber' => 'expected dept. number',
+          'displayName' => 'expected display name',
+          'berkeleyEduAlternateId' => 'expected email',
+          'employeeNumber' => 'expected employee ID',
+          'givenName' => 'expected given name',
+          'berkeleyEduStuID' => 'expected student ID',
+          'surname' => 'expected surname',
+          'berkeleyEduUCPathID' => 'expected UC Path ID',
+          'uid' => 'expected UID'
+        }
+      }
+
+      user = User.from_omniauth(auth)
+      expect(user.affiliations).to eq('expected affiliation')
+      expect(user.department_number).to eq('expected dept. number')
+      expect(user.display_name).to eq('expected display name')
+      expect(user.email).to eq('expected email')
+      expect(user.employee_id).to eq('expected employee ID')
+      expect(user.given_name).to eq('expected given name')
+      expect(user.student_id).to eq('expected student ID')
+      expect(user.surname).to eq('expected surname')
+      expect(user.ucpath_id).to eq('expected UC Path ID')
+      expect(user.uid).to eq('expected UID')
+      expect(user.framework_admin).to eq(false)
+      expect(user.alma_admin).to eq(false)
+    end
   end
 
   describe :authenticated? do