Skip to content

Commit 88d5a8c

Browse files
committed
Merge branch 'master' of github.com:node-oauth/node-oauth2-server into tests/typescript-checks
2 parents 2fce789 + 8241a75 commit 88d5a8c

File tree

6 files changed

+234
-283
lines changed

6 files changed

+234
-283
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ jobs:
3737

3838
steps:
3939
- name: Checkout repository
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v6
4141
with:
4242
persist-credentials: false
4343
show-progress: false
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v3
47+
uses: github/codeql-action/init@v4
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -69,4 +69,4 @@ jobs:
6969
# make release
7070

7171
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@v3
72+
uses: github/codeql-action/analyze@v4

.github/workflows/tests-release.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323

2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6
2727
with:
2828
persist-credentials: false
2929
show-progress: false
30-
- uses: actions/setup-node@v4
30+
- uses: actions/setup-node@v6
3131
with:
3232
node-version: 20
3333
- run: npm clean-install && npm audit --production
@@ -44,13 +44,13 @@ jobs:
4444
node: [16, 18, 20]
4545
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v6
4848
with:
4949
persist-credentials: false
5050
show-progress: false
5151

5252
- name: Setup node ${{ matrix.node }}
53-
uses: actions/setup-node@v4
53+
uses: actions/setup-node@v6
5454
with:
5555
node-version: ${{ matrix.node }}
5656
cache: npm
@@ -81,22 +81,22 @@ jobs:
8181
steps:
8282
# checkout this repo
8383
- name: Checkout repository
84-
uses: actions/checkout@v4
84+
uses: actions/checkout@v6
8585
with:
8686
persist-credentials: false
8787
show-progress: false
8888

8989
# checkout express-adapter repo
9090
- name: Checkout express-adapter
91-
uses: actions/checkout@v4
91+
uses: actions/checkout@v6
9292
with:
9393
persist-credentials: false
9494
show-progress: false
9595
repository: node-oauth/express-oauth-server
9696
path: github/testing/express
9797

9898
- name: Setup node ${{ matrix.node }}
99-
uses: actions/setup-node@v4
99+
uses: actions/setup-node@v6
100100
with:
101101
node-version: ${{ matrix.node }}
102102
cache: npm
@@ -118,11 +118,11 @@ jobs:
118118
needs: [integrationtests]
119119
steps:
120120
- name: Checkout repository
121-
uses: actions/checkout@v4
121+
uses: actions/checkout@v6
122122
with:
123123
persist-credentials: false
124124
show-progress: false
125-
- uses: actions/setup-node@v4
125+
- uses: actions/setup-node@v6
126126
with:
127127
node-version: 16
128128
registry-url: https://registry.npmjs.org/
@@ -139,11 +139,11 @@ jobs:
139139
packages: write
140140
steps:
141141
- name: Checkout repository
142-
uses: actions/checkout@v4
142+
uses: actions/checkout@v6
143143
with:
144144
persist-credentials: false
145145
show-progress: false
146-
- uses: actions/setup-node@v4
146+
- uses: actions/setup-node@v6
147147
with:
148148
# we always publish targeting the lowest supported node version
149149
node-version: 16

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout repository
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v6
2222
with:
2323
persist-credentials: false
2424
show-progress: false
2525

2626
- name: setup node
27-
uses: actions/setup-node@v4
27+
uses: actions/setup-node@v6
2828
with:
2929
node-version: 20
3030
cache: npm
@@ -58,13 +58,13 @@ jobs:
5858
node: [16, 18, 20, 22]
5959
steps:
6060
- name: Checkout repository
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@v6
6262
with:
6363
persist-credentials: false
6464
show-progress: false
6565

6666
- name: Setup node ${{ matrix.node }}
67-
uses: actions/setup-node@v4
67+
uses: actions/setup-node@v6
6868
with:
6969
node-version: ${{ matrix.node }}
7070
cache: npm

index.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import * as http from 'http';
1212
declare class OAuth2Server {
1313
static OAuth2Server: typeof OAuth2Server;
1414

15+
options: OAuth2Server.ServerOptions;
16+
1517
/**
1618
* Instantiates OAuth2Server using the supplied model
1719
*/

0 commit comments

Comments
 (0)