Skip to content

Commit 120463f

Browse files
committed
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
1 parent b6594c0 commit 120463f

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

app/models/user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def auth_params_from(auth)
3434
cs_id: auth_extra['berkeleyEduCSID'],
3535
department_number: auth_extra['departmentNumber'],
3636
display_name: auth_extra['displayName'],
37-
email: auth_extra['berkeleyEduAlternateId'],
37+
email: auth_extra['berkeleyEduAlternateID'],
3838
employee_id: auth_extra['employeeNumber'],
3939
given_name: auth_extra['givenName'],
4040
student_id: auth_extra['berkeleyEduStuID'],

spec/capybara_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module CapybaraHelper
1313

1414
class << self
1515
def configure!
16-
configurator = BerkeleyLibrary::Docker.running_in_container? ? GridConfigurator.new : LocalConfigurator.new
16+
configurator = GridConfigurator.new
1717
configurator.configure!
1818
end
1919

spec/data/calnet/3032640236.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ extra:
7272
- cn=edu:berkeley:app:calmessages:CM-Student-Staff,ou=campus groups,dc=berkeley,dc=edu
7373
- cn=edu:berkeley:official:students:Programs:Undergrad:16288U,ou=campus groups,dc=berkeley,dc=edu
7474
berkeleyEduAffiliations: EMPLOYEE-TYPE-STAFF
75-
berkeleyEduAlternateId: [email protected]
75+
berkeleyEduAlternateID: [email protected]
7676
longTermAuthenticationRequestTokenUsed: "false"

spec/data/calnet/5551212.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ extra:
2424
berkeleyEduIsMemberOf:
2525
- cn=edu:berkeley:official:all,ou=campus groups,dc=berkeley,dc=edu
2626
berkeleyEduAffiliations: EMPLOYEE-TYPE-STAFF
27-
berkeleyEduAlternateId: [email protected]
27+
berkeleyEduAlternateID: [email protected]
2828
longTermAuthenticationRequestTokenUsed: "false"

spec/data/calnet/5551213.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ extra:
2424
berkeleyEduIsMemberOf:
2525
- cn=edu:berkeley:official:all,ou=campus groups,dc=berkeley,dc=edu
2626
berkeleyEduAffiliations: EMPLOYEE-TYPE-STAFF
27-
berkeleyEduAlternateId: [email protected]
27+
berkeleyEduAlternateID: [email protected]
2828
longTermAuthenticationRequestTokenUsed: "false"

spec/data/calnet/7165.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ extra:
2424
berkeleyEduIsMemberOf:
2525
- cn=edu:berkeley:org:libr:framework:LIBR-framework-admins,ou=campus groups,dc=berkeley,dc=edu
2626
berkeleyEduAffiliations: EMPLOYEE-TYPE-STAFF
27-
berkeleyEduAlternateId: [email protected]
27+
berkeleyEduAlternateID: [email protected]
2828
longTermAuthenticationRequestTokenUsed: 'false'

spec/models/user_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
'berkeleyEduAffiliations' => 'expected affiliation',
3030
'departmentNumber' => 'expected dept. number',
3131
'displayName' => 'expected display name',
32-
'berkeleyEduAlternateId' => 'expected email',
32+
'berkeleyEduAlternateID' => 'expected email',
3333
'employeeNumber' => 'expected employee ID',
3434
'givenName' => 'expected given name',
3535
'berkeleyEduStuID' => 'expected student ID',
@@ -64,7 +64,7 @@
6464
'berkeleyEduAffiliations' => 'expected affiliation',
6565
'departmentNumber' => 'expected dept. number',
6666
'displayName' => 'expected display name',
67-
'berkeleyEduAlternateId' => 'expected email',
67+
'berkeleyEduAlternateID' => 'expected email',
6868
'employeeNumber' => 'expected employee ID',
6969
'givenName' => 'expected given name',
7070
'berkeleyEduStuID' => 'expected student ID',

0 commit comments

Comments
 (0)