login-as: Do not assume everyone has shibbolethId

UniversityOfHelsinkiCS · Mar 20, 2024 · 3544286 · 3544286
1 parent 83eccb9
commit 3544286
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/backend/src/services/PersonService.js b/backend/src/services/PersonService.js
@@ -190,10 +190,12 @@ export const searchPersons = async (userQuery) => {
     if (userQuery.split(' ').length === 2) {
         const firstName = userQuery.split(' ')[0]
         const lastName = userQuery.split(' ')[1]
-        query = qb => qb.where('firstname', 'iLIKE', `%${firstName}%`)
+        query = qb => qb.whereNotNull('shibbolethId')
+            .andWhere('firstname', 'iLIKE', `%${firstName}%`)
             .andWhere('lastname', 'iLIKE', `%${lastName}%`)
     } else {
-        query = qb => qb.where('email', 'iLIKE', `%${userQuery}%`)
+        query = qb => qb.whereNotNull('shibbolethId')
+            .andWhere('email', 'iLIKE', `%${userQuery}%`)
             .orWhere('firstname', 'iLIKE', `%${userQuery}%`)
             .orWhere('lastname', 'iLIKE', `%${userQuery}%`)
     }

diff --git a/frontend/src/containers/Person/components/PersonSwitcher.js b/frontend/src/containers/Person/components/PersonSwitcher.js
@@ -40,7 +40,7 @@ class PersonSwitcher extends Component {
 
                 <ul style={{ padding: 10, margin: 0 }}>
                     {this.state.persons.map(person => (
-                        <div key={person.shibbolethId}>
+                        <div key={person.shibbolethId || person.personId}>
                             <button
                                 style={{ margin: 5 }}
                                 className="ui white button"