Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: auth0/node-jwks-rsa
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1.4
Choose a base ref
...
head repository: auth0/node-jwks-rsa
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.1.5
Choose a head ref

Commits on Jul 5, 2022

  1. Create semgrep.yml

    evansims authored Jul 5, 2022
    Copy the full SHA
    11960d8 View commit details

Commits on Jul 7, 2022

  1. Create .semgrepignore

    evansims authored Jul 7, 2022
    Copy the full SHA
    cd8955f View commit details
  2. Update .semgrepignore

    evansims authored Jul 7, 2022
    Copy the full SHA
    c6f7c08 View commit details

Commits on Jul 8, 2022

  1. Update Codecov (#318)

    Update config.yml
    evansims authored Jul 8, 2022
    Copy the full SHA
    fcfd33c View commit details

Commits on Sep 9, 2022

  1. [Snyk] Security upgrade jose from 2.0.5 to 2.0.6 (#320)

    fix: package.json & package-lock.json to reduce vulnerabilities
    
    The following vulnerabilities are fixed with an upgrade:
    - https://snyk.io/vuln/SNYK-JS-JOSE-3018688
    
    Co-authored-by: snyk-bot <snyk-bot@snyk.io>
    crew-security and snyk-bot authored Sep 9, 2022
    Copy the full SHA
    04dc3a8 View commit details
  2. Bump passport from 0.4.1 to 0.6.0

    Bumps [passport](https://github.com/jaredhanson/passport) from 0.4.1 to 0.6.0.
    - [Release notes](https://github.com/jaredhanson/passport/releases)
    - [Changelog](https://github.com/jaredhanson/passport/blob/master/CHANGELOG.md)
    - [Commits](jaredhanson/passport@v0.4.1...v0.6.0)
    
    ---
    updated-dependencies:
    - dependency-name: passport
      dependency-type: direct:development
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Sep 9, 2022
    Copy the full SHA
    bcf9b57 View commit details
  3. Bump passport from 0.4.0 to 0.6.0 in /examples/passport-demo

    Bumps [passport](https://github.com/jaredhanson/passport) from 0.4.0 to 0.6.0.
    - [Release notes](https://github.com/jaredhanson/passport/releases)
    - [Changelog](https://github.com/jaredhanson/passport/blob/master/CHANGELOG.md)
    - [Commits](jaredhanson/passport@v0.4.0...v0.6.0)
    
    ---
    updated-dependencies:
    - dependency-name: passport
      dependency-type: direct:production
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Sep 9, 2022
    Copy the full SHA
    f2888bb View commit details

Commits on Sep 15, 2022

  1. [Snyk] Upgrade @types/jsonwebtoken from 8.5.8 to 8.5.9 (#323)

    fix: upgrade @types/jsonwebtoken from 8.5.8 to 8.5.9
    
    Snyk has created this PR to upgrade @types/jsonwebtoken from 8.5.8 to 8.5.9.
    
    See this package in npm:
    https://www.npmjs.com/package/@types/jsonwebtoken
    
    See this project in Snyk:
    https://app.snyk.io/org/auth0-sdks/project/be959a98-9654-498d-9e56-dfd8374045a4?utm_source=github&utm_medium=referral&page=upgrade-pr
    
    Co-authored-by: snyk-bot <snyk-bot@snyk.io>
    crew-security and snyk-bot authored Sep 15, 2022
    Copy the full SHA
    137cef3 View commit details

Commits on Oct 5, 2022

  1. [Snyk] Upgrade @types/express from 4.17.13 to 4.17.14 (#326)

    fix: upgrade @types/express from 4.17.13 to 4.17.14
    
    Snyk has created this PR to upgrade @types/express from 4.17.13 to 4.17.14.
    
    See this package in npm:
    https://www.npmjs.com/package/@types/express
    
    See this project in Snyk:
    https://app.snyk.io/org/auth0-sdks/project/be959a98-9654-498d-9e56-dfd8374045a4?utm_source=github&utm_medium=referral&page=upgrade-pr
    
    Co-authored-by: snyk-bot <snyk-bot@snyk.io>
    crew-security and snyk-bot authored Oct 5, 2022
    Copy the full SHA
    f023862 View commit details

Commits on Oct 7, 2022

  1. Update README.md

    adamjmcgrath authored Oct 7, 2022
    Copy the full SHA
    15b4747 View commit details
  2. Update README.md

    Co-authored-by: Ewan Harris <ewanharris93@gmail.com>
    adamjmcgrath and ewanharris authored Oct 7, 2022
    Copy the full SHA
    bdf4f0c View commit details
  3. Merge pull request #327 from auth0/adamjmcgrath-patch-2

    Update README.md
    adamjmcgrath authored Oct 7, 2022
    Copy the full SHA
    0602619 View commit details
  4. Copy the full SHA
    f6b15a6 View commit details
  5. Merge pull request #321 from auth0/dependabot/npm_and_yarn/passport-0…

    ….6.0
    
    Bump passport from 0.4.1 to 0.6.0
    adamjmcgrath authored Oct 7, 2022
    Copy the full SHA
    d8992ad View commit details
  6. Copy the full SHA
    cb38250 View commit details

Commits on Oct 10, 2022

  1. Copy the full SHA
    f4bedd4 View commit details
  2. Copy the full SHA
    51676fc View commit details
  3. Merge pull request #329 from AaronMoat/fix-express-jwt-secret-typing

    Fix GetVerificationKey typing to include undefined
    adamjmcgrath authored Oct 10, 2022
    Copy the full SHA
    9574b04 View commit details
  4. Copy the full SHA
    9603747 View commit details
  5. Merge pull request #322 from auth0/dependabot/npm_and_yarn/examples/p…

    …assport-demo/passport-0.6.0
    
    Bump passport from 0.4.0 to 0.6.0 in /examples/passport-demo
    adamjmcgrath authored Oct 10, 2022
    Copy the full SHA
    023eb4a View commit details
  6. Release v2.1.5

    adamjmcgrath committed Oct 10, 2022
    Copy the full SHA
    9d262c5 View commit details
  7. Merge pull request #330 from auth0/release/v2.1.5

    Release v2.1.5
    adamjmcgrath authored Oct 10, 2022
    Copy the full SHA
    83e9327 View commit details
Showing with 95 additions and 48 deletions.
  1. +9 −4 .circleci/config.yml
  2. +24 −0 .github/workflows/semgrep.yml
  3. +3 −0 .semgrepignore
  4. +6 −0 CHANGELOG.md
  5. +2 −0 README.md
  6. +6 −5 examples/passport-demo/package-lock.json
  7. +1 −1 examples/passport-demo/package.json
  8. +1 −1 index.d.ts
  9. +38 −32 package-lock.json
  10. +5 −5 package.json
13 changes: 9 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
version: 2.1
orbs:
ship: auth0/ship@0.3.0
codecov: codecov/codecov@3

jobs:
build:
parameters:
@@ -13,19 +15,22 @@ jobs:
LANG: en_US.UTF-8
steps:
- checkout

- ship/node-install-packages

- run:
name: Run Linter
command: npm run lint

- run:
name: Run Tests
command: npm run test:ci

- store_artifacts:
path: ./coverage/<< parameters.node-version >>/lcov-report
- run:
name: Upload Coverage
when: on_success
command: bash <(curl -s https://codecov.io/bash) -Z -C $CIRCLE_SHA1

- codecov/upload

workflows:
build-and-test:
jobs:
24 changes: 24 additions & 0 deletions .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Semgrep

on:
pull_request: {}

push:
branches: ["master", "main"]

schedule:
- cron: '30 0 1,15 * *'

jobs:
semgrep:
name: Scan
runs-on: ubuntu-latest
container:
image: returntocorp/semgrep
if: (github.actor != 'dependabot[bot]')
steps:
- uses: actions/checkout@v3

- run: semgrep ci
env:
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
3 changes: 3 additions & 0 deletions .semgrepignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CHANGELOG.md
examples/
tests/
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## [v2.1.5](https://github.com/auth0/node-jwks-rsa/tree/v2.1.5) (2022-10-10)
[Full Changelog](https://github.com/auth0/node-jwks-rsa/compare/v2.1.4...v2.1.5)

**Fixed**
- Fix GetVerificationKey typing to include undefined [\#329](https://github.com/auth0/node-jwks-rsa/pull/329) ([AaronMoat](https://github.com/AaronMoat))

## [v2.1.4](https://github.com/auth0/node-jwks-rsa/tree/v2.1.4) (2022-06-07)
[Full Changelog](https://github.com/auth0/node-jwks-rsa/compare/v2.1.3...v2.1.4)

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -50,6 +50,8 @@ const signingKey = key.getPublicKey();
- `requestHeaders`: (_optional_) an object of headers to pass to the request
- `requestAgent`: (_optional_) a Node `http.Agent` to be passed to the http(s) request
- `getKeysInterceptor`: (_optional_) a promise returning function hook [(details)](#loading-keys-from-local-file-environment-variable-or-other-externals)
- `cacheMaxAge`: (_optional_) the duration for which to store a cached JWKS in ms (default 600,000 or 10 minutes)
- `jwksRequestsPerMinute`: (_optional_) max number of requests allowed to the JWKS URI per minute (defaults to 10)

### Caching

11 changes: 6 additions & 5 deletions examples/passport-demo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/passport-demo/package.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"dependencies": {
"debug": "^2.6.9",
"express": "^4.17.0",
"passport": "^0.4.0",
"passport": "^0.6.0",
"passport-jwt": "^4.0.0"
}
}
2 changes: 1 addition & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ declare namespace JwksRsa {
type SecretCallback = (req: Express.Request, payload: any, done: (err: any, secret?: secretType) => void) => void;

/** Types from express-jwt@>=7 */
type GetVerificationKey = (req: Express.Request, token: Jwt | undefined) => Secret | Promise<Secret>;
type GetVerificationKey = (req: Express.Request, token: Jwt | undefined) => Secret | undefined | Promise<Secret | undefined>;

function expressJwtSecret(options: ExpressJwtOptions): SecretCallbackLong|GetVerificationKey;

70 changes: 38 additions & 32 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jwks-rsa",
"version": "2.1.4",
"version": "2.1.5",
"description": "Library to retrieve RSA public keys from a JWKS endpoint",
"main": "src/index.js",
"files": [
@@ -12,10 +12,10 @@
"node": ">=10 < 13 || >=14"
},
"dependencies": {
"@types/express": "^4.17.13",
"@types/jsonwebtoken": "^8.5.8",
"@types/express": "^4.17.14",
"@types/jsonwebtoken": "^8.5.9",
"debug": "^4.3.4",
"jose": "^2.0.5",
"jose": "^2.0.6",
"limiter": "^1.1.5",
"lru-memoizer": "^2.1.4"
},
@@ -37,7 +37,7 @@
"mocha": "^6.2.3",
"nock": "^13.0.0",
"nyc": "^15.1.0",
"passport": "^0.4.1",
"passport": "^0.6.0",
"passport-jwt": "^4.0.0",
"rimraf": "^2.7.1",
"supertest": "^3.4.2",