Skip to content

Commit 6436480

Browse files
aeneasraeneasr
authored
fix: redirects (ory#590)
1 parent 7806e92 commit 6436480

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+15460
-4609
lines changed

‎.github/workflows/build.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
name: Tests
2+
23
on:
4+
workflow_dispatch:
35
push:
4-
branches: [ main, master ]
6+
branches:
7+
- master
58
pull_request:
6-
branches: [ main, master ]
9+
branches:
10+
- master
711

812
jobs:
913
test:
@@ -14,7 +18,7 @@ jobs:
1418
- uses: actions/setup-node@v2
1519
with:
1620
node-version: '14.x'
17-
- name: Install dependencies
18-
run: npm ci
21+
cache: 'npm'
22+
- run: npm install
1923
- name: Test Build
2024
run: npm run build

‎.github/workflows/playwright.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
name: Playwright Tests
2+
23
on:
4+
workflow_dispatch:
35
push:
4-
branches: [ main, master ]
6+
branches:
7+
- master
58
pull_request:
6-
branches: [ main, master ]
9+
branches:
10+
- master
711

812
jobs:
913
test:
@@ -14,11 +18,11 @@ jobs:
1418
- uses: actions/setup-node@v2
1519
with:
1620
node-version: '14.x'
21+
cache: 'npm'
1722
- uses: actions/setup-go@v2
1823
with:
1924
go-version: '^1.17.6'
20-
- name: Install dependencies
21-
run: npm ci
25+
- run: npm install
2226
- name: Install Playwright
2327
run: npx playwright install --with-deps
2428
- name: Run Playwright tests

‎.github/workflows/redirects.yml

+9-18
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,22 @@ name: Redirect checks
22

33
on:
44
workflow_dispatch:
5-
# schedule:
6-
# - cron: "0 2 * * 2,5"
7-
# push:
8-
# branches: [ main ]
9-
# pull_request:
10-
# branches: [ main ]
115

126
jobs:
137
build:
14-
158
runs-on: ubuntu-latest
16-
17-
strategy:
18-
matrix:
19-
node-version:
20-
# - 12.x,
21-
# - 14.x
22-
- 16.x
23-
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
24-
259
steps:
2610
- uses: actions/checkout@v2
2711
- name: Use Node.js ${{ matrix.node-version }}
2812
uses: actions/setup-node@v2
2913
with:
30-
node-version: ${{ matrix.node-version }}
14+
node-version: '14.x'
3115
cache: 'npm'
32-
- run: npx jest tests/redirects
16+
- run: npm install
17+
- run: |
18+
host=$(npx vercel --confirm --token ${{ secrets.VERCEL_TOKEN }} --scope ory)
19+
TEST_HOST=$host npm run test:unit
20+
env:
21+
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
22+
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
23+

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ test-results/
2828
playwright-report/
2929

3030
.vercel/
31+
32+
.vercel

‎docs/ecosystem/deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ If configuration key `dsn` (Data Source Name) is prefixed with `postgres://`,
5252
then PostgreSQL will be used as storage backend. An exemplary configuration
5353
would look like this: `DSN=postgres://user:password@host:123/database`
5454

55-
Additionally, the following DSN parameters are supported:
55+
All parameters [supported by `libpq`](https://www.postgresql.org/docs/9.6/libpq-connect.html) are supported by Ory Kratos as well. In particular but not exclusively:
5656

5757
- `max_conns` (number): Sets the maximum number of open connections to the
5858
database. Defaults to the number of CPU cores times 2.

‎docs/hydra/cli/hydra-clients-create.md

+12-11
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,26 @@ This file is auto-generated.
99
1010
To improve this file please make your change against the appropriate "./cmd/*.go" file.
1111
-->
12+
1213
## hydra clients create
1314

1415
Create a new OAuth 2.0 Client
1516

1617
### Synopsis
1718

18-
This command creates an OAuth 2.0 Client which can be used to perform various OAuth 2.0 Flows like
19-
the Authorize Code, Implicit, Refresh flow.
20-
21-
Ory Hydra implements the OpenID Connect Dynamic Client registration specification. Most flags are supported by this command
22-
as well.
19+
This command creates an OAuth 2.0 Client which can be used to perform various
20+
OAuth 2.0 Flows like the Authorize Code, Implicit, Refresh flow.
2321

24-
Example:
25-
hydra clients create -n "my app" -c http://localhost/cb -g authorization_code -r code -a core,foobar
22+
Ory Hydra implements the OpenID Connect Dynamic Client registration
23+
specification. Most flags are supported by this command as well.
2624

27-
To encrypt auto generated client secret, use "--pgp-key", "--pgp-key-url" or "--keybase" flag, for example:
28-
hydra clients create -n "my app" -g client_credentials -r token -a core,foobar --keybase keybase_username
25+
Example: hydra clients create -n "my app" -c http://localhost/cb -g
26+
authorization_code -r code -a core,foobar
2927

28+
To encrypt auto generated client secret, use "--pgp-key",
29+
"--pgp-key-url" or "--keybase" flag, for example: hydra clients
30+
create -n "my app" -g client_credentials -r token -a core,foobar
31+
--keybase keybase_username
3032

3133
```
3234
hydra clients create [flags]
@@ -74,5 +76,4 @@ hydra clients create [flags]
7476

7577
### SEE ALSO
7678

77-
* [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients
78-
79+
- [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients

‎docs/hydra/cli/hydra-clients-delete.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ This file is auto-generated.
99
1010
To improve this file please make your change against the appropriate "./cmd/*.go" file.
1111
-->
12+
1213
## hydra clients delete
1314

1415
Delete an OAuth 2.0 Client
@@ -17,8 +18,7 @@ Delete an OAuth 2.0 Client
1718

1819
This command deletes one or more OAuth 2.0 Clients by their respective IDs.
1920

20-
Example:
21-
hydra clients delete client-1 client-2 client-3
21+
Example: hydra clients delete client-1 client-2 client-3
2222

2323
```
2424
hydra clients delete <id> [<id>...] [flags]
@@ -42,5 +42,4 @@ hydra clients delete <id> [<id>...] [flags]
4242

4343
### SEE ALSO
4444

45-
* [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients
46-
45+
- [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients

‎docs/hydra/cli/hydra-clients-get.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ This file is auto-generated.
99
1010
To improve this file please make your change against the appropriate "./cmd/*.go" file.
1111
-->
12+
1213
## hydra clients get
1314

1415
Get an OAuth 2.0 Client
@@ -17,8 +18,7 @@ Get an OAuth 2.0 Client
1718

1819
This command retrieves an OAuth 2.0 Clients by its ID.
1920

20-
Example:
21-
hydra clients get client-1
21+
Example: hydra clients get client-1
2222

2323
```
2424
hydra clients get <id> [flags]
@@ -42,5 +42,4 @@ hydra clients get <id> [flags]
4242

4343
### SEE ALSO
4444

45-
* [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients
46-
45+
- [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients

‎docs/hydra/cli/hydra-clients-import.md

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,36 @@
11
---
22
id: hydra-clients-import
33
title: hydra clients import
4-
description: hydra clients import Imports OAuth 2.0 Clients from one or more JSON files to the JSON Web Key Store
4+
description:
5+
hydra clients import Imports OAuth 2.0 Clients from one or more JSON files to
6+
the JSON Web Key Store
57
---
68

79
<!--
810
This file is auto-generated.
911
1012
To improve this file please make your change against the appropriate "./cmd/*.go" file.
1113
-->
14+
1215
## hydra clients import
1316

1417
Imports OAuth 2.0 Clients from one or more JSON files to the JSON Web Key Store
1518

1619
### Synopsis
1720

18-
This command allows you to import OAuth 2.0 Clients from one or more JSON files to the JSON Web Key Store.
19-
20-
Currently supported formats are raw JSON Web Keys or PEM/DER encoded data. If the JSON Web Key Set exists already,
21-
the imported keys will be added to that set. Otherwise, a new set will be created.
21+
This command allows you to import OAuth 2.0 Clients from one or more JSON files
22+
to the JSON Web Key Store.
2223

23-
Please be aware that importing a private key does not automatically import its public key as well.
24+
Currently supported formats are raw JSON Web Keys or PEM/DER encoded data. If
25+
the JSON Web Key Set exists already, the imported keys will be added to that
26+
set. Otherwise, a new set will be created.
2427

25-
Examples:
26-
hydra keys import my-set ./path/to/jwk.json ./path/to/jwk-2.json
27-
hydra keys import my-set ./path/to/rsa.key ./path/to/rsa.pub --default-key-id cae6b214-fb1e-4ebc-9019-95286a62eabc
28+
Please be aware that importing a private key does not automatically import its
29+
public key as well.
2830

31+
Examples: hydra keys import my-set ./path/to/jwk.json ./path/to/jwk-2.json hydra
32+
keys import my-set ./path/to/rsa.key ./path/to/rsa.pub --default-key-id
33+
cae6b214-fb1e-4ebc-9019-95286a62eabc
2934

3035
```
3136
hydra clients import &lt;set&gt; &lt;file-1&gt; [&lt;file-2&gt; [&lt;file-3 [&lt;...&gt;]]] [flags]
@@ -51,5 +56,4 @@ hydra clients import &lt;set&gt; &lt;file-1&gt; [&lt;file-2&gt; [&lt;file-3 [&lt
5156

5257
### SEE ALSO
5358

54-
* [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients
55-
59+
- [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients

‎docs/hydra/cli/hydra-clients-list.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ This file is auto-generated.
99
1010
To improve this file please make your change against the appropriate "./cmd/*.go" file.
1111
-->
12+
1213
## hydra clients list
1314

1415
List OAuth 2.0 Clients
@@ -17,8 +18,7 @@ List OAuth 2.0 Clients
1718

1819
This command list an OAuth 2.0 Clients.
1920

20-
Example:
21-
hydra clients list
21+
Example: hydra clients list
2222

2323
```
2424
hydra clients list [flags]
@@ -44,5 +44,4 @@ hydra clients list [flags]
4444

4545
### SEE ALSO
4646

47-
* [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients
48-
47+
- [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients

‎docs/hydra/cli/hydra-clients-update.md

+12-9
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ This file is auto-generated.
99
1010
To improve this file please make your change against the appropriate "./cmd/*.go" file.
1111
-->
12+
1213
## hydra clients update
1314

1415
Update an entire OAuth 2.0 Client
@@ -17,15 +18,18 @@ Update an entire OAuth 2.0 Client
1718

1819
This command replaces an OAuth 2.0 Client by its ID.
1920

20-
Please be aware that this command replaces the entire client.
21-
To update only the name, a full client should be provided, for example:
22-
hydra clients update client-1 -n &#34;my updated app&#34; -c http://localhost/cb -g authorization_code -r code -a core,foobar
23-
24-
If only the name flag (-n &#34;my updated app&#34;) is provided, the all other fields are updated to their default values.
21+
Please be aware that this command replaces the entire client. To update only the
22+
name, a full client should be provided, for example: hydra clients update
23+
client-1 -n &#34;my updated app&#34; -c http://localhost/cb -g
24+
authorization_code -r code -a core,foobar
2525

26-
To encrypt auto generated client secret, use &#34;--pgp-key&#34;, &#34;--pgp-key-url&#34; or &#34;--keybase&#34; flag, for example:
27-
hydra clients update client-1 -n &#34;my updated app&#34; -g client_credentials -r token -a core,foobar --keybase keybase_username
26+
If only the name flag (-n &#34;my updated app&#34;) is provided, the all other
27+
fields are updated to their default values.
2828

29+
To encrypt auto generated client secret, use &#34;--pgp-key&#34;,
30+
&#34;--pgp-key-url&#34; or &#34;--keybase&#34; flag, for example: hydra clients
31+
update client-1 -n &#34;my updated app&#34; -g client_credentials -r token -a
32+
core,foobar --keybase keybase_username
2933

3034
```
3135
hydra clients update &lt;id&gt; [flags]
@@ -72,5 +76,4 @@ hydra clients update &lt;id&gt; [flags]
7276

7377
### SEE ALSO
7478

75-
* [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients
76-
79+
- [hydra clients](hydra-clients) - Manage OAuth 2.0 Clients

‎docs/hydra/cli/hydra-clients.md

+16-11
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ This file is auto-generated.
99
1010
To improve this file please make your change against the appropriate "./cmd/*.go" file.
1111
-->
12+
1213
## hydra clients
1314

1415
Manage OAuth 2.0 Clients
@@ -26,14 +27,18 @@ Manage OAuth 2.0 Clients
2627

2728
### SEE ALSO
2829

29-
* [hydra](hydra) - Run and manage Ory Hydra
30-
* [hydra clients create](hydra-clients-create) - Create a new OAuth 2.0 Client
31-
* [hydra clients delete](hydra-clients-delete) - Delete an OAuth 2.0 Client
32-
* [hydra clients get](hydra-clients-get) - Get an OAuth 2.0 Client
33-
* [hydra clients import](hydra-clients-import) - Import OAuth 2.0 Clients from one or more JSON files
34-
* [hydra clients import](hydra-clients-import) - Import OAuth 2.0 Clients from one or more JSON files
35-
* [hydra clients import](hydra-clients-import) - Imports OAuth 2.0 Clients from one or more JSON files to the JSON Web Key Store
36-
* [hydra clients import](hydra-clients-import) - Import OAuth 2.0 Clients from one or more JSON files
37-
* [hydra clients list](hydra-clients-list) - List OAuth 2.0 Clients
38-
* [hydra clients update](hydra-clients-update) - Update an entire OAuth 2.0 Client
39-
30+
- [hydra](hydra) - Run and manage Ory Hydra
31+
- [hydra clients create](hydra-clients-create) - Create a new OAuth 2.0 Client
32+
- [hydra clients delete](hydra-clients-delete) - Delete an OAuth 2.0 Client
33+
- [hydra clients get](hydra-clients-get) - Get an OAuth 2.0 Client
34+
- [hydra clients import](hydra-clients-import) - Import OAuth 2.0 Clients from
35+
one or more JSON files
36+
- [hydra clients import](hydra-clients-import) - Import OAuth 2.0 Clients from
37+
one or more JSON files
38+
- [hydra clients import](hydra-clients-import) - Imports OAuth 2.0 Clients from
39+
one or more JSON files to the JSON Web Key Store
40+
- [hydra clients import](hydra-clients-import) - Import OAuth 2.0 Clients from
41+
one or more JSON files
42+
- [hydra clients list](hydra-clients-list) - List OAuth 2.0 Clients
43+
- [hydra clients update](hydra-clients-update) - Update an entire OAuth 2.0
44+
Client

0 commit comments

Comments
 (0)