Merge pull request #288 from NationalSecurityAgency/remove_scheuduled_ci_actions

updated skills-client CI actions to no longer run on a schedule

.github/workflows/build-and-test-expired-token.yml

@@ -7,8 +7,11 @@ env:
   JAVA_VERSION: 25
 
 on:
-  schedule:
-    - cron: '0 8 * * *'
+  push:
+    paths-ignore:
+      - 'README.md'
+      - .github/workflows/skills-service-backward-compat.yml
+      - .github/workflows/client-libs-backward-compat.yml
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel

.github/workflows/build-and-test-oauth.yml

@@ -12,11 +12,6 @@ on:
       - 'README.md'
       - .github/workflows/skills-service-backward-compat.yml
       - .github/workflows/client-libs-backward-compat.yml
-  pull_request:
-    paths-ignore:
-      - 'README.md'
-      - .github/workflows/skills-service-backward-compat.yml
-      - .github/workflows/client-libs-backward-compat.yml
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel

.github/workflows/build-and-test.yml

@@ -12,11 +12,6 @@ on:
       - 'README.md'
       - .github/workflows/skills-service-backward-compat.yml
       - .github/workflows/client-libs-backward-compat.yml
-  pull_request:
-    paths-ignore:
-      - 'README.md'
-      - .github/workflows/skills-service-backward-compat.yml
-      - .github/workflows/client-libs-backward-compat.yml
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel

.github/workflows/client-libs-backwards-compat.yml

@@ -10,11 +10,6 @@ on:
       - 'README.md'
       - .github/workflows/skills-service-backward-compat.yml
       - .github/workflows/client-libs-backward-compat.yml
-  pull_request:
-    paths-ignore:
-      - 'README.md'
-      - .github/workflows/skills-service-backward-compat.yml
-      - .github/workflows/client-libs-backward-compat.yml
   workflow_dispatch:
 
 jobs:

.github/workflows/skills-service-backward-compat.yml

@@ -13,8 +13,6 @@ on:
   pull_request:
     paths-ignore:
       - 'README.md'
-  schedule:
-    - cron: '0 6 * * *'
   workflow_dispatch:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
@@ -85,7 +83,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        skillsJsVersion: [ '3.1.1', '3.2.0', '3.3.0', '3.3.1', '3.4.0', '3.4.1', '3.5.0']
+        skillsJsVersion: [ '3.5.0', '3.6.0', '3.6.1', '3.6.2', '3.6.3']
 
     services:
       postgres:

skills-client-integration/pom.xml

@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.16</version>
+        <version>4.1.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>skills</groupId>
     <artifactId>skills-client-integration</artifactId>
     <packaging>pom</packaging>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.6.4-SNAPSHOT</version>
 
     <licenses>
         <license>
@@ -31,10 +31,6 @@
     <properties>
         <!--suppress UnresolvedMavenProperty -->
         <nexusServer>${nexus.url}</nexusServer>
-        <frontend-maven-plugin.version>1.10.3</frontend-maven-plugin.version>
-
-        <!--  TODO: Temporary override spring boot versions, remove once spring boot upgrades these versions -->
-        <commons-lang3.version>3.19.0</commons-lang3.version>
     </properties>
 
 </project>

skills-client-integration/skills-int-client-js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "skills-int-client-js",
-    "version": "3.6.3",
+    "version": "3.6.4",
     "license": "Apache-2.0",
     "description": "SkillTree Client Lib Integration Tests - Native JS",
     "main": "index.js",
