Merge pull request #2591 from NationalSecurityAgency/t#2490/primevue-…

…oauth T#2490/primevue oauth
NationalSecurityAgency · Jun 19, 2024 · 6c989c3 · 6c989c3
2 parents 5b0fb2d + 48b862b
commit 6c989c3
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 29 deletions.
diff --git a/.github/workflows/build-and-test-oauth.yml b/.github/workflows/build-and-test-oauth.yml
@@ -25,6 +25,7 @@ on:
   schedule:
    - cron: '0 6 * * *'
   workflow_dispatch:
+  push:
 #  pull_request:
 #    paths-ignore:
 #      - 'README.md'
@@ -38,7 +39,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '20.11.0'
 
       - uses: actions/setup-java@v3
         with:
@@ -114,7 +115,7 @@ jobs:
 
     - uses: actions/setup-node@v3
       with:
-        node-version: '14'
+        node-version: '20.11.0'
 
     - uses: actions/setup-java@v3
       with:
@@ -140,7 +141,7 @@ jobs:
     - name: Check running containers
       run: docker ps -a
 
-    - name: Caputre Hydra Oauth Service logs
+    - name: Capture Hydra Oauth Service logs
       run: |
         mkdir -p ./e2e-tests/logs
         docker logs hydra > ./e2e-tests/logs/hydra.out &
@@ -162,15 +163,13 @@ jobs:
     - name: Start services for Cypress tests
       run: |
         cd e2e-tests
-        npm install
-        npm run backend:dropAllDBTables
         npm run cyServices:start:skills-service:oauth
-        npm run cyServices:start:client-display:oauth
         cd ..
 
     - name: Run Cypress tests
       run: |
         cd e2e-tests
+        npm install
         ../.github/scripts/runSubsetOfCypressTests.sh -t 20 -c ${{ matrix.container }}
         cd ..
       env:

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -23,7 +23,6 @@ on:
       - 'README.md'
       - '.github/workflows/build-and-test-postgres.yml'
       - '.github/workflows/publish-image-snapshot.yml'
-      - '.gitlab-ci.yml'
 
 jobs:
   build-skills-service-for-ui-tests:

diff --git a/dashboard-prime/src/components/access/Login.vue b/dashboard-prime/src/components/access/Login.vue
@@ -81,7 +81,7 @@ onBeforeMount(() => {
   }
 })
 const oAuth2Login = (registrationId) => {
-  // this.$store.dispatch('oAuth2Login', registrationId);
+  authState.oAuth2Login(registrationId)
 }
 </script>
 

diff --git a/dashboard-prime/src/stores/UseAuthState.js b/dashboard-prime/src/stores/UseAuthState.js
@@ -1,5 +1,5 @@
 import { computed, ref } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { defineStore } from 'pinia'
 import axios from 'axios'
 import { SkillsConfiguration } from '@skilltree/skills-client-js'
