Merge branch 'master' into feature/authentication-authority-validation

nickevansuk · web-flow · commit dffc39345908 · 2025-01-31T03:44:58.000Z
diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml
@@ -1,8 +1,8 @@
 name: Code Tests
 
 on:
-  # This does not run on push to master, as tests will instead be run there as
-  # part of the test-and-publish workflow.
+  push:
+    branches: [ master ]
   pull_request:
     branches: [ master ]
 
@@ -20,5 +20,9 @@ jobs:
         node-version: 18.17.1
     - name: Install OpenActive Test Suite
       run: npm install
+    - name: Check licenses of all dependencies are at least permissive
+      run: |
+        npx npm-reflect install --test
+        for dir in ./packages/*; do (cd "$dir" && npx npm-reflect install --test); done
     - name: Run Checks on the Code (Test the Tests!)
       run: npm test
diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
@@ -91,27 +91,33 @@ jobs:
         npm install
       working-directory: tests
 
-    - name: Install specific version of data-models ${{ inputs.data-models_ref }}
+    - name: Broker microservice - Install specific version of data-models ${{ inputs.data-models_ref }}
       if: ${{ inputs.data-models_ref }}
-      run: |
-        cd packages/openactive-broker-microservice && npm install github:openactive/data-models#${{ inputs.data-models_ref }}
-        cd packages/openactive-integration-tests && npm install github:openactive/data-models#${{ inputs.data-models_ref }}
-      working-directory: tests
+      working-directory: tests/packages/openactive-broker-microservice
+      run: npm install github:openactive/data-models#${{ inputs.data-models_ref }}
 
-    - name: Install specific version of data-model-validator ${{ inputs.data-model-validator_ref }}
+    - name: Broker microservice - Install specific version of data-model-validator ${{ inputs.data-model-validator_ref }}
       if: ${{ inputs.data-model-validator_ref }}
-      run: |
-        cd packages/openactive-broker-microservice && npm install github:openactive/data-model-validator#${{ inputs.data-model-validator_ref }}
-        cd packages/openactive-integration-tests && npm install github:openactive/data-model-validator#${{ inputs.data-model-validator_ref }}
-      working-directory: tests
+      working-directory: tests/packages/openactive-broker-microservice
+      run: npm install github:openactive/data-model-validator#${{ inputs.data-model-validator_ref }}
 
-    - name: Install specific version of rpde-validator ${{ inputs.rpde-validator_ref }}
+    - name: Broker microservice - Install specific version of rpde-validator ${{ inputs.rpde-validator_ref }}
       if: ${{ inputs.rpde-validator_ref }}
-      run: |
-        cd packages/openactive-broker-microservice && npm install github:openactive/rpde-validator#${{ inputs.rpde-validator_ref }}
-      working-directory: tests
+      working-directory: tests/packages/openactive-broker-microservice
+      run: npm install github:openactive/rpde-validator#${{ inputs.rpde-validator_ref }}
 
+    - name: Integration tests - Install specific version of data-models ${{ inputs.data-models_ref }}
+      if: ${{ inputs.data-models_ref }}
+      working-directory: tests/packages/openactive-integration-tests  
+      run: npm install github:openactive/data-models#${{ inputs.data-models_ref }}
+  
+    - name: Integration tests - Install specific version of data-model-validator ${{ inputs.data-model-validator_ref }}
+      if: ${{ inputs.data-model-validator_ref }}
+      working-directory: tests/packages/openactive-integration-tests
+      run: npm install github:openactive/data-model-validator#${{ inputs.data-model-validator_ref }}
+  
     - name: Run Checks on the Code (Test the Tests!)
+      if: ${{ inputs.data-models_ref || inputs.data-model-validator_ref || inputs.rpde-validator_ref }}
       run: npm test
       working-directory: tests
 
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "description": "OpenActive Test Suite",
   "private": true,
   "main": "start.js",
+  "license": "MIT",
   "scripts": {
     "start": "node start.js",
     "debug": "node --inspect start.js -- --runInBand",
@@ -57,5 +58,12 @@
     "hooks": {
       "pre-commit": "npm run gen-and-git-add-everything"
     }
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }
diff --git a/packages/openactive-broker-microservice/package.json b/packages/openactive-broker-microservice/package.json
@@ -76,5 +76,12 @@
   },
   "engines": {
     "node": "18.17.1"
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }
diff --git a/packages/openactive-integration-tests/package.json b/packages/openactive-integration-tests/package.json
@@ -78,5 +78,12 @@
   },
   "engines": {
     "node": "18.17.1"
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }
diff --git a/packages/openactive-openid-browser-automation/package.json b/packages/openactive-openid-browser-automation/package.json
@@ -32,5 +32,12 @@
   },
   "engines": {
     "node": "18.17.1"
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }
diff --git a/packages/openactive-openid-client/package.json b/packages/openactive-openid-client/package.json
@@ -30,5 +30,12 @@
   },
   "engines": {
     "node": "18.17.1"
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }
diff --git a/packages/openactive-openid-test-cli/package.json b/packages/openactive-openid-test-cli/package.json
@@ -33,5 +33,12 @@
   },
   "engines": {
     "node": "18.17.1"
+  },
+  "config": {
+    "allowedLicenseTypes": [
+      "permissive",
+      "publicDomain",
+      "uncategorized"
+    ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -76,5 +76,12 @@`
`76`	`76`	`},`
`77`	`77`	`"engines": {`
`78`	`78`	`"node": "18.17.1"`
	`79`	`+ },`
	`80`	`+ "config": {`
	`81`	`+ "allowedLicenseTypes": [`
	`82`	`+ "permissive",`
	`83`	`+ "publicDomain",`
	`84`	`+ "uncategorized"`
	`85`	`+ ]`
`79`	`86`	`}`
`80`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,5 +78,12 @@`
`78`	`78`	`},`
`79`	`79`	`"engines": {`
`80`	`80`	`"node": "18.17.1"`
	`81`	`+ },`
	`82`	`+ "config": {`
	`83`	`+ "allowedLicenseTypes": [`
	`84`	`+ "permissive",`
	`85`	`+ "publicDomain",`
	`86`	`+ "uncategorized"`
	`87`	`+ ]`
`81`	`88`	`}`
`82`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,12 @@`
`32`	`32`	`},`
`33`	`33`	`"engines": {`
`34`	`34`	`"node": "18.17.1"`
	`35`	`+ },`
	`36`	`+ "config": {`
	`37`	`+ "allowedLicenseTypes": [`
	`38`	`+ "permissive",`
	`39`	`+ "publicDomain",`
	`40`	`+ "uncategorized"`
	`41`	`+ ]`
`35`	`42`	`}`
`36`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,12 @@`
`30`	`30`	`},`
`31`	`31`	`"engines": {`
`32`	`32`	`"node": "18.17.1"`
	`33`	`+ },`
	`34`	`+ "config": {`
	`35`	`+ "allowedLicenseTypes": [`
	`36`	`+ "permissive",`
	`37`	`+ "publicDomain",`
	`38`	`+ "uncategorized"`
	`39`	`+ ]`
`33`	`40`	`}`
`34`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,12 @@`
`33`	`33`	`},`
`34`	`34`	`"engines": {`
`35`	`35`	`"node": "18.17.1"`
	`36`	`+ },`
	`37`	`+ "config": {`
	`38`	`+ "allowedLicenseTypes": [`
	`39`	`+ "permissive",`
	`40`	`+ "publicDomain",`
	`41`	`+ "uncategorized"`
	`42`	`+ ]`
`36`	`43`	`}`
`37`	`44`	`}`