diff --git a/app/models/user.rb b/app/models/user.rb index 0c1d2e3..161f014 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -48,7 +48,7 @@ def from_omniauth(auth) debug: 'omniauth', uid: auth_extra['uid'], display_name: auth_extra['displayName'], - email: auth_extra['berkeleyEduOfficialEmail'], + email: auth_extra['berkeleyEduAlternateID'], galc_admin: galc_admin?(auth_extra['berkeleyEduIsMemberOf']) ) end diff --git a/docker-compose.yml b/docker-compose.yml index 2bc0d83..7f1865e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,8 @@ services: # platform: linux/amd64 depends_on: - db + environment: + - SERVE_TEST_UI=${SERVE_TEST_UI:-true} init: true networks: default: diff --git a/public/index.html b/public/index.html index e0057a2..88b7f78 100644 --- a/public/index.html +++ b/public/index.html @@ -1,28 +1,24 @@ - - + - Graphic Arts Loan Collection + (PREVIEW) Graphic Arts Loan Collection - - - - - - + + + - -
-
-
-
+ +
+
+
+
+
-
-
+ diff --git a/spec/data/cas/5551212.xml b/spec/data/cas/5551212.xml index 2578848..8ffb02c 100644 --- a/spec/data/cas/5551212.xml +++ b/spec/data/cas/5551212.xml @@ -6,7 +6,7 @@ 5551212 cn=edu:berkeley:official:all-accounts-people-ou,ou=campus groups,dc=berkeley,dc=edu STUDENT-TYPE-REGISTERED - jdoe@berkeley.test + jdoe-alt@berkeley.test diff --git a/spec/data/cas/5551215.xml b/spec/data/cas/5551215.xml index 7f4ff63..9f34b02 100644 --- a/spec/data/cas/5551215.xml +++ b/spec/data/cas/5551215.xml @@ -6,7 +6,7 @@ cn=edu:berkeley:official:all-accounts-people-ou,ou=campus groups,dc=berkeley,dc=edu cn=edu:berkeley:org:libr:galc:galc-admins,ou=campus groups,dc=berkeley,dc=edu EMPLOYEE-TYPE-STAFF - rroe@berkeley.test + rroe-alt@berkeley.test diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 46d2182..14af322 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -17,7 +17,7 @@ 'extra' => { 'uid' => '5551215', 'displayName' => 'Rachel Roe', - 'berkeleyEduOfficialEmail' => 'rroe@berkeley.test', + 'berkeleyEduAlternateID' => 'rroe-alt@berkeley.test', 'berkeleyEduIsMemberOf' => [ 'cn=edu:berkeley:org:libr:galc:galc-admins,ou=campus groups,dc=berkeley,dc=edu' ] @@ -30,7 +30,7 @@ 'extra' => { 'uid' => '5551212', 'displayName' => 'Jane Doe', - 'berkeleyEduOfficialEmail' => 'jdoe@berkeley.test', + 'berkeleyEduAlternateID' => 'jdoe-alt@berkeley.test', 'berkeleyEduIsMemberOf' => [ 'cn=edu:berkeley:official:all,ou=campus groups,dc=berkeley,dc=edu' ] @@ -44,7 +44,7 @@ expect(user).to be_galc_admin expect(user.uid).to eq('5551215') expect(user.display_name).to eq('Rachel Roe') - expect(user.email).to eq('rroe@berkeley.test') + expect(user.email).to eq('rroe-alt@berkeley.test') end it 'determines admin status based on CalGroups' do @@ -53,7 +53,7 @@ expect(user).not_to be_galc_admin expect(user.uid).to eq('5551212') expect(user.display_name).to eq('Jane Doe') - expect(user.email).to eq('jdoe@berkeley.test') + expect(user.email).to eq('jdoe-alt@berkeley.test') end end diff --git a/spec/requests/auth_spec.rb b/spec/requests/auth_spec.rb index 7fc6d39..9694139 100644 --- a/spec/requests/auth_spec.rb +++ b/spec/requests/auth_spec.rb @@ -41,6 +41,7 @@ describe 'GET /' do it 'returns 404 Not Found' do + allow(ENV).to receive(:[]).with('SERVE_TEST_UI').and_return(nil) get root_path expect(response).to have_http_status(:not_found) end @@ -97,7 +98,7 @@ def callback_url_from_cas_redirect(loc) expected_attrs = { uid: '5551215', display_name: 'Rachel Roe', - email: 'rroe@berkeley.test', + email: 'rroe-alt@berkeley.test', galc_admin: true }