AP-416: Use berkeleyEduAlternateID in CAS callback (#13)

danschmidt5189 · web-flow · commit 85e1e562b906 · 2025-08-20T15:02:19.000-07:00
Transitions user initialization from the CAS callback flow to the new `berkeleyEduAlternateID` attribute, away from the deprecated `berkeleyEduOfficialEmail`.
diff --git 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
@@ -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
@@ -1,28 +1,24 @@
 <!DOCTYPE html>
-<!--suppress HtmlUnknownTarget, CheckTagEmptyBody -->
-<!--suppress JSUnresolvedLibraryURL, CheckTagEmptyBody -->
+<!--suppress HtmlUnknownTarget -->
 <html lang="en">
 <head>
     <meta charset="UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>Graphic Arts Loan Collection</title>
+    <title>(PREVIEW) Graphic Arts Loan Collection</title>
     <link rel="stylesheet" media="all" href="https://use.fontawesome.com/releases/v5.13.1/css/all.css" />
     <link rel="stylesheet" media="all" href="https://use.fontawesome.com/releases/v5.13.1/css/v4-shims.css" />
     <link rel="stylesheet" media="all" href="https://use.typekit.net/ooq8hdx.css" />
-    <link rel="stylesheet" media="all" href="https://www.lib.berkeley.edu/sites/default/files/css/css_9m8-tA3IQf8ThlLQYTTZUyEweCvyR908Tg0XCbKYOfY.css" />
-    <link rel="stylesheet" media="all" href="https://www.lib.berkeley.edu/sites/default/files/css/css_yD1SqggTrO1FYCweGgM0u_33oDUc944jLYToRLwcGyg.css" />
-    <link rel="stylesheet" media="all" href="https://www.lib.berkeley.edu/sites/default/files/css/css_whd13hgPHsqBVOBFppmRAkBFQYuiBvZ8wd1eo7cTe-M.css" />
-
-    <link rel="stylesheet" media="all" href="https://unpkg.com/%40berkeleylibrary/galc-ui%40snapshot/dist/style.css" />
-    <script type="module" src="https://unpkg.com/%40berkeleylibrary/galc-ui%40snapshot/dist/galc-ui.umd.js"></script>
+    <link rel="stylesheet" media="all" href="https://www.lib.berkeley.edu/themes/custom/ucblibrary/css/style.css" />
+    <link rel="stylesheet" media="all" href="https://unpkg.com/@berkeleylibrary/galc-ui@snapshot/dist/style.css">
+    <script type="module" src="https://unpkg.com/%40berkeleylibrary/galc-ui%40snapshot"></script>
 </head>
-<body class="user-logged-in">
-<main>
-    <div class="layout-content">
-        <div class="region region-content">
-            <div id="galc-app" data-api-base-url="https://galc-api.ucblib.org" class="block-views"></div>
+<body>
+    <main>
+        <div class="layout-content">
+            <div class="region region-content">
+                <div id="galc-app" data-api-base-url="http://localhost:3000" class="block-views"></div>
+            </div>
         </div>
-    </div>
-</main>
+    </main>
 </body>
 </html>
diff --git a/spec/data/cas/5551212.xml b/spec/data/cas/5551212.xml
@@ -6,7 +6,7 @@
       <cas:uid>5551212</cas:uid>
       <cas:berkeleyEduIsMemberOf>cn=edu:berkeley:official:all-accounts-people-ou,ou=campus groups,dc=berkeley,dc=edu</cas:berkeleyEduIsMemberOf>
       <cas:berkeleyEduAffiliations>STUDENT-TYPE-REGISTERED</cas:berkeleyEduAffiliations>
-      <cas:berkeleyEduOfficialEmail>jdoe@berkeley.test</cas:berkeleyEduOfficialEmail>
+      <cas:berkeleyEduAlternateID>jdoe-alt@berkeley.test</cas:berkeleyEduAlternateID>
     </cas:attributes>
   </cas:authenticationSuccess>
 </cas:serviceResponse>
diff --git a/spec/data/cas/5551215.xml b/spec/data/cas/5551215.xml
@@ -6,7 +6,7 @@
             <cas:berkeleyEduIsMemberOf>cn=edu:berkeley:official:all-accounts-people-ou,ou=campus groups,dc=berkeley,dc=edu</cas:berkeleyEduIsMemberOf>
             <cas:berkeleyEduIsMemberOf>cn=edu:berkeley:org:libr:galc:galc-admins,ou=campus groups,dc=berkeley,dc=edu</cas:berkeleyEduIsMemberOf>
             <cas:berkeleyEduAffiliations>EMPLOYEE-TYPE-STAFF</cas:berkeleyEduAffiliations>
-            <cas:berkeleyEduOfficialEmail>rroe@berkeley.test</cas:berkeleyEduOfficialEmail>
+            <cas:berkeleyEduAlternateID>rroe-alt@berkeley.test</cas:berkeleyEduAlternateID>
         </cas:attributes>
     </cas:authenticationSuccess>
 </cas:serviceResponse>
diff --git 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
@@ -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
         }
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def from_omniauth(auth)`
`48`	`48`	`debug: 'omniauth',`
`49`	`49`	`uid: auth_extra['uid'],`
`50`	`50`	`display_name: auth_extra['displayName'],`
`51`		`- email: auth_extra['berkeleyEduOfficialEmail'],`
	`51`	`+ email: auth_extra['berkeleyEduAlternateID'],`
`52`	`52`	`galc_admin: galc_admin?(auth_extra['berkeleyEduIsMemberOf'])`
`53`	`53`	`)`
`54`	`54`	`end`