@@ -17,6 +17,7 @@ export const useAuthState = defineStore('authState', () => {
     const oAuthAuth = ref(false)
 
     const router = useRouter()
+    const route = useRoute()
     const appConfig = useAppConfig()
     const appInfoState = useAppInfoState()
 
@@ -95,8 +96,9 @@ export const useAuthState = defineStore('authState', () => {
     }
     const oAuth2Login = (oAuthId) => {
         setOauth2AuthUser()
-        const { redirect } = router.currentRoute.query
-        window.location = `/oauth2/authorization/${encodeURIComponent(oAuthId)}${redirect ? `?skillsRedirectUri=${redirect}` : ''}`
+        const redirect = route.query.redirect
+        const newLocation = `/oauth2/authorization/${encodeURIComponent(oAuthId)}${redirect ? `?skillsRedirectUri=${redirect}` : ''}`
+        window.location = newLocation
     }
     const restoreSessionIfAvailable = () => {
         setRestoringSession(true)

diff --git a/e2e-tests/cypress/e2e/approver/approver_conf_spec.js b/e2e-tests/cypress/e2e/approver/approver_conf_spec.js
@@ -122,7 +122,7 @@ describe('Approver Config Tests', () => {
 
             cy.get(`[data-cy="workloadCell_${user1}"] [data-cy="editApprovalBtn"]`).click()
             cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"]`).click();
-            cy.selectItem(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] #existingUserInput`, 'userA', true, true);
+            cy.selectItem(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] #existingUserInput`, 'userb', true, true);
             // cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] .vs__dropdown-option`).contains('userA').click({force: true});
             cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="addUserConfBtn"]`).click()
             cy.get(`[data-cy="workloadCell_${user1}"]`).contains('1 Specific User')

diff --git a/e2e-tests/cypress/e2e/approver/approver_conf_users_spec.js b/e2e-tests/cypress/e2e/approver/approver_conf_users_spec.js
@@ -63,7 +63,7 @@ describe('Approver Config Users Tests', () => {
         cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="addUserConfBtn"]`).should('be.disabled')
 
         // cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"]`).click();
-        cy.selectItem(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] #existingUserInput`, 'userA', true, true);
+        cy.selectItem(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] #existingUserInput`, 'usera', true, true);
         // cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] .p-dropdown-option`).contains('userA').click();
         cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="addUserConfBtn"]`).should('be.enabled')
 
@@ -79,7 +79,7 @@ describe('Approver Config Users Tests', () => {
         cy.get(`[data-cy="workloadCell_${user1}"]`).contains('1 Specific User')
 
         // cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"]`).click();
-        cy.selectItem(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] #existingUserInput`, 'userB', true, true);
+        cy.selectItem(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] #existingUserInput`, 'userb', true, true);
         // cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] .p-dropdown-option`).contains('userB').click();
         cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="addUserConfBtn"]`).should('be.enabled')
         cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="addUserConfBtn"]`).click()
@@ -200,15 +200,23 @@ describe('Approver Config Users Tests', () => {
         const headerSelector = `${tableSelector} thead tr th`;
         cy.get(headerSelector).contains('User').click();
 
-        cy.selectItem(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] #existingUserInput`, 'userE', true, true);
-        cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="addUserConfBtn"]`).click()
 
-        cy.validateTable(tableSelector, [
-            [{ colIndex: 0, value: 'userA' }],
-            [{ colIndex: 0, value: 'userB' }],
-            [{ colIndex: 0, value: 'userC' }],
-            [{ colIndex: 0, value: 'userD' }],
-            [{ colIndex: 0, value: 'userE' }],
-        ], 4);
+        cy.fixture('vars.json').then((vars) => {
+            const defaultUser = Cypress.env('oauthMode') ? 'foo' : vars.defaultUser
+            cy.selectItem(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] #existingUserInput`, defaultUser, true, true);
+            cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="addUserConfBtn"]`).click()
+
+            const compare = (a, b) => {
+                return a[0].value?.localeCompare(b[0].value)
+            }
+            const expected = [
+                [{ colIndex: 0, value: 'userA' }],
+                [{ colIndex: 0, value: 'userB' }],
+                [{ colIndex: 0, value: 'userC' }],
+                [{ colIndex: 0, value: 'userD' }],
+                [{ colIndex: 0, value: defaultUser }],
+            ].sort(compare)
+            cy.validateTable(tableSelector, expected, 4);
+        })
     })
 });
diff --git a/e2e-tests/cypress/e2e/inception/inception_skills_specs.js b/e2e-tests/cypress/e2e/inception/inception_skills_specs.js
@@ -466,7 +466,7 @@ describe('Inception Skills Tests', () => {
         cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="noUserConf"]`).should('exist')
 
         cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"]`).click();
-        cy.selectItem(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] #existingUserInput`, 'userA', true, true);
+        cy.selectItem(`[data-cy="expandedChild_${user1}"] [data-cy="userIdInput"] #existingUserInput`, 'usera', true, true);
         cy.get(`[data-cy="expandedChild_${user1}"] [data-cy="addUserConfBtn"]`).should('be.enabled')
 
         cy.assertInceptionPoints('Skills', 'ConfigureSelfApprovalWorkload', 0, false)

