Skip to content

Commit 0ed5603

Browse files
build(deps): bump jose from 5.10.0 to 6.0.12 (#7049)
* build(deps): bump jose from 5.10.0 to 6.0.12 Bumps [jose](https://github.com/panva/jose) from 5.10.0 to 6.0.12. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/main/CHANGELOG.md) - [Commits](panva/jose@v5.10.0...v6.0.12) --- updated-dependencies: - dependency-name: jose dependency-version: 6.0.12 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * chore: fixed jose --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: SamTV12345 <[email protected]>
1 parent 65e7947 commit 0ed5603

File tree

4 files changed

+11
-15
lines changed

4 files changed

+11
-15
lines changed

pnpm-lock.yaml

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/node/security/OAuth2Provider.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import {ArgsExpressType} from "../types/ArgsExpressType";
22
import Provider, {Account, Configuration} from 'oidc-provider';
3-
import {generateKeyPair, exportJWK, KeyLike} from 'jose'
3+
import {generateKeyPair, exportJWK, CryptoKey} from 'jose'
44
import MemoryAdapter from "./OIDCAdapter";
55
import path from "path";
66
const settings = require('../utils/Settings');
77
import {IncomingForm} from 'formidable'
8-
import express, {Request, Response} from 'express';
8+
import express from 'express';
99
import {format} from 'url'
1010
import {ParsedUrlQuery} from "node:querystring";
11-
import {Http2ServerRequest, Http2ServerResponse} from "node:http2";
1211
import {MapArrayType} from "../types/MapType";
1312

1413
const configuration: Configuration = {
@@ -64,14 +63,16 @@ const configuration: Configuration = {
6463
};
6564

6665

67-
export let publicKeyExported: KeyLike|null
68-
export let privateKeyExported: KeyLike|null
66+
export let publicKeyExported: CryptoKey|null
67+
export let privateKeyExported: CryptoKey|null
6968

7069
/*
7170
This function is used to initialize the OAuth2 provider
7271
*/
7372
export const expressCreateServer = async (hookName: string, args: ArgsExpressType, cb: Function) => {
74-
const {privateKey, publicKey} = await generateKeyPair('RS256');
73+
const {privateKey, publicKey} = await generateKeyPair('RS256', {
74+
extractable: true
75+
});
7576
const privateKeyJWK = await exportJWK(privateKey);
7677
publicKeyExported = publicKey
7778
privateKeyExported = privateKey

src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"find-root": "1.1.0",
4545
"formidable": "^3.5.4",
4646
"http-errors": "^2.0.0",
47-
"jose": "^5.10.0",
47+
"jose": "^6.0.12",
4848
"js-cookie": "^3.0.5",
4949
"jsdom": "^26.1.0",
5050
"jsonminify": "0.4.2",

src/static/js/Changeset.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ export const checkRep = (cs: string) => {
328328
* - `op2` is the current operation from `in2`, to apply to `op1`. Has the same consumption
329329
* and advancement semantics as `op1`.
330330
* - `opOut` is the result of applying `op2` (before consumption) to `op1` (before
331-
* consumption). If there is no result (perhaps `op1` and `op2` cancelled each other out),
331+
* consumption). If there is no result (perhaps `op1` and `op2` canceled each other out),
332332
* either `opOut` must be nullish or `opOut.opcode` must be the empty string.
333333
* @returns {string} the integrated changeset
334334
*/

0 commit comments

Comments
 (0)