@steedos/accounts 2.4.6 → 2.4.8-beta.1
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.
|
@@ -47,7 +47,6 @@ var geetest_validate = function (req, res, next) {
|
|
|
47
47
|
return tslib_1.__generator(this, function (_a) {
|
|
48
48
|
switch (_a.label) {
|
|
49
49
|
case 0:
|
|
50
|
-
if (!process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED) return [3, 8];
|
|
51
50
|
if (!(validator.toBoolean(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED) === true)) return [3, 6];
|
|
52
51
|
gtLib = new GeetestLib(GeetestConfig.GEETEST_ID, GeetestConfig.GEETEST_KEY);
|
|
53
52
|
if (!req.body.geetest) return [3, 4];
|
|
@@ -73,18 +72,12 @@ var geetest_validate = function (req, res, next) {
|
|
|
73
72
|
return [2, res.json({ "result": "fail", "version": GeetestLib.VERSION, "msg": result.msg })];
|
|
74
73
|
}
|
|
75
74
|
return [3, 5];
|
|
76
|
-
case 4:
|
|
77
|
-
next();
|
|
78
|
-
_a.label = 5;
|
|
75
|
+
case 4: return [2, res.json({ "result": "fail", "version": GeetestLib.VERSION, "msg": '无验证信息' })];
|
|
79
76
|
case 5: return [3, 7];
|
|
80
77
|
case 6:
|
|
81
78
|
next();
|
|
82
79
|
_a.label = 7;
|
|
83
|
-
case 7: return [
|
|
84
|
-
case 8:
|
|
85
|
-
next();
|
|
86
|
-
_a.label = 9;
|
|
87
|
-
case 9: return [2];
|
|
80
|
+
case 7: return [2];
|
|
88
81
|
}
|
|
89
82
|
});
|
|
90
83
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geetest-init.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/geetestV3/geetest-init.ts"],"names":[],"mappings":";;;;AACA,IAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,IAAM,aAAa,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAA;AACrD,IAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;AAC/C,IAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAEvC,IAAI,cAAc,GAAG,IAAI,CAAA;AAGlB,IAAM,YAAY,GAAG,UAAC,IAAS,IAAK,OAAA,UACvC,GAAoB,EACpB,GAAqB;;;;;;gBAWX,KAAK,GAAG,IAAI,UAAU,CAAC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;gBAC5E,SAAS,GAAG,KAAK,CAAC;gBAClB,MAAM,GAAG,MAAM,CAAC;gBAChB,MAAM,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,CAAA;gBACvG,WAAW,GAAG,cAAc,CAAA;gBAC9B,MAAM,SAAA,CAAC;qBACP,CAAA,WAAW,KAAK,SAAS,CAAA,EAAzB,cAAyB;gBAChB,WAAM,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,EAAA;;gBAAhD,MAAM,GAAG,SAAuC,CAAC;;oBAExC,WAAM,KAAK,CAAC,aAAa,EAAE,EAAA;;gBAApC,MAAM,GAAG,SAA2B,CAAC;;;gBAEzC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,gCAAgC,CAAC,CAAA;gBACzD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;;;;gBAErB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAG,CAAC,CAAA;;oBAE3B,WAAM;;;KACT,EA9B0C,CA8B1C,CAAC;AA9BW,QAAA,YAAY,gBA8BvB;AAGK,IAAM,gBAAgB,GAAG,UAAgB,GAAG,EAAE,GAAG,EAAE,IAAI;;;;;;
|
|
1
|
+
{"version":3,"file":"geetest-init.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/geetestV3/geetest-init.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/accounts",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.4.
|
|
4
|
+
"version": "2.4.8-beta.1",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"files": [
|
|
7
7
|
"/package.json",
|
|
@@ -56,20 +56,20 @@
|
|
|
56
56
|
"validator": "^13.6.0"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@steedos/auth": "2.4.
|
|
60
|
-
"@steedos/meteor-bundle-runner": "2.4.
|
|
61
|
-
"@steedos/objectql": "2.4.
|
|
59
|
+
"@steedos/auth": "2.4.8-beta.1",
|
|
60
|
+
"@steedos/meteor-bundle-runner": "2.4.8-beta.1",
|
|
61
|
+
"@steedos/objectql": "2.4.8-beta.1",
|
|
62
62
|
"@types/dotenv-flow": "^3.0.0",
|
|
63
63
|
"@types/node": "12.6.8",
|
|
64
64
|
"cross-env": "^7.0.3",
|
|
65
65
|
"dotenv": "^8.2.0",
|
|
66
66
|
"dotenv-flow": "^3.1.0",
|
|
67
67
|
"nodemon": "^2.0.19",
|
|
68
|
-
"steedos-server": "2.4.
|
|
68
|
+
"steedos-server": "2.4.8-beta.1",
|
|
69
69
|
"typescript": "4.6.3"
|
|
70
70
|
},
|
|
71
71
|
"publishConfig": {
|
|
72
72
|
"access": "public"
|
|
73
73
|
},
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "f35130770cfb86468309f8f9a8ce21a3bbb5b2f6"
|
|
75
75
|
}
|
|
@@ -41,38 +41,33 @@ export const geetest_init = (data: any) => async (
|
|
|
41
41
|
|
|
42
42
|
// 二次验证接口，POST请求
|
|
43
43
|
export const geetest_validate = async function (req, res, next) {
|
|
44
|
-
if(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED){
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
if (bypasscache === "success") {
|
|
56
|
-
result = await gtLib.successValidate(challenge, validate, seccode, params);
|
|
57
|
-
} else {
|
|
58
|
-
result = gtLib.failValidate(challenge, validate, seccode);
|
|
59
|
-
}
|
|
60
|
-
// 注意，不要更改返回的结构和值类型
|
|
61
|
-
if (result.status === 1) {
|
|
62
|
-
next()
|
|
63
|
-
} else {
|
|
64
|
-
return res.json({ "result": "fail", "version": GeetestLib.VERSION, "msg": result.msg });
|
|
65
|
-
}
|
|
44
|
+
if (validator.toBoolean(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED) === true) {
|
|
45
|
+
const gtLib = new GeetestLib(GeetestConfig.GEETEST_ID, GeetestConfig.GEETEST_KEY);
|
|
46
|
+
if (req.body.geetest) {
|
|
47
|
+
const challenge = req.body.geetest[GeetestLib.GEETEST_CHALLENGE];
|
|
48
|
+
const validate = req.body.geetest[GeetestLib.GEETEST_VALIDATE];
|
|
49
|
+
const seccode = req.body.geetest[GeetestLib.GEETEST_SECCODE];
|
|
50
|
+
const bypasscache = geetest_status;
|
|
51
|
+
let result;
|
|
52
|
+
var params = new Array();
|
|
53
|
+
if (bypasscache === "success") {
|
|
54
|
+
result = await gtLib.successValidate(challenge, validate, seccode, params);
|
|
66
55
|
} else {
|
|
56
|
+
result = gtLib.failValidate(challenge, validate, seccode);
|
|
57
|
+
}
|
|
58
|
+
// 注意，不要更改返回的结构和值类型
|
|
59
|
+
if (result.status === 1) {
|
|
67
60
|
next()
|
|
61
|
+
} else {
|
|
62
|
+
return res.json({ "result": "fail", "version": GeetestLib.VERSION, "msg": result.msg });
|
|
68
63
|
}
|
|
69
64
|
} else {
|
|
70
|
-
|
|
65
|
+
return res.json({ "result": "fail", "version": GeetestLib.VERSION, "msg": '无验证信息' });
|
|
71
66
|
}
|
|
72
|
-
|
|
73
|
-
}else{
|
|
67
|
+
} else {
|
|
74
68
|
next()
|
|
75
69
|
}
|
|
70
|
+
|
|
76
71
|
}
|
|
77
72
|
|
|
78
73
|
|