@@ -16,13 +16,13 @@
     },
     "author": "SkillTree Team",
     "dependencies": {
-        "@skilltree/skills-client-js": "3.6.3",
-        "axios": "1.17.0",
+        "@skilltree/skills-client-js": "3.6.4",
+        "axios": "1.20.0",
         "bootstrap": "5.3.8",
         "jquery": "4.0.0"
     },
     "devDependencies": {
-        "fs-extra": "11.3.5",
+        "fs-extra": "11.4.0",
         "license-check-and-add": "4.0.5",
         "license-checker": "25.0.1",
         "live-server": "1.2.2"

skills-client-integration/skills-int-client-js/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>skills</groupId>
         <artifactId>skills-client-integration</artifactId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.6.4-SNAPSHOT</version>
     </parent>
     <artifactId>skills-int-client-js</artifactId>
 

skills-client-integration/skills-int-e2e-test/cypress/e2e/global-event_specs.js

@@ -20,6 +20,8 @@ const homePage = '/native/index.html'
 
 context("Global Events Tests", () => {
 
+    const level1CompleteRegex = /"completed"\s*:\s*\[(?=[\s\S]*?\{[^{}]*?(?:"type"\s*:\s*"Overall"[^{}]*?"level"\s*:\s*1|"level"\s*:\s*1[^{}]*?"type"\s*:\s*"Overall")[^{}]*?\})[\s\S]*?\]/;
+
     it("global event show correct results", () => {
         cy.createDefaultProject();
 
@@ -34,7 +36,7 @@ context("Global Events Tests", () => {
         cy.get('pre[data-cy=globalEventResult]').contains('"skillId": "IronMan"')
         cy.get('pre[data-cy=globalEventResult]').contains('"pointsEarned": 50')
         cy.get('pre[data-cy=globalEventResult]').contains('"skillApplied": true')
-        cy.get('pre[data-cy=globalEventResult]').contains(/completed": [[][^]*"type": "Overall",[^]\s*"level": 1/)
+        cy.get('pre[data-cy=globalEventResult]').contains(level1CompleteRegex)
     });
     it("global event show correct results (skills reported directly to backend endpoint)", () => {
         cy.createDefaultProject();
@@ -46,7 +48,7 @@ context("Global Events Tests", () => {
         cy.get('pre[data-cy=globalEventResult]').contains('"skillId": "IronMan"')
         cy.get('pre[data-cy=globalEventResult]').contains('"pointsEarned": 50')
         cy.get('pre[data-cy=globalEventResult]').contains('"skillApplied": true')
-        cy.get('pre[data-cy=globalEventResult]').contains(/completed": [[][^]*"type": "Overall",[^]\s*"level": 1/)
+        cy.get('pre[data-cy=globalEventResult]').contains(level1CompleteRegex)
     });
 
     it('global event does not update when skill reported for a different project', () => {

skills-client-integration/skills-int-e2e-test/cypress/e2e/timeout.specs.js

@@ -18,6 +18,8 @@ const homePage = '/native/index.html'
 
 context("Token timeout JS Tests", () => {
 
+  const level1CompleteRegex = /"completed"\s*:\s*\[(?=[\s\S]*?\{[^{}]*?(?:"type"\s*:\s*"Overall"[^{}]*?"level"\s*:\s*1|"level"\s*:\s*1[^{}]*?"type"\s*:\s*"Overall")[^{}]*?\})[\s\S]*?\]/;
+
   if (Cypress.env('timeout') === true || Cypress.env('timeout') === 'true') {
     it("report skill with expired token, retry checker will resend with new token", () => {
       cy.createDefaultProject();
@@ -28,14 +30,17 @@ context("Token timeout JS Tests", () => {
       cy.wait(71000)  // wait 71 seconds to ensure the token has expired
       cy.get('[data-cy="exampleDirectiveClickEventButton"]').click();
 
-      cy.get('pre[data-cy=globalEventResult]').should('be.empty');
+      // should be empty string or empty JSON object
+      cy.get('pre[data-cy=globalEventResult]')
+        .invoke('text')
+        .should('match', /^\s*$|^\s*\{\s*\}\s*$/);
 
       cy.wait("@getToken", { timeout: 60000 }); // wait ~ another 50 seconds to all for the RetryChecker to resubmit
 
       cy.get('pre[data-cy=globalEventResult]').contains('"skillId": "IronMan"')
       cy.get('pre[data-cy=globalEventResult]').contains('"pointsEarned": 50')
       cy.get('pre[data-cy=globalEventResult]').contains('"skillApplied": true')
-      cy.get('pre[data-cy=globalEventResult]').contains(/completed": [[][^]*"type": "Overall",[^]\s*"level": 1/)
+      cy.get('pre[data-cy=globalEventResult]').contains(level1CompleteRegex)
     });
 
     it('skill display - navigate after token expires', () => {

skills-client-integration/skills-int-e2e-test/package.json

@@ -52,8 +52,8 @@
     "license-check-and-add": "4.0.5",
     "license-checker": "25.0.1",
     "pdf-parse": "1.1.1",
-    "semver": "7.7.2",
-    "wait-on": "8.0.3",
+    "semver": "7.8.5",
+    "wait-on": "9.1.0",
     "wait-port": "1.1.0"
   }
 }

skills-client-integration/skills-int-e2e-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>skills</groupId>
         <artifactId>skills-client-integration</artifactId>
-        <version>3.6.3-SNAPSHOT</version>
+        <version>3.6.4-SNAPSHOT</version>
     </parent>
     <artifactId>skills-int-e2e-test</artifactId>
     <description>End to End tests for Skills client libs using skills-int-service app</description>

skills-client-integration/skills-int-e2e-test/serverConfigs/backend_application.properties

@@ -14,7 +14,6 @@
 spring.datasource.username = postgres
 spring.datasource.url = jdbc:postgresql://localhost:5432/skills
 spring.datasource.password = skillsPassword
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
 
 skills.config.ui.userCommunityUserTagKey=dragons
 skills.config.ui.userCommunityUserTagValue=DivineDragon

skills-client-integration/skills-int-service/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>skills</groupId>
 		<artifactId>skills-client-integration</artifactId>
-		<version>3.6.3-SNAPSHOT</version>
+		<version>3.6.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>skills-int-service</artifactId>
 	<description>SkillTree Client Lib Integration Tests</description>
@@ -23,6 +23,10 @@
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-restclient</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

skills-client-integration/skills-int-service/src/main/java/skills/example/Controller.java

@@ -15,10 +15,8 @@
  */
 package skills.example;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.boot.restclient.RestTemplateBuilder;
 import org.springframework.http.*;
 import org.springframework.http.client.support.BasicAuthenticationInterceptor;
 import org.springframework.util.LinkedMultiValueMap;
@@ -27,6 +25,8 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import skills.example.SkillsExampleApplication.SkillsConfig;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ObjectMapper;
 
 import java.util.ArrayList;
 import java.util.Arrays;

skills-client-integration/skills-int-service/src/main/java/skills/example/SecurityRestTemplateCustomizer.java

@@ -23,11 +23,9 @@ import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
 import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
 import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
 import org.apache.hc.core5.http.config.RegistryBuilder;
-import org.apache.hc.core5.ssl.SSLContextBuilder;
 import org.apache.hc.core5.ssl.SSLContexts;
-import org.apache.hc.core5.ssl.TrustStrategy;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.client.RestTemplateCustomizer;
+import org.springframework.boot.restclient.RestTemplateCustomizer;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;

skills-client-integration/skills-int-service/src/main/java/skills/example/filters/VueEntryPointFilter.java

@@ -18,15 +18,18 @@ package skills.example.filters;
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 
 @Component
-@Order(SecurityProperties.DEFAULT_FILTER_ORDER-1)
+@Order(VueEntryPointFilter.BEFORE_SECURITY_FILTER_ORDER)
 public class VueEntryPointFilter implements Filter {
+
+    // -100 (Default Security Order) - 1
+    public static final int BEFORE_SECURITY_FILTER_ORDER = -101;
+
     @Autowired
     private VueEntryPointFilterUtils vueEntryPointFilterUtils;
 

skills-client-js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@skilltree/skills-client-js",
-    "version": "3.6.3",
+    "version": "3.6.4",
     "license": "Apache-2.0",
     "description": "SkillTree Client Lib - Native JS Lib",
     "main": "dist/skills-client-js.umd.min.js",
@@ -30,33 +30,33 @@
     "author": "SkillTree Team",
     "devDependencies": {
         "@babel/cli": "7.28.6",
-        "@babel/core": "7.29.0",
+        "@babel/core": "7.29.6",
         "@babel/plugin-transform-runtime": "7.29.0",
         "@babel/polyfill": "7.12.1",
         "@babel/preset-env": "7.29.5",
         "@babel/runtime": "7.29.2",
         "@eslint/js": "10.0.1",
-        "@rollup/plugin-babel": "7.0.0",
-        "@rollup/plugin-commonjs": "29.0.2",
+        "@rollup/plugin-babel": "7.1.0",
+        "@rollup/plugin-commonjs": "29.0.3",
         "@rollup/plugin-json": "6.1.0",
         "@rollup/plugin-node-resolve": "16.0.3",
         "@rollup/plugin-replace": "6.0.3",
         "@rollup/plugin-terser": "1.0.0",
         "axios-mock-adapter": "2.1.0",
-        "babel-jest": "30.4.1",
-        "eslint": "10.3.0",
-        "globals": "17.6.0",
-        "jest": "30.4.2",
-        "jest-environment-jsdom": "30.4.1",
+        "babel-jest": "30.5.1",
+        "eslint": "10.10.0",
+        "globals": "17.12.0",
+        "jest": "30.5.1",
+        "jest-environment-jsdom": "30.5.1",
         "license-check-and-add": "4.0.5",
         "license-checker": "25.0.1",
         "regenerator-runtime": "0.14.1",
-        "rollup": "4.60.3",
+        "rollup": "4.63.3",
         "xhr-mock": "2.5.1"
     },
     "dependencies": {
         "@stomp/stompjs": "7.3.0",
-        "axios": "1.17.0",
+        "axios": "1.20.0",
         "js-logger": "1.6.1",
         "postmate": "1.5.2",
         "sockjs-client": "1.6.1"

skills-client-js/src/SkillsService.js

@@ -119,7 +119,7 @@ export default {
           if (xhr.status !== 200) {
             if (isOAuthMode && oauthRedirect && xhr.status === 401) {
               // if we get 401 and we are using OAuth, then redirect to the OAuth Provider
-              const oauthAuthenticator = `${authenticator}?skillsRedirectUri=${window.location}`;
+              const oauthAuthenticator = `${authenticator}?skillsRedirectUri=${encodeURIComponent(window.location.href)}`;
               log.info(`SkillsClient::SkillService::unable to get oAuth token, navigating to [${oauthAuthenticator}]`);
               this.assignWindowLocation(oauthAuthenticator);
               resolve();

skills-client-js/src/display/SkillsDisplayJS.js

@@ -28,7 +28,7 @@ const markedForDestruction = [];
 export default class SkillsDisplayJS {
   constructor({ options, theme, version, handleRouteChanged, userId } = {}) {
     log.debug(`SkillsClient::SkillsDisplayJS::Constructing with options [${options}], theme [${theme}], version [${version}], userId [${userId}]`);
-    this._options = { ...{ }, ...options };
+    this._options = { parentPath: window.location.pathname, ...options };
     this._theme = theme;
     this._version = version;
     this._handleRouteChanged = handleRouteChanged;

skills-client-js/test/SkillsService.test.js

@@ -45,7 +45,23 @@ describe('OAuth auto redirect tests', () => {
     await SkillsService.getAuthenticationToken(authEndpoint, mockServiceUrl, mockProjectId, true);
 
     expect(SkillsService.assignWindowLocation).toHaveBeenCalledTimes(1)
-    expect(SkillsService.assignWindowLocation).toHaveBeenCalledWith(`${authEndpoint}?skillsRedirectUri=http://localhost/`)
+    expect(SkillsService.assignWindowLocation).toHaveBeenCalledWith(`${authEndpoint}?skillsRedirectUri=${encodeURIComponent('http://localhost/')}`)
+  });
+
+  it('oauth redirect encodes the current location so it cannot add query parameters', async () => {
+    const oauthTokenEndpoint = `${mockServiceUrl}/api/projects/${mockProjectId}/token`;
+    mock.get(oauthTokenEndpoint, (req, res) => res.status(401));
+
+    window.history.pushState({}, '', '/page?a=1&skillsRedirectUri=http://evil.example.com/');
+    const injected = window.location.href;
+
+    await SkillsService.getAuthenticationToken(authEndpoint, mockServiceUrl, mockProjectId, true);
+
+    const [redirectedTo] = SkillsService.assignWindowLocation.mock.calls[0];
+    expect(redirectedTo).toBe(`${authEndpoint}?skillsRedirectUri=${encodeURIComponent(injected)}`);
+    // the injected separators must not survive as separators
+    expect(redirectedTo.split('?')).toHaveLength(2);
+    expect(redirectedTo).not.toContain('&skillsRedirectUri=');
   });
 
   it('oauth does not auto redirect when oauthRedirect=false', async () => {

skills-client-js/test/display/SkillsDisplayJS.test.js

@@ -482,6 +482,7 @@ describe('SkillsDisplayJS', () => {
           isSummaryOnly: false,
           projectId: mockProjectId,
           serviceUrl: mockServiceUrl,
+          parentPath: '/',
         };
         mockVersion = `${Math.random()}`;
 
@@ -497,6 +498,7 @@ describe('SkillsDisplayJS', () => {
           authenticator: 'pki',
           serviceUrl: mockServiceUrl,
           projectId: mockProjectId,
+          parentPath: '/'
         };
 
         const client = new SkillsDisplayJS({
@@ -538,6 +540,7 @@ describe('SkillsDisplayJS', () => {
           authenticator: mockAuthenticator,
           serviceUrl: mockServiceUrl,
           projectId: mockProjectId,
+          parentPath: '/'
         };
         const client = new SkillsDisplayJS({
           options,
@@ -578,6 +581,7 @@ describe('SkillsDisplayJS', () => {
           serviceUrl: mockServiceUrl,
           projectId: mockProjectId,
           internalBackButton: false,
+          parentPath: '/'
         };
         const client = new SkillsDisplayJS({
           options,
@@ -618,6 +622,7 @@ describe('SkillsDisplayJS', () => {
           serviceUrl: mockServiceUrl,
           projectId: mockProjectId,
           internalBackButton: true,
+          parentPath: '/'
         };
         const client = new SkillsDisplayJS({
           options,
@@ -657,6 +662,7 @@ describe('SkillsDisplayJS', () => {
           authenticator: mockAuthenticator,
           serviceUrl: mockServiceUrl,
           projectId: mockProjectId,
+          parentPath: '/'
         };
         const client = new SkillsDisplayJS({
           options,
@@ -695,7 +701,7 @@ describe('SkillsDisplayJS', () => {
   describe('construction', () => {
     describe('options', () => {
       it('accepts options in the constructor', () => {
-        const mockOptions = { authenticator: 'option' };
+        const mockOptions = { authenticator: 'option', parentPath: 'non-default/' };
         const client = new SkillsDisplayJS({
           options: mockOptions,
         });
@@ -704,14 +710,14 @@ describe('SkillsDisplayJS', () => {
 
       it('supports null or undefined being passed', () => {
         let client = new SkillsDisplayJS({ options: null });
-        expect(client.options).toEqual({});
+        expect(client.options).toEqual({ parentPath: '/' });
         client = new SkillsDisplayJS({ options: undefined });
-        expect(client.options).toEqual({});
+        expect(client.options).toEqual({ parentPath: '/'} );
       });
 
-      it('supports empty constructor', () => {
+      it('supports empty constructor, defaults parentPath to window.location.pathname', () => {
         const client = new SkillsDisplayJS();
-        expect(client.options).toEqual({});
+        expect(client.options).toEqual({ parentPath: '/'} );
       });
 
       it('accepts valid options', () => {