@logto/node 1.1.2 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/index.cjs +98 -0
- package/lib/index.d.ts +2 -2
- package/lib/index.js +15 -51
- package/lib/utils/{generators.mjs → generators.cjs} +10 -6
- package/lib/utils/generators.js +6 -10
- package/package.json +27 -25
- package/lib/index.mjs +0 -62
package/lib/index.cjs
ADDED
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
+
|
|
5
|
+
var BaseClient = require('@logto/client');
|
|
6
|
+
var essentials = require('@silverhand/essentials');
|
|
7
|
+
var fetch = require('node-fetch');
|
|
8
|
+
var generators = require('./utils/generators.cjs');
|
|
9
|
+
|
|
10
|
+
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
11
|
+
|
|
12
|
+
var BaseClient__default = /*#__PURE__*/_interopDefault(BaseClient);
|
|
13
|
+
var fetch__default = /*#__PURE__*/_interopDefault(fetch);
|
|
14
|
+
|
|
15
|
+
class LogtoClient extends BaseClient__default.default {
|
|
16
|
+
constructor(config, adapter) {
|
|
17
|
+
super(config, {
|
|
18
|
+
...adapter,
|
|
19
|
+
requester: BaseClient.createRequester(config.appSecret
|
|
20
|
+
? async (...args) => {
|
|
21
|
+
const [input, init] = args;
|
|
22
|
+
return fetch__default.default(input, {
|
|
23
|
+
...init,
|
|
24
|
+
headers: {
|
|
25
|
+
Authorization: `basic ${Buffer.from(
|
|
26
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
27
|
+
`${config.appId}:${config.appSecret}`, 'utf8').toString('base64')}`,
|
|
28
|
+
...init?.headers,
|
|
29
|
+
},
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
: fetch__default.default),
|
|
33
|
+
generateCodeChallenge: generators.generateCodeChallenge,
|
|
34
|
+
generateCodeVerifier: generators.generateCodeVerifier,
|
|
35
|
+
generateState: generators.generateState,
|
|
36
|
+
});
|
|
37
|
+
this.getContext = async ({ getAccessToken, resource, fetchUserInfo, } = {}) => {
|
|
38
|
+
const isAuthenticated = await this.isAuthenticated();
|
|
39
|
+
if (!isAuthenticated) {
|
|
40
|
+
return {
|
|
41
|
+
isAuthenticated,
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
const claims = await this.getIdTokenClaims();
|
|
45
|
+
if (!getAccessToken) {
|
|
46
|
+
return {
|
|
47
|
+
isAuthenticated,
|
|
48
|
+
claims,
|
|
49
|
+
userInfo: essentials.conditional(fetchUserInfo && (await this.fetchUserInfo())),
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
try {
|
|
53
|
+
const accessToken = await this.getAccessToken(resource);
|
|
54
|
+
return {
|
|
55
|
+
isAuthenticated,
|
|
56
|
+
claims: await this.getIdTokenClaims(),
|
|
57
|
+
userInfo: essentials.conditional(fetchUserInfo && (await this.fetchUserInfo())),
|
|
58
|
+
accessToken,
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
return {
|
|
63
|
+
isAuthenticated: false,
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
Object.defineProperty(exports, 'LogtoClientError', {
|
|
71
|
+
enumerable: true,
|
|
72
|
+
get: function () { return BaseClient.LogtoClientError; }
|
|
73
|
+
});
|
|
74
|
+
Object.defineProperty(exports, 'LogtoError', {
|
|
75
|
+
enumerable: true,
|
|
76
|
+
get: function () { return BaseClient.LogtoError; }
|
|
77
|
+
});
|
|
78
|
+
Object.defineProperty(exports, 'LogtoRequestError', {
|
|
79
|
+
enumerable: true,
|
|
80
|
+
get: function () { return BaseClient.LogtoRequestError; }
|
|
81
|
+
});
|
|
82
|
+
Object.defineProperty(exports, 'OidcError', {
|
|
83
|
+
enumerable: true,
|
|
84
|
+
get: function () { return BaseClient.OidcError; }
|
|
85
|
+
});
|
|
86
|
+
Object.defineProperty(exports, 'Prompt', {
|
|
87
|
+
enumerable: true,
|
|
88
|
+
get: function () { return BaseClient.Prompt; }
|
|
89
|
+
});
|
|
90
|
+
Object.defineProperty(exports, 'ReservedScope', {
|
|
91
|
+
enumerable: true,
|
|
92
|
+
get: function () { return BaseClient.ReservedScope; }
|
|
93
|
+
});
|
|
94
|
+
Object.defineProperty(exports, 'UserScope', {
|
|
95
|
+
enumerable: true,
|
|
96
|
+
get: function () { return BaseClient.UserScope; }
|
|
97
|
+
});
|
|
98
|
+
exports.default = LogtoClient;
|
package/lib/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { LogtoConfig, ClientAdapter } from '@logto/client';
|
|
2
2
|
import BaseClient from '@logto/client';
|
|
3
|
-
import type { GetContextParameters, LogtoContext } from './types';
|
|
4
|
-
export type { LogtoContext, GetContextParameters } from './types';
|
|
3
|
+
import type { GetContextParameters, LogtoContext } from './types.js';
|
|
4
|
+
export type { LogtoContext, GetContextParameters } from './types.js';
|
|
5
5
|
export type { IdTokenClaims, LogtoErrorCode, LogtoConfig, LogtoClientErrorCode, Storage, StorageKey, InteractionMode, } from '@logto/client';
|
|
6
6
|
export { LogtoError, OidcError, Prompt, LogtoRequestError, LogtoClientError, ReservedScope, UserScope, } from '@logto/client';
|
|
7
7
|
export default class LogtoClient extends BaseClient {
|
package/lib/index.js
CHANGED
|
@@ -1,25 +1,17 @@
|
|
|
1
|
-
|
|
1
|
+
import BaseClient, { createRequester } from '@logto/client';
|
|
2
|
+
export { LogtoClientError, LogtoError, LogtoRequestError, OidcError, Prompt, ReservedScope, UserScope } from '@logto/client';
|
|
3
|
+
import { conditional } from '@silverhand/essentials';
|
|
4
|
+
import fetch from 'node-fetch';
|
|
5
|
+
import { generateCodeChallenge, generateCodeVerifier, generateState } from './utils/generators.js';
|
|
2
6
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
var BaseClient = require('@logto/client');
|
|
6
|
-
var essentials = require('@silverhand/essentials');
|
|
7
|
-
var fetch = require('node-fetch');
|
|
8
|
-
var generators = require('./utils/generators.js');
|
|
9
|
-
|
|
10
|
-
function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
11
|
-
|
|
12
|
-
var BaseClient__default = /*#__PURE__*/_interopDefault(BaseClient);
|
|
13
|
-
var fetch__default = /*#__PURE__*/_interopDefault(fetch);
|
|
14
|
-
|
|
15
|
-
class LogtoClient extends BaseClient__default.default {
|
|
7
|
+
class LogtoClient extends BaseClient {
|
|
16
8
|
constructor(config, adapter) {
|
|
17
9
|
super(config, {
|
|
18
10
|
...adapter,
|
|
19
|
-
requester:
|
|
11
|
+
requester: createRequester(config.appSecret
|
|
20
12
|
? async (...args) => {
|
|
21
13
|
const [input, init] = args;
|
|
22
|
-
return
|
|
14
|
+
return fetch(input, {
|
|
23
15
|
...init,
|
|
24
16
|
headers: {
|
|
25
17
|
Authorization: `basic ${Buffer.from(
|
|
@@ -29,10 +21,10 @@ class LogtoClient extends BaseClient__default.default {
|
|
|
29
21
|
},
|
|
30
22
|
});
|
|
31
23
|
}
|
|
32
|
-
:
|
|
33
|
-
generateCodeChallenge
|
|
34
|
-
generateCodeVerifier
|
|
35
|
-
generateState
|
|
24
|
+
: fetch),
|
|
25
|
+
generateCodeChallenge,
|
|
26
|
+
generateCodeVerifier,
|
|
27
|
+
generateState,
|
|
36
28
|
});
|
|
37
29
|
this.getContext = async ({ getAccessToken, resource, fetchUserInfo, } = {}) => {
|
|
38
30
|
const isAuthenticated = await this.isAuthenticated();
|
|
@@ -46,7 +38,7 @@ class LogtoClient extends BaseClient__default.default {
|
|
|
46
38
|
return {
|
|
47
39
|
isAuthenticated,
|
|
48
40
|
claims,
|
|
49
|
-
userInfo:
|
|
41
|
+
userInfo: conditional(fetchUserInfo && (await this.fetchUserInfo())),
|
|
50
42
|
};
|
|
51
43
|
}
|
|
52
44
|
try {
|
|
@@ -54,7 +46,7 @@ class LogtoClient extends BaseClient__default.default {
|
|
|
54
46
|
return {
|
|
55
47
|
isAuthenticated,
|
|
56
48
|
claims: await this.getIdTokenClaims(),
|
|
57
|
-
userInfo:
|
|
49
|
+
userInfo: conditional(fetchUserInfo && (await this.fetchUserInfo())),
|
|
58
50
|
accessToken,
|
|
59
51
|
};
|
|
60
52
|
}
|
|
@@ -67,32 +59,4 @@ class LogtoClient extends BaseClient__default.default {
|
|
|
67
59
|
}
|
|
68
60
|
}
|
|
69
61
|
|
|
70
|
-
|
|
71
|
-
enumerable: true,
|
|
72
|
-
get: function () { return BaseClient.LogtoClientError; }
|
|
73
|
-
});
|
|
74
|
-
Object.defineProperty(exports, 'LogtoError', {
|
|
75
|
-
enumerable: true,
|
|
76
|
-
get: function () { return BaseClient.LogtoError; }
|
|
77
|
-
});
|
|
78
|
-
Object.defineProperty(exports, 'LogtoRequestError', {
|
|
79
|
-
enumerable: true,
|
|
80
|
-
get: function () { return BaseClient.LogtoRequestError; }
|
|
81
|
-
});
|
|
82
|
-
Object.defineProperty(exports, 'OidcError', {
|
|
83
|
-
enumerable: true,
|
|
84
|
-
get: function () { return BaseClient.OidcError; }
|
|
85
|
-
});
|
|
86
|
-
Object.defineProperty(exports, 'Prompt', {
|
|
87
|
-
enumerable: true,
|
|
88
|
-
get: function () { return BaseClient.Prompt; }
|
|
89
|
-
});
|
|
90
|
-
Object.defineProperty(exports, 'ReservedScope', {
|
|
91
|
-
enumerable: true,
|
|
92
|
-
get: function () { return BaseClient.ReservedScope; }
|
|
93
|
-
});
|
|
94
|
-
Object.defineProperty(exports, 'UserScope', {
|
|
95
|
-
enumerable: true,
|
|
96
|
-
get: function () { return BaseClient.UserScope; }
|
|
97
|
-
});
|
|
98
|
-
exports.default = LogtoClient;
|
|
62
|
+
export { LogtoClient as default };
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var crypto = require('crypto');
|
|
4
|
+
var jsBase64 = require('js-base64');
|
|
3
5
|
|
|
4
6
|
/** @link [Proof Key for Code Exchange by OAuth Public Clients](https://datatracker.ietf.org/doc/html/rfc7636) */
|
|
5
7
|
/**
|
|
6
8
|
* @param length The length of the raw random data.
|
|
7
9
|
*/
|
|
8
|
-
const generateRandomString = (length = 64) => fromUint8Array(randomFillSync(new Uint8Array(length)), true);
|
|
10
|
+
const generateRandomString = (length = 64) => jsBase64.fromUint8Array(crypto.randomFillSync(new Uint8Array(length)), true);
|
|
9
11
|
/**
|
|
10
12
|
* Generates random string for state and encodes them in url safe base64
|
|
11
13
|
*/
|
|
@@ -24,10 +26,12 @@ const generateCodeVerifier = () => generateRandomString();
|
|
|
24
26
|
*/
|
|
25
27
|
const generateCodeChallenge = async (codeVerifier) => {
|
|
26
28
|
const encodedCodeVerifier = new TextEncoder().encode(codeVerifier);
|
|
27
|
-
const hash = createHash('sha256');
|
|
29
|
+
const hash = crypto.createHash('sha256');
|
|
28
30
|
hash.update(encodedCodeVerifier);
|
|
29
31
|
const codeChallenge = hash.digest();
|
|
30
|
-
return fromUint8Array(codeChallenge, true);
|
|
32
|
+
return jsBase64.fromUint8Array(codeChallenge, true);
|
|
31
33
|
};
|
|
32
34
|
|
|
33
|
-
|
|
35
|
+
exports.generateCodeChallenge = generateCodeChallenge;
|
|
36
|
+
exports.generateCodeVerifier = generateCodeVerifier;
|
|
37
|
+
exports.generateState = generateState;
|
package/lib/utils/generators.js
CHANGED
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var crypto = require('crypto');
|
|
4
|
-
var jsBase64 = require('js-base64');
|
|
1
|
+
import { createHash, randomFillSync } from 'crypto';
|
|
2
|
+
import { fromUint8Array } from 'js-base64';
|
|
5
3
|
|
|
6
4
|
/** @link [Proof Key for Code Exchange by OAuth Public Clients](https://datatracker.ietf.org/doc/html/rfc7636) */
|
|
7
5
|
/**
|
|
8
6
|
* @param length The length of the raw random data.
|
|
9
7
|
*/
|
|
10
|
-
const generateRandomString = (length = 64) =>
|
|
8
|
+
const generateRandomString = (length = 64) => fromUint8Array(randomFillSync(new Uint8Array(length)), true);
|
|
11
9
|
/**
|
|
12
10
|
* Generates random string for state and encodes them in url safe base64
|
|
13
11
|
*/
|
|
@@ -26,12 +24,10 @@ const generateCodeVerifier = () => generateRandomString();
|
|
|
26
24
|
*/
|
|
27
25
|
const generateCodeChallenge = async (codeVerifier) => {
|
|
28
26
|
const encodedCodeVerifier = new TextEncoder().encode(codeVerifier);
|
|
29
|
-
const hash =
|
|
27
|
+
const hash = createHash('sha256');
|
|
30
28
|
hash.update(encodedCodeVerifier);
|
|
31
29
|
const codeChallenge = hash.digest();
|
|
32
|
-
return
|
|
30
|
+
return fromUint8Array(codeChallenge, true);
|
|
33
31
|
};
|
|
34
32
|
|
|
35
|
-
|
|
36
|
-
exports.generateCodeVerifier = generateCodeVerifier;
|
|
37
|
-
exports.generateState = generateState;
|
|
33
|
+
export { generateCodeChallenge, generateCodeVerifier, generateState };
|
package/package.json
CHANGED
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@logto/node",
|
|
3
|
-
"version": "
|
|
4
|
-
"
|
|
5
|
-
"main": "./lib/index.
|
|
3
|
+
"version": "2.0.0",
|
|
4
|
+
"type": "module",
|
|
5
|
+
"main": "./lib/index.cjs",
|
|
6
|
+
"module": "./lib/index.js",
|
|
7
|
+
"types": "./lib/index.d.ts",
|
|
6
8
|
"exports": {
|
|
7
|
-
"
|
|
8
|
-
"
|
|
9
|
+
"types": "./lib/index.d.ts",
|
|
10
|
+
"require": "./lib/index.cjs",
|
|
11
|
+
"import": "./lib/index.js",
|
|
12
|
+
"default": "./lib/index.js"
|
|
9
13
|
},
|
|
10
|
-
"module": "./lib/index.mjs",
|
|
11
|
-
"types": "./lib/index.d.ts",
|
|
12
14
|
"files": [
|
|
13
15
|
"lib"
|
|
14
16
|
],
|
|
@@ -18,26 +20,15 @@
|
|
|
18
20
|
"url": "https://github.com/logto-io/js.git",
|
|
19
21
|
"directory": "packages/node"
|
|
20
22
|
},
|
|
21
|
-
"scripts": {
|
|
22
|
-
"dev:tsc": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
|
|
23
|
-
"precommit": "lint-staged",
|
|
24
|
-
"check": "tsc --noEmit",
|
|
25
|
-
"build": "rm -rf lib/ && tsc -p tsconfig.build.json --noEmit && rollup -c",
|
|
26
|
-
"lint": "eslint --ext .ts src",
|
|
27
|
-
"test": "jest",
|
|
28
|
-
"test:coverage": "jest --silent --coverage",
|
|
29
|
-
"prepack": "pnpm test"
|
|
30
|
-
},
|
|
31
23
|
"dependencies": {
|
|
32
|
-
"@logto/client": "^
|
|
33
|
-
"@silverhand/essentials": "^2.6.
|
|
24
|
+
"@logto/client": "^2.0.0",
|
|
25
|
+
"@silverhand/essentials": "^2.6.2",
|
|
34
26
|
"js-base64": "^3.7.4",
|
|
35
27
|
"node-fetch": "^2.6.7"
|
|
36
28
|
},
|
|
37
29
|
"devDependencies": {
|
|
38
|
-
"@
|
|
39
|
-
"@silverhand/
|
|
40
|
-
"@silverhand/ts-config": "^1.0.0",
|
|
30
|
+
"@silverhand/eslint-config": "^3.0.1",
|
|
31
|
+
"@silverhand/ts-config": "^3.0.0",
|
|
41
32
|
"@swc/core": "^1.3.7",
|
|
42
33
|
"@swc/jest": "^0.2.24",
|
|
43
34
|
"@types/jest": "^29.5.0",
|
|
@@ -51,11 +42,22 @@
|
|
|
51
42
|
"typescript": "^5.0.0"
|
|
52
43
|
},
|
|
53
44
|
"eslintConfig": {
|
|
54
|
-
"extends": "@silverhand"
|
|
45
|
+
"extends": "@silverhand",
|
|
46
|
+
"rules": {
|
|
47
|
+
"unicorn/prefer-node-protocol": "off"
|
|
48
|
+
}
|
|
55
49
|
},
|
|
56
50
|
"prettier": "@silverhand/eslint-config/.prettierrc",
|
|
57
51
|
"publishConfig": {
|
|
58
52
|
"access": "public"
|
|
59
53
|
},
|
|
60
|
-
"
|
|
61
|
-
|
|
54
|
+
"scripts": {
|
|
55
|
+
"dev:tsc": "tsc -p tsconfig.build.json -w --preserveWatchOutput",
|
|
56
|
+
"precommit": "lint-staged",
|
|
57
|
+
"check": "tsc --noEmit",
|
|
58
|
+
"build": "rm -rf lib/ && tsc -p tsconfig.build.json --noEmit && rollup -c",
|
|
59
|
+
"lint": "eslint --ext .ts src",
|
|
60
|
+
"test": "node test.cjs && jest",
|
|
61
|
+
"test:coverage": "node test.cjs && jest --silent --coverage"
|
|
62
|
+
}
|
|
63
|
+
}
|
package/lib/index.mjs
DELETED
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
import BaseClient, { createRequester } from '@logto/client';
|
|
2
|
-
export { LogtoClientError, LogtoError, LogtoRequestError, OidcError, Prompt, ReservedScope, UserScope } from '@logto/client';
|
|
3
|
-
import { conditional } from '@silverhand/essentials';
|
|
4
|
-
import fetch from 'node-fetch';
|
|
5
|
-
import { generateCodeChallenge, generateCodeVerifier, generateState } from './utils/generators.mjs';
|
|
6
|
-
|
|
7
|
-
class LogtoClient extends BaseClient {
|
|
8
|
-
constructor(config, adapter) {
|
|
9
|
-
super(config, {
|
|
10
|
-
...adapter,
|
|
11
|
-
requester: createRequester(config.appSecret
|
|
12
|
-
? async (...args) => {
|
|
13
|
-
const [input, init] = args;
|
|
14
|
-
return fetch(input, {
|
|
15
|
-
...init,
|
|
16
|
-
headers: {
|
|
17
|
-
Authorization: `basic ${Buffer.from(
|
|
18
|
-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
19
|
-
`${config.appId}:${config.appSecret}`, 'utf8').toString('base64')}`,
|
|
20
|
-
...init?.headers,
|
|
21
|
-
},
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
: fetch),
|
|
25
|
-
generateCodeChallenge,
|
|
26
|
-
generateCodeVerifier,
|
|
27
|
-
generateState,
|
|
28
|
-
});
|
|
29
|
-
this.getContext = async ({ getAccessToken, resource, fetchUserInfo, } = {}) => {
|
|
30
|
-
const isAuthenticated = await this.isAuthenticated();
|
|
31
|
-
if (!isAuthenticated) {
|
|
32
|
-
return {
|
|
33
|
-
isAuthenticated,
|
|
34
|
-
};
|
|
35
|
-
}
|
|
36
|
-
const claims = await this.getIdTokenClaims();
|
|
37
|
-
if (!getAccessToken) {
|
|
38
|
-
return {
|
|
39
|
-
isAuthenticated,
|
|
40
|
-
claims,
|
|
41
|
-
userInfo: conditional(fetchUserInfo && (await this.fetchUserInfo())),
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
|
-
try {
|
|
45
|
-
const accessToken = await this.getAccessToken(resource);
|
|
46
|
-
return {
|
|
47
|
-
isAuthenticated,
|
|
48
|
-
claims: await this.getIdTokenClaims(),
|
|
49
|
-
userInfo: conditional(fetchUserInfo && (await this.fetchUserInfo())),
|
|
50
|
-
accessToken,
|
|
51
|
-
};
|
|
52
|
-
}
|
|
53
|
-
catch {
|
|
54
|
-
return {
|
|
55
|
-
isAuthenticated: false,
|
|
56
|
-
};
|
|
57
|
-
}
|
|
58
|
-
};
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
export { LogtoClient as default };
|