Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Request well-known as json-ld #166

Merged
merged 7 commits into from
Dec 13, 2021
Merged

Request well-known as json-ld #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c53f4f0
Request well-known as json-ld
ajacksified Nov 12, 2021
7e71442
Bump packages for audit; fix up workflows
ajacksified Nov 12, 2021
5270b60
Fix env vars
NSeydoux Nov 17, 2021
23f4f92
Fix browser environment
NSeydoux Nov 18, 2021
a4878fb
Fix testcafé tests
NSeydoux Nov 18, 2021
ad10b2f
Bump packages; fix typedoc build
ajacksified Dec 13, 2021
29295f3
Disable dev-next e2e tests
ajacksified Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Create GitHub Deployment
id: create-deployment
if: github.actor != 'dependabot[bot]'
uses: octokit/request-action@v2.x
uses: octokit/request-action@v2.1.0
with:
route: POST /repos/:repository/deployments
repository: ${{ github.repository }}
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
- uses: actions/checkout@v2.3.4
- name: Mark GitHub Deployment as in progress
id: start-deployment
uses: octokit/request-action@v2.x
uses: octokit/request-action@v2.1.0
if: github.actor != 'dependabot[bot]'
with:
route: POST /repos/:repository/deployments/:deployment/statuses
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
TAG_SLUG: ${{ needs.prepare-deployment.outputs.tag-slug }}
- name: Mark GitHub Deployment as successful
if: github.actor != 'dependabot[bot]'
uses: octokit/request-action@v2.x
uses: octokit/request-action@v2.1.0
with:
route: POST /repos/:repository/deployments/:deployment/statuses
repository: ${{ github.repository }}
Expand All @@ -113,7 +113,7 @@ jobs:
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- name: Mark GitHub Deployment as failed
uses: octokit/request-action@v2.x
uses: octokit/request-action@v2.1.0
if: failure()
with:
route: POST /repos/:repository/deployments/:deployment/statuses
Expand All @@ -137,7 +137,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [16.x, 14.x, 12.x]
node-version: [16.x, 14.x]
needs: [prepare-deployment, publish-npm]
steps:
- uses: actions/checkout@v2.3.4
Expand Down Expand Up @@ -260,4 +260,4 @@ jobs:
E2E_TEST_DEV_NEXT_POD: ${{ secrets.E2E_TEST_DEV_NEXT_POD }}
E2E_TEST_DEV_NEXT_IDP_URL: ${{ secrets.E2E_TEST_DEV_NEXT_IDP_URL }}
E2E_TEST_DEV_NEXT_CLIENT_ID: ${{ secrets.E2E_TEST_DEV_NEXT_CLIENT_ID }}
E2E_TEST_DEV_NEXT_CLIENT_SECRET: ${{ secrets.E2E_TEST_DEV_NEXT_CLIENT_SECRET }}
E2E_TEST_DEV_NEXT_CLIENT_SECRET: ${{ secrets.E2E_TEST_DEV_NEXT_CLIENT_SECRET }}
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@ jobs:
# https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
if: runner.os == 'Linux' && matrix.node-version == env.DEFAULT_NODE_VERSION && github.actor != 'dependabot[bot]'
env:
E2E_TEST_ESS_NOTIFICATION_GATEWAY: ${{ secrets.E2E_TEST_ESS_PROD_NOTIFICATION_GATEWAY }}
E2E_TEST_ESS_POD: ${{ secrets.E2E_TEST_ESS_PROD_POD }}
E2E_TEST_ESS_IDP_URL: ${{ secrets.E2E_TEST_ESS_PROD_IDP_URL }}
E2E_TEST_ESS_CLIENT_ID: ${{ secrets.E2E_TEST_ESS_PROD_CLIENT_ID }}
E2E_TEST_ESS_CLIENT_SECRET: ${{ secrets.E2E_TEST_ESS_PROD_CLIENT_SECRET }}
E2E_TEST_DEV_NEXT_NOTIFICATION_GATEWAY: ${{ secrets.E2E_TEST_DEV_NEXT_NOTIFICATION_GATEWAY }}
E2E_TEST_DEV_NEXT_POD: ${{ secrets.E2E_TEST_DEV_NEXT_POD }}
E2E_TEST_DEV_NEXT_IDP_URL: ${{ secrets.E2E_TEST_DEV_NEXT_IDP_URL }}
E2E_TEST_DEV_NEXT_CLIENT_ID: ${{ secrets.E2E_TEST_DEV_NEXT_CLIENT_ID }}
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/e2e-browser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,8 @@ jobs:
E2E_TEST_ESS_POD: ${{ secrets.E2E_TEST_ESS_PROD_POD }}
E2E_TEST_ESS_COGNITO_USER: ${{ secrets.E2E_TEST_ESS_PROD_COGNITO_USER }}
E2E_TEST_ESS_COGNITO_PASSWORD: ${{ secrets.E2E_TEST_ESS_PROD_COGNITO_PASSWORD }}
E2E_TEST_DEV_NEXT_NOTIFICATION_GATEWAY: ${{ secrets.E2E_TEST_DEV_NEXT_NOTIFICATION_GATEWAY }}
E2E_TEST_DEV_NEXT_POD: ${{ secrets.E2E_TEST_DEV_NEXT_POD }}
E2E_TEST_DEV_NEXT_IDP_URL: ${{ secrets.E2E_TEST_DEV_NEXT_IDP_URL }}
E2E_TEST_DEV_NEXT_COGNITO_USER: ${{ secrets.E2E_TEST_DEV_COGNITO_USER }}
E2E_TEST_DEV_NEXT_COGNITO_PASSWORD: ${{ secrets.E2E_TEST_DEV_NEXT_COGNITO_PASSWORD }}
11 changes: 8 additions & 3 deletions .github/workflows/e2e-node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,19 @@ jobs:
- run: npm run build
- run: npm run e2e-test-node
env:
E2E_TEST_ESS_NOTIFICATION_GATEWAY: ${{secrets.E2E_TEST_ESS_PROD_NOTIFICATION_GATEWAY}}
E2E_TEST_ESS_NOTIFICATION_GATEWAY: ${{ secrets.E2E_TEST_ESS_PROD_NOTIFICATION_GATEWAY }}
E2E_TEST_ESS_POD: ${{ secrets.E2E_TEST_ESS_PROD_POD }}
E2E_TEST_ESS_IDP_URL: ${{ secrets.E2E_TEST_ESS_PROD_IDP_URL }}
E2E_TEST_ESS_CLIENT_ID: ${{ secrets.E2E_TEST_ESS_PROD_CLIENT_ID }}
E2E_TEST_ESS_CLIENT_SECRET: ${{ secrets.E2E_TEST_ESS_PROD_CLIENT_SECRET }}
E2E_TEST_DEV_NEXT_NOTIFICATION_GATEWAY: ${{ secrets.E2E_TEST_DEV_NEXT_NOTIFICATION_GATEWAY }}
E2E_TEST_DEV_NEXT_POD: ${{ secrets.E2E_TEST_DEV_NEXT_POD }}
E2E_TEST_DEV_NEXT_IDP_URL: ${{ secrets.E2E_TEST_DEV_NEXT_IDP_URL }}
E2E_TEST_DEV_NEXT_CLIENT_ID: ${{ secrets.E2E_TEST_DEV_NEXT_CLIENT_ID }}
E2E_TEST_DEV_NEXT_CLIENT_SECRET: ${{ secrets.E2E_TEST_DEV_NEXT_CLIENT_SECRET }}
- name: Add status check with successful test result
id: set-status-check-success
uses: octokit/request-action@v2.x
uses: octokit/request-action@v2.1.0
with:
route: POST /repos/:repository/statuses/:ref
repository: ${{ github.repository }}
Expand All @@ -50,7 +55,7 @@ jobs:
- name: Add status check with failed test result
id: set-status-check-failure
if: failure()
uses: octokit/request-action@v2.x
uses: octokit/request-action@v2.1.0
with:
route: POST /repos/:repository/statuses/:ref
repoitory: ${{ github.repository }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- name: Create GitHub Deployment
id: create-deployment
uses: octokit/request-action@v2.x
uses: octokit/request-action@v2.1.0
with:
route: POST /repos/:repository/deployments
repository: ${{ github.repository }}
Expand All @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v2.3.4
- name: Mark GitHub Deployment as in progress
id: start-deployment
uses: octokit/request-action@v2.x
uses: octokit/request-action@v2.1.0
with:
route: POST /repos/:repository/deployments/:deployment/statuses
repository: ${{ github.repository }}
Expand All @@ -63,7 +63,7 @@ jobs:
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Mark GitHub Deployment as successful
uses: octokit/request-action@v2.x
uses: octokit/request-action@v2.1.0
with:
route: POST /repos/:repository/deployments/:deployment/statuses
repository: ${{ github.repository }}
Expand All @@ -77,7 +77,7 @@ jobs:
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- name: Mark GitHub Deployment as failed
uses: octokit/request-action@v2.x
uses: octokit/request-action@v2.1.0
if: failure()
with:
route: POST /repos/:repository/deployments/:deployment/statuses
Expand All @@ -100,7 +100,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [16.x, 14.x, 12.x]
node-version: [16.x, 14.x]
needs: [prepare-deployment, publish-npm]
steps:
- uses: actions/checkout@v2.3.4
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The following changes have been implemented but not released yet:

## [Unreleased]

- None
- Request .well-known file as json-ld

## [0.1.0] - 2021-04-20

Expand Down
9 changes: 4 additions & 5 deletions e2e/browser/e2e.testcafe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,10 @@ serversUnderTest.forEach((server) => {
// eslint-disable-next-line jest/expect-expect, jest/no-done-callback
test("solid-client-notifications example functions", async (t: TestController) => {
await essUserLogin(t);

const connectWebsocket = ClientFunction(() =>
E2eHelpers.connectWebsocket("https://" + gateway)
);
const notification = await connectWebsocket();
const connectWebsocket = ClientFunction((gateway) => {
return E2eHelpers.connectWebsocket("https://" + gateway);
});
const notification = await connectWebsocket(gateway);

await t.expect(notification.status).eql("connected", { timeout: 10000 });
});
Expand Down
7 changes: 6 additions & 1 deletion e2e/node/e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

import { jest } from "@jest/globals";
import { jest, describe, it, expect, afterEach } from "@jest/globals";
import { Session } from "@inrupt/solid-client-authn-node";
import { config } from "dotenv-flow";
import * as openidClient from "openid-client";
Expand Down Expand Up @@ -58,6 +58,10 @@ const serversUnderTest: AuthDetails[] = [
process.env.E2E_TEST_ESS_CLIENT_ID!,
process.env.E2E_TEST_ESS_CLIENT_SECRET!,
],
/*
FIXME: temporarily disable dev-next tests. dev-next uses the new Notification
protocol: https://solid.github.io/notifications/protocol, while this codebase
uses a previous version.
[
process.env.E2E_TEST_DEV_NEXT_NOTIFICATION_GATEWAY!,
// Cumbersome workaround, but:
Expand All @@ -68,6 +72,7 @@ const serversUnderTest: AuthDetails[] = [
process.env.E2E_TEST_DEV_NEXT_CLIENT_ID!,
process.env.E2E_TEST_DEV_NEXT_CLIENT_SECRET!,
],
*/
// pod-compat.inrupt.com, temporarily disabled while WSS is in dev:
/*
[
Expand Down
Loading