Skip to content

Commit

Permalink
Merge branch 'master' into compat-2
Browse files Browse the repository at this point in the history
  • Loading branch information
evansims authored Jun 24, 2024
2 parents d98e972 + aff09ba commit dbe0804
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 67 deletions.
2 changes: 1 addition & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ declare namespace JwksRsa {
/** Types from express-jwt@>=7 */
type GetVerificationKey = (req: Express.Request, token: Jwt | undefined) => Secret | undefined | Promise<Secret | undefined>;

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

function passportJwtSecret(options: ExpressJwtOptions): SecretCallback;

Expand Down
122 changes: 56 additions & 66 deletions package-lock.json

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

0 comments on commit dbe0804

Please sign in to comment.