From ba0dbd0576016b30356ee0f1fb18a727dcbfc641 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 4 Feb 2026 22:39:37 -0600 Subject: [PATCH] models: Change capitalisation of email attribute CalNet is sending the email as `berkeleyEduAlternateID` instead of `berkeleyEduAlternateId` now. This was causing users to not have email addresses set, which caused various things to fail. Ref: AP-577 --- app/models/user.rb | 2 +- spec/data/calnet/3032640236.yml | 2 +- spec/data/calnet/5551212.yml | 2 +- spec/data/calnet/5551213.yml | 2 +- spec/data/calnet/7165.yml | 2 +- spec/models/user_spec.rb | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index fb870980..227b170c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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'], employee_id: auth_extra['employeeNumber'], given_name: auth_extra['givenName'], student_id: auth_extra['berkeleyEduStuID'], diff --git a/spec/data/calnet/3032640236.yml b/spec/data/calnet/3032640236.yml index 4ce78d3d..40ad1684 100644 --- a/spec/data/calnet/3032640236.yml +++ b/spec/data/calnet/3032640236.yml @@ -72,5 +72,5 @@ extra: - cn=edu:berkeley:app:calmessages:CM-Student-Staff,ou=campus groups,dc=berkeley,dc=edu - cn=edu:berkeley:official:students:Programs:Undergrad:16288U,ou=campus groups,dc=berkeley,dc=edu berkeleyEduAffiliations: EMPLOYEE-TYPE-STAFF - berkeleyEduAlternateId: jrdoe@berkeley.edu + berkeleyEduAlternateID: jrdoe@berkeley.edu longTermAuthenticationRequestTokenUsed: "false" diff --git a/spec/data/calnet/5551212.yml b/spec/data/calnet/5551212.yml index cd87238b..47f428e1 100644 --- a/spec/data/calnet/5551212.yml +++ b/spec/data/calnet/5551212.yml @@ -24,5 +24,5 @@ extra: berkeleyEduIsMemberOf: - cn=edu:berkeley:official:all,ou=campus groups,dc=berkeley,dc=edu berkeleyEduAffiliations: EMPLOYEE-TYPE-STAFF - berkeleyEduAlternateId: rjroe@berkeley.edu + berkeleyEduAlternateID: rjroe@berkeley.edu longTermAuthenticationRequestTokenUsed: "false" diff --git a/spec/data/calnet/5551213.yml b/spec/data/calnet/5551213.yml index f3b5ec00..d40897e5 100644 --- a/spec/data/calnet/5551213.yml +++ b/spec/data/calnet/5551213.yml @@ -24,5 +24,5 @@ extra: berkeleyEduIsMemberOf: - cn=edu:berkeley:official:all,ou=campus groups,dc=berkeley,dc=edu berkeleyEduAffiliations: EMPLOYEE-TYPE-STAFF - berkeleyEduAlternateId: jjonsdot@berkeley.edu + berkeleyEduAlternateID: jjonsdot@berkeley.edu longTermAuthenticationRequestTokenUsed: "false" diff --git a/spec/data/calnet/7165.yml b/spec/data/calnet/7165.yml index 507f5099..0202c2a4 100644 --- a/spec/data/calnet/7165.yml +++ b/spec/data/calnet/7165.yml @@ -24,5 +24,5 @@ extra: berkeleyEduIsMemberOf: - cn=edu:berkeley:org:libr:framework:LIBR-framework-admins,ou=campus groups,dc=berkeley,dc=edu berkeleyEduAffiliations: EMPLOYEE-TYPE-STAFF - berkeleyEduAlternateId: fake.lisa@berkeley.edu + berkeleyEduAlternateID: fake.lisa@berkeley.edu longTermAuthenticationRequestTokenUsed: 'false' diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 985b0936..058c343d 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -29,7 +29,7 @@ 'berkeleyEduAffiliations' => 'expected affiliation', 'departmentNumber' => 'expected dept. number', 'displayName' => 'expected display name', - 'berkeleyEduAlternateId' => 'expected email', + 'berkeleyEduAlternateID' => 'expected email', 'employeeNumber' => 'expected employee ID', 'givenName' => 'expected given name', 'berkeleyEduStuID' => 'expected student ID', @@ -64,7 +64,7 @@ 'berkeleyEduAffiliations' => 'expected affiliation', 'departmentNumber' => 'expected dept. number', 'displayName' => 'expected display name', - 'berkeleyEduAlternateId' => 'expected email', + 'berkeleyEduAlternateID' => 'expected email', 'employeeNumber' => 'expected employee ID', 'givenName' => 'expected given name', 'berkeleyEduStuID' => 'expected student ID',