diff --git a/e2e-tests/cypress/e2e/projects_admin_management_spec.js b/e2e-tests/cypress/e2e/projects_admin_management_spec.js
@@ -335,10 +335,14 @@ describe('Projects Admin Management Tests', () => {
         cy.get('[data-pc-section="panel"] [data-pc-section="itemlabel"]').contains('Administrator').click();
         cy.wait('@addAdmin')
         cy.get(`${tableSelector} thead th`).contains('User').click();
+
+        const compare = (a, b) => {
+            return a[0].value?.localeCompare(b[0].value)
+        }
         cy.validateTable(tableSelector, [
             [{ colIndex: 0,  value: 'root@' }, { colIndex: 1,  value: 'Administrator' }],
             [{ colIndex: 0,  value: expectedUserName }, { colIndex: 1,  value: 'Administrator' }],
-        ], 5, true, null, false);
+        ].sort(compare), 5, true, null, false);
     });
 
     it('Existing users are not suggested', () => {

diff --git a/e2e-tests/package.json b/e2e-tests/package.json
@@ -50,7 +50,7 @@
     "backend:start:verifyEmail:ci": "mkdir -p ./logs && npm run backend:start:verifyEmail > ./logs/skills-service.out &",
     "backend:start:oauth:ci": "mkdir -p ./logs && npm run backend:start:oauth > ./logs/skills-service.out &",
     "backend:start:rabbitmq:ci": "mkdir -p ./logs && npm run backend:start:rabbitmq > ./logs/skills-service.out &",
-    "backend:waitToStart": "npx wait-on -t 160000 http://localhost:8080",
+    "backend:waitToStart": "echo \"Started waiting for skills-service at [$(date)]\" && npx wait-on -t 160000 http://localhost:8080",
     "backend:resetDb": "export PGPASSWORD=skillsPassword && psql -U postgres -h $npm_package_config_dbHost -d $npm_package_config_dbName -f ./cypress/db/reset.sql",
     "backend:clearDb": "export PGPASSWORD=skillsPassword && psql -U postgres -h $npm_package_config_dbHost -d $npm_package_config_dbName -f ./cypress/db/clear.sql",
     "backend:setupInviteOnly": "export PGPASSWORD=skillsPassword && psql -U postgres -h $npm_package_config_dbHost -d $npm_package_config_dbName -f ./cypress/db/createInviteOnlyProject.sql",

diff --git a/service/src/main/java/skills/storage/repos/UserAttrsRepo.groovy b/service/src/main/java/skills/storage/repos/UserAttrsRepo.groovy
@@ -43,7 +43,7 @@ interface UserAttrsRepo extends CrudRepository<UserAttrs, Integer> {
     @Query(value='''select attrs.email from user_attrs attrs where attrs.user_id = ?1''', nativeQuery = true)
     String findEmailByUserId(String userId)
 
-    @Query("SELECT DISTINCT(ua.userIdForDisplay) from UserAttrs ua where lower(ua.userIdForDisplay) LIKE %?1% order by ua.userIdForDisplay asc" )
+    @Query("SELECT DISTINCT(ua.userId) from UserAttrs ua where lower(ua.userId) LIKE %?1% order by ua.userId asc" )
     List<String> findDistinctUserIdForDisplay(String userUserIdForDisplayQuery, Pageable pageable)
 
 }
diff --git a/service/src/test/java/skills/intTests/SuggestUsersSpecs.groovy b/service/src/test/java/skills/intTests/SuggestUsersSpecs.groovy
@@ -101,12 +101,11 @@ class SuggestUsersSpecs extends DefaultIntSpec {
         // user by registering with dashboard
         createService(users[1])
 
-        String user1UserIdForDisplay = userAttrsRepo.findByUserIdIgnoreCase(users[1].toLowerCase()).userIdForDisplay
 
         when:
         def allUsers = skillsService.suggestClientUsers("user")
 
         then:
-        allUsers.userId == [users[0], user1UserIdForDisplay]
+        allUsers.userId == [users[0], users[1]].collect { it.toLowerCase() }.sort()
     }
 }