@cloudbase/oauth 2.5.38-beta.0 → 2.5.39-beta.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/dist/cjs/utils/encrypt.js +1 -10
- package/dist/esm/utils/encrypt.js +1 -10
- package/package.json +2 -2
- package/src/utils/encrypt.ts +9 -9
|
@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getEncryptInfo = void 0;
|
|
7
7
|
var encryptlong_1 = __importDefault(require("encryptlong"));
|
|
8
|
-
var hmac_sha256_1 = __importDefault(require("crypto-js/hmac-sha256"));
|
|
9
|
-
var lib_typedarrays_1 = __importDefault(require("crypto-js/lib-typedarrays"));
|
|
10
8
|
var _1 = require(".");
|
|
11
9
|
var getEncryptInfo = function (_a) {
|
|
12
10
|
var _b = _a === void 0 ? {} : _a, _c = _b.publicKey, publicKey = _c === void 0 ? '' : _c, _d = _b.payload, payload = _d === void 0 ? {} : _d;
|
|
@@ -16,13 +14,6 @@ var getEncryptInfo = function (_a) {
|
|
|
16
14
|
var params = (0, _1.deepClone)(payload);
|
|
17
15
|
var rsaInstance = new encryptlong_1.default();
|
|
18
16
|
rsaInstance.setPublicKey(publicKey);
|
|
19
|
-
params.timestamp = +new Date();
|
|
20
|
-
var signMethod = 'HmacSHA256';
|
|
21
|
-
var nonce = lib_typedarrays_1.default.random(16).toString();
|
|
22
|
-
var signature = (0, hmac_sha256_1.default)(JSON.stringify(params), nonce).toString();
|
|
23
|
-
params.signature = signature;
|
|
24
|
-
params.nonce = nonce;
|
|
25
|
-
params.signMethod = signMethod;
|
|
26
17
|
var encrypted = rsaInstance.encryptLong(JSON.stringify(params));
|
|
27
18
|
return encrypted;
|
|
28
19
|
}
|
|
@@ -31,4 +22,4 @@ var getEncryptInfo = function (_a) {
|
|
|
31
22
|
return '';
|
|
32
23
|
};
|
|
33
24
|
exports.getEncryptInfo = getEncryptInfo;
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5jcnlwdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy91dGlscy9lbmNyeXB0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDREQUFtQztBQUduQyxzQkFBNkI7QUFRdEIsSUFBTSxjQUFjLEdBQUcsVUFBQyxFQUFxQztRQUFyQyxxQkFBbUMsRUFBRSxLQUFBLEVBQW5DLGlCQUFjLEVBQWQsU0FBUyxtQkFBRyxFQUFFLEtBQUEsRUFBRSxlQUFZLEVBQVosT0FBTyxtQkFBRyxFQUFFLEtBQUE7SUFDM0QsSUFBSSxDQUFDLFNBQVM7UUFBRSxPQUFPLEVBQUUsQ0FBQTtJQUV6QixJQUFJO1FBQ0YsSUFBTSxNQUFNLEdBQUcsSUFBQSxZQUFTLEVBQUMsT0FBTyxDQUFDLENBQUE7UUFFakMsSUFBTSxXQUFXLEdBQUcsSUFBSSxxQkFBUyxFQUFFLENBQUE7UUFFbkMsV0FBVyxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQWNuQyxJQUFNLFNBQVMsR0FBRyxXQUFXLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQTtRQUVqRSxPQUFPLFNBQVMsQ0FBQTtLQUNqQjtJQUFDLE9BQU8sS0FBSyxFQUFFO0tBRWY7SUFFRCxPQUFPLEVBQUUsQ0FBQTtBQUNYLENBQUMsQ0FBQTtBQTlCWSxRQUFBLGNBQWMsa0JBOEIxQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBKU0VuY3J5cHQgZnJvbSAnZW5jcnlwdGxvbmcnXG4vLyBpbXBvcnQgSG1hY1NIQTI1NiBmcm9tICdjcnlwdG8tanMvaG1hYy1zaGEyNTYnXG4vLyBpbXBvcnQgV29yZEFycmF5IGZyb20gJ2NyeXB0by1qcy9saWItdHlwZWRhcnJheXMnXG5pbXBvcnQgeyBkZWVwQ2xvbmUgfSBmcm9tICcuJ1xuXG4vKipcbiAqIOeUn+aIkFJTQeWFrOmSpeWKoOWvhuWQjueahOaVsOaNrlxuICogQHBhcmFtIHBhcmFtMC5wdWJsaWNLZXkgUlNB5YWs6ZKlXG4gKiBAcGFyYW0gcGFyYW0wLnBheWxvYWQg5Yqg5a+G5YmN55qE5pWw5o2uXG4gKiBAcmV0dXJucyB7c3RyaW5nfSDliqDlr4blkI7nmoTmlbDmja5cbiAqL1xuZXhwb3J0IGNvbnN0IGdldEVuY3J5cHRJbmZvID0gKHsgcHVibGljS2V5ID0gJycsIHBheWxvYWQgPSB7fSB9ID0ge30pID0+IHtcbiAgaWYgKCFwdWJsaWNLZXkpIHJldHVybiAnJ1xuXG4gIHRyeSB7XG4gICAgY29uc3QgcGFyYW1zID0gZGVlcENsb25lKHBheWxvYWQpXG4gICAgLy8g55Sf5oiQUlNB5a6e5L6LXG4gICAgY29uc3QgcnNhSW5zdGFuY2UgPSBuZXcgSlNFbmNyeXB0KClcbiAgICAvLyDorr7nva7lhazpkqVcbiAgICByc2FJbnN0YW5jZS5zZXRQdWJsaWNLZXkocHVibGljS2V5KVxuICAgIC8vIOeUn+aIkOaXtumXtOaIs1xuICAgIC8vIHBhcmFtcy50aW1lc3RhbXAgPSArbmV3IERhdGUoKVxuICAgIC8vIOehruWumuetvuWQjeeul+azlVxuICAgIC8vIGNvbnN0IHNpZ25NZXRob2QgPSAnSG1hY1NIQTI1NidcbiAgICAvLyDnlJ/miJDpmo/mnLrmlbBcbiAgICAvLyBjb25zdCBub25jZSA9IFdvcmRBcnJheS5yYW5kb20oMTYpLnRvU3RyaW5nKClcbiAgICAvLyDnlJ/miJDnrb7lkI3vvJrln7rmnKzlj4LmlbDjgIHml7bpl7TmiLMgKyDpmo/mnLrmlbBcbiAgICAvLyBjb25zdCBzaWduYXR1cmUgPSBIbWFjU0hBMjU2KEpTT04uc3RyaW5naWZ5KHBhcmFtcyksIG5vbmNlKS50b1N0cmluZygpXG4gICAgLy8g5bCG562+5ZCN5pS+5YWl5Y+C5pWw5LitXG4gICAgLy8gcGFyYW1zLnNpZ25hdHVyZSA9IHNpZ25hdHVyZVxuICAgIC8vIHBhcmFtcy5ub25jZSA9IG5vbmNlXG4gICAgLy8gcGFyYW1zLnNpZ25NZXRob2QgPSBzaWduTWV0aG9kXG4gICAgLy8gcnNh5YWs6ZKl5Yqg5a+GXG4gICAgY29uc3QgZW5jcnlwdGVkID0gcnNhSW5zdGFuY2UuZW5jcnlwdExvbmcoSlNPTi5zdHJpbmdpZnkocGFyYW1zKSlcblxuICAgIHJldHVybiBlbmNyeXB0ZWRcbiAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICAvL1xuICB9XG5cbiAgcmV0dXJuICcnXG59XG4iXX0=
|
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import JSEncrypt from 'encryptlong';
|
|
2
|
-
import HmacSHA256 from 'crypto-js/hmac-sha256';
|
|
3
|
-
import WordArray from 'crypto-js/lib-typedarrays';
|
|
4
2
|
import { deepClone } from '.';
|
|
5
3
|
export var getEncryptInfo = function (_a) {
|
|
6
4
|
var _b = _a === void 0 ? {} : _a, _c = _b.publicKey, publicKey = _c === void 0 ? '' : _c, _d = _b.payload, payload = _d === void 0 ? {} : _d;
|
|
@@ -10,13 +8,6 @@ export var getEncryptInfo = function (_a) {
|
|
|
10
8
|
var params = deepClone(payload);
|
|
11
9
|
var rsaInstance = new JSEncrypt();
|
|
12
10
|
rsaInstance.setPublicKey(publicKey);
|
|
13
|
-
params.timestamp = +new Date();
|
|
14
|
-
var signMethod = 'HmacSHA256';
|
|
15
|
-
var nonce = WordArray.random(16).toString();
|
|
16
|
-
var signature = HmacSHA256(JSON.stringify(params), nonce).toString();
|
|
17
|
-
params.signature = signature;
|
|
18
|
-
params.nonce = nonce;
|
|
19
|
-
params.signMethod = signMethod;
|
|
20
11
|
var encrypted = rsaInstance.encryptLong(JSON.stringify(params));
|
|
21
12
|
return encrypted;
|
|
22
13
|
}
|
|
@@ -24,4 +15,4 @@ export var getEncryptInfo = function (_a) {
|
|
|
24
15
|
}
|
|
25
16
|
return '';
|
|
26
17
|
};
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5jcnlwdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy91dGlscy9lbmNyeXB0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sU0FBUyxNQUFNLGFBQWEsQ0FBQTtBQUduQyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sR0FBRyxDQUFBO0FBUTdCLE1BQU0sQ0FBQyxJQUFNLGNBQWMsR0FBRyxVQUFDLEVBQXFDO1FBQXJDLHFCQUFtQyxFQUFFLEtBQUEsRUFBbkMsaUJBQWMsRUFBZCxTQUFTLG1CQUFHLEVBQUUsS0FBQSxFQUFFLGVBQVksRUFBWixPQUFPLG1CQUFHLEVBQUUsS0FBQTtJQUMzRCxJQUFJLENBQUMsU0FBUztRQUFFLE9BQU8sRUFBRSxDQUFBO0lBRXpCLElBQUk7UUFDRixJQUFNLE1BQU0sR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUE7UUFFakMsSUFBTSxXQUFXLEdBQUcsSUFBSSxTQUFTLEVBQUUsQ0FBQTtRQUVuQyxXQUFXLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBY25DLElBQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFBO1FBRWpFLE9BQU8sU0FBUyxDQUFBO0tBQ2pCO0lBQUMsT0FBTyxLQUFLLEVBQUU7S0FFZjtJQUVELE9BQU8sRUFBRSxDQUFBO0FBQ1gsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IEpTRW5jcnlwdCBmcm9tICdlbmNyeXB0bG9uZydcbi8vIGltcG9ydCBIbWFjU0hBMjU2IGZyb20gJ2NyeXB0by1qcy9obWFjLXNoYTI1Nidcbi8vIGltcG9ydCBXb3JkQXJyYXkgZnJvbSAnY3J5cHRvLWpzL2xpYi10eXBlZGFycmF5cydcbmltcG9ydCB7IGRlZXBDbG9uZSB9IGZyb20gJy4nXG5cbi8qKlxuICog55Sf5oiQUlNB5YWs6ZKl5Yqg5a+G5ZCO55qE5pWw5o2uXG4gKiBAcGFyYW0gcGFyYW0wLnB1YmxpY0tleSBSU0HlhazpkqVcbiAqIEBwYXJhbSBwYXJhbTAucGF5bG9hZCDliqDlr4bliY3nmoTmlbDmja5cbiAqIEByZXR1cm5zIHtzdHJpbmd9IOWKoOWvhuWQjueahOaVsOaNrlxuICovXG5leHBvcnQgY29uc3QgZ2V0RW5jcnlwdEluZm8gPSAoeyBwdWJsaWNLZXkgPSAnJywgcGF5bG9hZCA9IHt9IH0gPSB7fSkgPT4ge1xuICBpZiAoIXB1YmxpY0tleSkgcmV0dXJuICcnXG5cbiAgdHJ5IHtcbiAgICBjb25zdCBwYXJhbXMgPSBkZWVwQ2xvbmUocGF5bG9hZClcbiAgICAvLyDnlJ/miJBSU0Hlrp7kvotcbiAgICBjb25zdCByc2FJbnN0YW5jZSA9IG5ldyBKU0VuY3J5cHQoKVxuICAgIC8vIOiuvue9ruWFrOmSpVxuICAgIHJzYUluc3RhbmNlLnNldFB1YmxpY0tleShwdWJsaWNLZXkpXG4gICAgLy8g55Sf5oiQ5pe26Ze05oizXG4gICAgLy8gcGFyYW1zLnRpbWVzdGFtcCA9ICtuZXcgRGF0ZSgpXG4gICAgLy8g56Gu5a6a562+5ZCN566X5rOVXG4gICAgLy8gY29uc3Qgc2lnbk1ldGhvZCA9ICdIbWFjU0hBMjU2J1xuICAgIC8vIOeUn+aIkOmaj+acuuaVsFxuICAgIC8vIGNvbnN0IG5vbmNlID0gV29yZEFycmF5LnJhbmRvbSgxNikudG9TdHJpbmcoKVxuICAgIC8vIOeUn+aIkOetvuWQje+8muWfuuacrOWPguaVsOOAgeaXtumXtOaIsyArIOmaj+acuuaVsFxuICAgIC8vIGNvbnN0IHNpZ25hdHVyZSA9IEhtYWNTSEEyNTYoSlNPTi5zdHJpbmdpZnkocGFyYW1zKSwgbm9uY2UpLnRvU3RyaW5nKClcbiAgICAvLyDlsIbnrb7lkI3mlL7lhaXlj4LmlbDkuK1cbiAgICAvLyBwYXJhbXMuc2lnbmF0dXJlID0gc2lnbmF0dXJlXG4gICAgLy8gcGFyYW1zLm5vbmNlID0gbm9uY2VcbiAgICAvLyBwYXJhbXMuc2lnbk1ldGhvZCA9IHNpZ25NZXRob2RcbiAgICAvLyByc2HlhazpkqXliqDlr4ZcbiAgICBjb25zdCBlbmNyeXB0ZWQgPSByc2FJbnN0YW5jZS5lbmNyeXB0TG9uZyhKU09OLnN0cmluZ2lmeShwYXJhbXMpKVxuXG4gICAgcmV0dXJuIGVuY3J5cHRlZFxuICB9IGNhdGNoIChlcnJvcikge1xuICAgIC8vXG4gIH1cblxuICByZXR1cm4gJydcbn1cbiJdfQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudbase/oauth",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.39-beta.0",
|
|
4
4
|
"description": "cloudbase javascript sdk auth componets",
|
|
5
5
|
"main": "dist/cjs/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -21,5 +21,5 @@
|
|
|
21
21
|
"encryptlong": "^3.1.4"
|
|
22
22
|
},
|
|
23
23
|
"license": "Apache-2.0",
|
|
24
|
-
"gitHead": "
|
|
24
|
+
"gitHead": "3b38f0f9222b02585f8918b150a82f5c230e9b49"
|
|
25
25
|
}
|
package/src/utils/encrypt.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import JSEncrypt from 'encryptlong'
|
|
2
|
-
import HmacSHA256 from 'crypto-js/hmac-sha256'
|
|
3
|
-
import WordArray from 'crypto-js/lib-typedarrays'
|
|
2
|
+
// import HmacSHA256 from 'crypto-js/hmac-sha256'
|
|
3
|
+
// import WordArray from 'crypto-js/lib-typedarrays'
|
|
4
4
|
import { deepClone } from '.'
|
|
5
5
|
|
|
6
6
|
/**
|
|
@@ -19,17 +19,17 @@ export const getEncryptInfo = ({ publicKey = '', payload = {} } = {}) => {
|
|
|
19
19
|
// 设置公钥
|
|
20
20
|
rsaInstance.setPublicKey(publicKey)
|
|
21
21
|
// 生成时间戳
|
|
22
|
-
params.timestamp = +new Date()
|
|
22
|
+
// params.timestamp = +new Date()
|
|
23
23
|
// 确定签名算法
|
|
24
|
-
const signMethod = 'HmacSHA256'
|
|
24
|
+
// const signMethod = 'HmacSHA256'
|
|
25
25
|
// 生成随机数
|
|
26
|
-
const nonce = WordArray.random(16).toString()
|
|
26
|
+
// const nonce = WordArray.random(16).toString()
|
|
27
27
|
// 生成签名：基本参数、时间戳 + 随机数
|
|
28
|
-
const signature = HmacSHA256(JSON.stringify(params), nonce).toString()
|
|
28
|
+
// const signature = HmacSHA256(JSON.stringify(params), nonce).toString()
|
|
29
29
|
// 将签名放入参数中
|
|
30
|
-
params.signature = signature
|
|
31
|
-
params.nonce = nonce
|
|
32
|
-
params.signMethod = signMethod
|
|
30
|
+
// params.signature = signature
|
|
31
|
+
// params.nonce = nonce
|
|
32
|
+
// params.signMethod = signMethod
|
|
33
33
|
// rsa公钥加密
|
|
34
34
|
const encrypted = rsaInstance.encryptLong(JSON.stringify(params))
|
|
35
35
|
|