@steedos/accounts 2.4.2 → 2.4.4

package/lib/rest-express/endpoints/geetestV3/geetest-init.js

@@ -0,0 +1,157 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.geetest_validate = exports.geetest_init = void 0;
+var tslib_1 = require("tslib");
+var axios = require("axios");
+var GeetestConfig = require('./sdk/geetest_config');
+var GeetestLib = require('./sdk/geetest_lib');
+var validator = require('validator');
+var geetest_status = null;
+var geetest_init = function (data) { return function (req, res) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+    var gtLib, digestmod, userId, params, bypasscache, result, err_1;
+    return tslib_1.__generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                _a.trys.push([0, 5, , 6]);
+                gtLib = new GeetestLib(GeetestConfig.GEETEST_ID, GeetestConfig.GEETEST_KEY);
+                digestmod = "md5";
+                userId = "test";
+                params = { "digestmod": digestmod, "user_id": userId, "client_type": "web", "ip_address": "127.0.0.1" };
+                bypasscache = geetest_status;
+                result = void 0;
+                if (!(bypasscache === "success")) return [3, 2];
+                return [4, gtLib.register(digestmod, params)];
+            case 1:
+                result = _a.sent();
+                return [3, 4];
+            case 2: return [4, gtLib.localRegister()];
+            case 3:
+                result = _a.sent();
+                _a.label = 4;
+            case 4:
+                res.set('Content-Type', 'application/json;charset=UTF-8');
+                res.send(result.data);
+                return [3, 6];
+            case 5:
+                err_1 = _a.sent();
+                console.log('err', err_1);
+                return [3, 6];
+            case 6: return [2];
+        }
+    });
+}); }; };
+exports.geetest_init = geetest_init;
+var geetest_validate = function (req, res, next) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var gtLib, challenge, validate, seccode, bypasscache, result, params;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED) return [3, 8];
+                    if (!(validator.toBoolean(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED) === true)) return [3, 6];
+                    gtLib = new GeetestLib(GeetestConfig.GEETEST_ID, GeetestConfig.GEETEST_KEY);
+                    if (!req.body.geetest) return [3, 4];
+                    challenge = req.body.geetest[GeetestLib.GEETEST_CHALLENGE];
+                    validate = req.body.geetest[GeetestLib.GEETEST_VALIDATE];
+                    seccode = req.body.geetest[GeetestLib.GEETEST_SECCODE];
+                    bypasscache = geetest_status;
+                    result = void 0;
+                    params = new Array();
+                    if (!(bypasscache === "success")) return [3, 2];
+                    return [4, gtLib.successValidate(challenge, validate, seccode, params)];
+                case 1:
+                    result = _a.sent();
+                    return [3, 3];
+                case 2:
+                    result = gtLib.failValidate(challenge, validate, seccode);
+                    _a.label = 3;
+                case 3:
+                    if (result.status === 1) {
+                        next();
+                    }
+                    else {
+                        return [2, res.json({ "result": "fail", "version": GeetestLib.VERSION, "msg": result.msg })];
+                    }
+                    return [3, 5];
+                case 4:
+                    next();
+                    _a.label = 5;
+                case 5: return [3, 7];
+                case 6:
+                    next();
+                    _a.label = 7;
+                case 7: return [3, 9];
+                case 8:
+                    next();
+                    _a.label = 9;
+                case 9: return [2];
+            }
+        });
+    });
+};
+exports.geetest_validate = geetest_validate;
+function sendRequest(params) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var request_url, bypass_res, res, resBody, e_1;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    request_url = GeetestConfig.BYPASS_URL;
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4, axios({
+                            url: request_url,
+                            method: "GET",
+                            timeout: 5000,
+                            params: params
+                        })];
+                case 2:
+                    res = _a.sent();
+                    resBody = (res.status === 200) ? res.data : "";
+                    bypass_res = resBody["status"];
+                    return [3, 4];
+                case 3:
+                    e_1 = _a.sent();
+                    bypass_res = "";
+                    return [3, 4];
+                case 4: return [2, bypass_res];
+            }
+        });
+    });
+}
+function sleep() {
+    return new Promise(function (resolve) {
+        setTimeout(resolve, GeetestConfig.CYCLE_TIME * 1000);
+    });
+}
+var bypass_status = 'success';
+function checkBypassStatus() {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!true) return [3, 3];
+                    return [4, sendRequest({ "gt": GeetestConfig.GEETEST_ID })];
+                case 1:
+                    bypass_status = _a.sent();
+                    if (bypass_status === "success") {
+                        geetest_status = bypass_status;
+                    }
+                    else {
+                        bypass_status = "fail";
+                        geetest_status = 'fail';
+                    }
+                    return [4, sleep()];
+                case 2:
+                    _a.sent();
+                    return [3, 0];
+                case 3: return [2];
+            }
+        });
+    });
+}
+if (process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED === 'true') {
+    checkBypassStatus();
+}
+//# sourceMappingURL=geetest-init.js.map

package/lib/rest-express/endpoints/geetestV3/geetest-init.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"geetest-init.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/geetestV3/geetest-init.ts"],"names":[],"mappings":"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"}

package/lib/rest-express/endpoints/geetestV3/sdk/geetest_config.js

@@ -0,0 +1,11 @@
+var GeetestConfig = Object.freeze({
+    GEETEST_ID: process.env.STEEDOS_CAPTCHA_GEETEST_ID,
+    GEETEST_KEY: process.env.STEEDOS_CAPTCHA_GEETEST_KEY,
+    REDIS_HOST: "127.0.0.1",
+    REDIS_PORT: "6379",
+    BYPASS_URL: "http://bypass.geetest.com/v1/bypass_status.php",
+    CYCLE_TIME: 10,
+    GEETEST_BYPASS_STATUS_KEY: "gt_server_bypass_status"
+});
+module.exports = GeetestConfig;
+//# sourceMappingURL=geetest_config.js.map

package/lib/rest-express/endpoints/geetestV3/sdk/geetest_config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"geetest_config.js","sourceRoot":"","sources":["../../../../../src/rest-express/endpoints/geetestV3/sdk/geetest_config.js"],"names":[],"mappings":"AAAA,IAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;IAClD,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B;IACpD,UAAU,EAAE,WAAW;IACvB,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,gDAAgD;IAC5D,UAAU,EAAE,EAAE;IACd,yBAAyB,EAAE,yBAAyB;CACvD,CAAC,CAAA;AAEF,MAAM,CAAC,OAAO,GAAG,aAAa,CAAA"}

package/lib/rest-express/endpoints/geetestV3/sdk/geetest_lib.js

@@ -0,0 +1,211 @@
+var tslib_1 = require("tslib");
+var stringRandom = require('string-random');
+var crypto = require('crypto');
+var axios = require('axios');
+var qs = require('qs');
+var GeetestLibResult = require("./geetest_lib_result");
+var GeetestLib = (function () {
+    function GeetestLib(geetest_id, geetest_key) {
+        this.geetest_id = geetest_id;
+        this.geetest_key = geetest_key;
+        this.libResult = new GeetestLibResult();
+    }
+    GeetestLib.prototype.gtlog = function (message) {
+        if (GeetestLib.IS_DEBUG) {
+            console.log("gtlog: " + message);
+        }
+    };
+    GeetestLib.prototype.register = function (digestmod, params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var origin_challenge;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, this.requestRegister(params)];
+                    case 1:
+                        origin_challenge = _a.sent();
+                        this.buildRegisterResult(origin_challenge, digestmod);
+                        return [2, this.libResult];
+                }
+            });
+        });
+    };
+    GeetestLib.prototype.requestRegister = function (params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var register_url, origin_challenge, res, resBody, e_1;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        params = Object.assign(params, {
+                            "gt": this.geetest_id,
+                            "json_format": GeetestLib.JSON_FORMAT,
+                            "sdk": GeetestLib.VERSION
+                        });
+                        register_url = GeetestLib.API_URL + GeetestLib.REGISTER_URL;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, axios({
+                                url: register_url,
+                                method: "GET",
+                                timeout: GeetestLib.HTTP_TIMEOUT_DEFAULT,
+                                params: params
+                            })];
+                    case 2:
+                        res = _a.sent();
+                        resBody = (res.status === 200) ? res.data : "";
+                        origin_challenge = resBody["challenge"];
+                        return [3, 4];
+                    case 3:
+                        e_1 = _a.sent();
+                        origin_challenge = "";
+                        return [3, 4];
+                    case 4: return [2, origin_challenge];
+                }
+            });
+        });
+    };
+    GeetestLib.prototype.localRegister = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                this.buildRegisterResult("", "");
+                return [2, this.libResult];
+            });
+        });
+    };
+    GeetestLib.prototype.buildRegisterResult = function (origin_challenge, digestmod) {
+        if (!origin_challenge || origin_challenge === "0") {
+            var challenge = stringRandom(32).toLowerCase();
+            var data = {
+                "success": 0,
+                "gt": this.geetest_id,
+                "challenge": challenge,
+                "new_captcha": GeetestLib.NEW_CAPTCHA
+            };
+            this.libResult.setAll(0, JSON.stringify(data), "获取当前缓存中bypass状态为fail，本地生成challenge，后续流程走宕机模式");
+        }
+        else {
+            var challenge = void 0;
+            if (digestmod === "md5") {
+                challenge = this.md5_encode(origin_challenge + this.geetest_key);
+            }
+            else if (digestmod === "sha256") {
+                challenge = this.sha256_encode(origin_challenge + this.geetest_key);
+            }
+            else if (digestmod === "hmac-sha256") {
+                challenge = this.hmac_sha256_encode(origin_challenge, this.geetest_key);
+            }
+            else {
+                challenge = this.md5_encode(origin_challenge + this.geetest_key);
+            }
+            var data = {
+                "success": 1,
+                "gt": this.geetest_id,
+                "challenge": challenge,
+                "new_captcha": GeetestLib.NEW_CAPTCHA
+            };
+            this.libResult.setAll(1, JSON.stringify(data), "");
+        }
+    };
+    GeetestLib.prototype.successValidate = function (challenge, validate, seccode, params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var response_seccode;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!!this.checkParam(challenge, validate, seccode)) return [3, 1];
+                        this.libResult.setAll(0, "", "正常模式，本地校验，参数challenge、validate、seccode不可为空");
+                        return [3, 3];
+                    case 1: return [4, this.requestValidate(challenge, validate, seccode, params)];
+                    case 2:
+                        response_seccode = _a.sent();
+                        if (!response_seccode) {
+                            this.libResult.setAll(0, "", "请求极验validate接口失败");
+                        }
+                        else if (response_seccode === "false") {
+                            this.libResult.setAll(0, "", "极验二次验证不通过");
+                        }
+                        else {
+                            this.libResult.setAll(1, "", "");
+                        }
+                        _a.label = 3;
+                    case 3: return [2, this.libResult];
+                }
+            });
+        });
+    };
+    GeetestLib.prototype.failValidate = function (challenge, validate, seccode) {
+        if (!this.checkParam(challenge, validate, seccode)) {
+            this.libResult.setAll(0, "", "宕机模式，本地校验，参数challenge、validate、seccode不可为空.");
+        }
+        else {
+            this.libResult.setAll(1, "", "");
+        }
+        return this.libResult;
+    };
+    GeetestLib.prototype.requestValidate = function (challenge, validate, seccode, params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var validate_url, response_seccode, res, resBody, e_2;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        params = Object.assign(params, {
+                            "seccode": seccode,
+                            "json_format": GeetestLib.JSON_FORMAT,
+                            "challenge": challenge,
+                            "sdk": GeetestLib.VERSION,
+                            "captchaid": this.geetest_id
+                        });
+                        validate_url = GeetestLib.API_URL + GeetestLib.VALIDATE_URL;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, axios({
+                                url: validate_url,
+                                method: "POST",
+                                timeout: GeetestLib.HTTP_TIMEOUT_DEFAULT,
+                                data: qs.stringify(params),
+                                headers: { "Content-Type": "application/x-www-form-urlencoded" }
+                            }).catch(function (err) {
+                            })];
+                    case 2:
+                        res = _a.sent();
+                        resBody = (res.status === 200) ? res.data : "";
+                        response_seccode = resBody["seccode"];
+                        return [3, 4];
+                    case 3:
+                        e_2 = _a.sent();
+                        response_seccode = "";
+                        return [3, 4];
+                    case 4: return [2, response_seccode];
+                }
+            });
+        });
+    };
+    GeetestLib.prototype.checkParam = function (challenge, validate, seccode) {
+        return !(challenge == undefined || challenge.trim() === "" || validate == undefined || validate.trim() === "" || seccode == undefined || seccode.trim() === "");
+    };
+    GeetestLib.prototype.md5_encode = function (value) {
+        return crypto.createHash("md5").update(value).digest("hex");
+    };
+    GeetestLib.prototype.sha256_encode = function (value) {
+        return crypto.createHash("sha256").update(value).digest("hex");
+    };
+    GeetestLib.prototype.hmac_sha256_encode = function (value, key) {
+        return crypto.createHmac("sha256", key).update(value).digest("hex");
+    };
+    GeetestLib.IS_DEBUG = true;
+    GeetestLib.API_URL = "http://api.geetest.com";
+    GeetestLib.REGISTER_URL = "/register.php";
+    GeetestLib.VALIDATE_URL = "/validate.php";
+    GeetestLib.JSON_FORMAT = "1";
+    GeetestLib.NEW_CAPTCHA = true;
+    GeetestLib.HTTP_TIMEOUT_DEFAULT = 5000;
+    GeetestLib.VERSION = "node-express:3.1.1";
+    GeetestLib.GEETEST_CHALLENGE = "geetest_challenge";
+    GeetestLib.GEETEST_VALIDATE = "geetest_validate";
+    GeetestLib.GEETEST_SECCODE = "geetest_seccode";
+    GeetestLib.GEETEST_SERVER_STATUS_SESSION_KEY = "gt_server_status";
+    return GeetestLib;
+}());
+module.exports = GeetestLib;
+//# sourceMappingURL=geetest_lib.js.map

package/lib/rest-express/endpoints/geetestV3/sdk/geetest_lib.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"geetest_lib.js","sourceRoot":"","sources":["../../../../../src/rest-express/endpoints/geetestV3/sdk/geetest_lib.js"],"names":[],"mappings":"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"}

package/lib/rest-express/endpoints/geetestV3/sdk/geetest_lib_result.js

@@ -0,0 +1,18 @@
+var GeetestLibResult = (function () {
+    function GeetestLibResult() {
+        this.status = 0;
+        this.data = "";
+        this.msg = "";
+    }
+    GeetestLibResult.prototype.setAll = function (status, data, msg) {
+        this.status = status;
+        this.data = data;
+        this.msg = msg;
+    };
+    GeetestLibResult.prototype.toString = function () {
+        return "GeetestLibResult{status=".concat(this.status, ", data=").concat(this.data, ", msg=").concat(this.msg, "}");
+    };
+    return GeetestLibResult;
+}());
+module.exports = GeetestLibResult;
+//# sourceMappingURL=geetest_lib_result.js.map

package/lib/rest-express/endpoints/geetestV3/sdk/geetest_lib_result.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"geetest_lib_result.js","sourceRoot":"","sources":["../../../../../src/rest-express/endpoints/geetestV3/sdk/geetest_lib_result.js"],"names":[],"mappings":"AACA;IACI;QACI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,iCAAM,GAAN,UAAO,MAAM,EAAE,IAAI,EAAE,GAAG;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAED,mCAAQ,GAAR;QACI,OAAO,kCAA2B,IAAI,CAAC,MAAM,oBAAU,IAAI,CAAC,IAAI,mBAAS,IAAI,CAAC,GAAG,MAAG,CAAC;IACzF,CAAC;IACL,uBAAC;AAAD,CAAC,AAhBD,IAgBC;AAED,MAAM,CAAC,OAAO,GAAG,gBAAgB,CAAC"}

package/lib/rest-express/endpoints/password/verify-email.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify-email.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/verify-email.ts"],"names":[],"mappings":";;;;AAEA,qDAAmD;AAE5C,IAAM,WAAW,GAAG,UAAC,cAA8B,IAAK,OAAA,UAC7D,GAAoB,EACpB,GAAqB;;;;;;gBAGX,KAAK,GAAK,GAAG,CAAC,IAAI,MAAb,CAAc;gBACrB,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBAC5D,WAAM,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,EAAA;;gBAAjC,SAAiC,CAAC;gBAClC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;;;gBAEf,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EAZ8D,CAY9D,CAAC;AAZW,QAAA,WAAW,eAYtB;AAEK,IAAM,qBAAqB,GAAG,UAAC,cAA8B,IAAK,OAAA,UACvE,GAAoB,EACpB,GAAqB;;;;;;gBAGX,KAAK,GAAK,GAAG,CAAC,IAAI,MAAb,CAAc;gBACrB,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBAC5D,WAAM,QAAQ,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAC5C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;;;gBAEf,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EAZwE,CAYxE,CAAC;AAZW,QAAA,qBAAqB,yBAYhC;AAEK,IAAM,oBAAoB,GAAG,UAAC,cAA8B,IAAK,OAAA,UACtE,GAAoB,EACpB,GAAqB;;;;;;gBAGX,IAAI,GAAK,GAAG,CAAC,IAAI,KAAb,CAAc;gBACpB,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBAC7C,WAAM,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAA;;gBAAlD,MAAM,GAAG,SAAyC;gBACxD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;;;;gBAEjB,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EAZuE,CAYvE,CAAC;AAZW,QAAA,oBAAoB,wBAY/B"}
+{"version":3,"file":"verify-email.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/password/verify-email.ts"],"names":[],"mappings":";;;;AAEA,qDAAmD;AAE5C,IAAM,WAAW,GAAG,UAAC,cAA8B,IAAK,OAAA,UAC7D,GAAoB,EACpB,GAAqB;;;;;;gBAGX,KAAK,GAAK,GAAG,CAAC,IAAI,MAAb,CAAc;gBACrB,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBAC5D,WAAM,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,EAAA;;gBAAjC,SAAiC,CAAC;gBAClC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;;;gBAEf,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EAZ8D,CAY9D,CAAC;AAZW,QAAA,WAAW,eAYtB;AAEK,IAAM,qBAAqB,GAAG,UAAC,cAA8B,IAAK,OAAA,UACvE,GAAoB,EACpB,GAAqB;;;;;;gBAGX,KAAK,GAAK,GAAG,CAAC,IAAI,MAAb,CAAc;gBACrB,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBAC5D,WAAM,QAAQ,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAC5C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;;;gBAEf,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EAZwE,CAYxE,CAAC;AAZW,QAAA,qBAAqB,yBAYhC;AAEK,IAAM,oBAAoB,GAAG,UAAC,cAA8B,IAAK,OAAA,UACtE,GAAoB,EACpB,GAAqB;;;;;;gBAGX,IAAI,GAAI,GAAG,CAAC,IAAI,KAAZ,CAAa;gBACnB,QAAQ,GAAQ,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBAC7C,WAAM,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAA;;gBAAlD,MAAM,GAAG,SAAyC;gBACxD,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;;;;gBAEjB,IAAA,sBAAS,EAAC,GAAG,EAAE,KAAG,CAAC,CAAC;;;;;KAEvB,EAZuE,CAYvE,CAAC;AAZW,QAAA,oBAAoB,wBAY/B"}

package/lib/rest-express/endpoints/steedos/settings.js

@@ -27,7 +27,8 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
                     enable_email_code_login: false,
                     enable_bind_mobile: false,
                     enable_bind_email: false,
-                    enable_saas: validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true)
+                    enable_saas: validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true),
+                    enable_open_geetest: validator.toBoolean(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED || 'false')
                 };
                 if (config.tenant) {
                     _.assignIn(tenant, config.tenant);
@@ -76,7 +77,8 @@ var getSettings = function (accountsServer) { return function (req, res) { retur
                     root_url: process.env.ROOT_URL,
                     already_mail_service: already_mail_service,
                     already_sms_service: already_sms_service,
-                    serverInitInfo: serverInitInfo
+                    serverInitInfo: serverInitInfo,
+                    redirect_url_whitelist: process.env.REDIRECT_URL_WHITELIST
                 });
                 return [2];
         }

package/lib/rest-express/endpoints/steedos/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../src/rest-express/endpoints/steedos/settings.ts"],"names":[],"mappings":"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"}

package/lib/rest-express/express-middleware.js

@@ -22,6 +22,7 @@ var put_user_name_1 = require("./endpoints/put-user-name");
 var login_1 = require("./endpoints/login");
 var spaces_1 = require("./endpoints/spaces");
 var verify_1 = require("./endpoints/password/verify");
+var geetest_init_1 = require("./endpoints/geetestV3/geetest-init");
 var defaultOptions = {
     path: '/accounts',
 };
@@ -53,10 +54,11 @@ var accountsExpress = function (accountsServer, options) {
         router.post("".concat(path, "/password/verifyEmail"), (0, verify_email_1.verifyEmail)(accountsServer));
         router.post("".concat(path, "/password/resetPassword"), (0, reset_1.resetPassword)(accountsServer));
         router.post("".concat(path, "/password/sendVerificationEmail"), (0, verify_email_1.sendVerificationEmail)(accountsServer));
-        router.post("".concat(path, "/password/sendVerificationCode"), (0, verify_email_1.sendVerificationCode)(accountsServer));
+        router.post("".concat(path, "/password/sendVerificationCode"), geetest_init_1.geetest_validate, (0, verify_email_1.sendVerificationCode)(accountsServer));
         router.post("".concat(path, "/password/sendResetPasswordEmail"), (0, reset_1.sendResetPasswordEmail)(accountsServer));
         router.post("".concat(path, "/password/verify/email"), (0, user_loader_1.userLoader)(accountsServer), (0, verify_1.verify_email)(accountsServer));
         router.post("".concat(path, "/password/verify/mobile"), (0, user_loader_1.userLoader)(accountsServer), (0, verify_1.verify_mobile)(accountsServer));
+        router.post("".concat(path, "/geetest/geetest-init"), (0, geetest_init_1.geetest_init)(accountsServer));
         router.post("".concat(path, "/password/changePassword"), (0, user_loader_1.userLoader)(accountsServer), (0, change_password_1.changePassword)(accountsServer));
     }
     if (services.oauth) {

package/lib/rest-express/express-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../../src/rest-express/express-middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"express-middleware.js","sourceRoot":"","sources":["../../src/rest-express/express-middleware.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos/accounts",
   "private": false,
-  "version": "2.4.2",
+  "version": "2.4.4",
   "main": "lib/index.js",
   "files": [
     "/package.json",
@@ -36,6 +36,7 @@
     "cookie-parser": "1.4.3",
     "cookies": "^0.8.0",
     "cors": "2.8.5",
+    "crypto": "^1.0.1",
     "csurf": "^1.11.0",
     "emittery": "0.11.0",
     "express": "4.17.1",
@@ -49,25 +50,26 @@
     "nodemailer": "^6.3.0",
     "pug": "^3.0.2",
     "request-ip": "^2.2.0",
+    "string-random": "^0.1.3",
     "tslib": "^2.4.0",
     "url-join": "^4.0.1",
     "validator": "^13.6.0"
   },
   "devDependencies": {
-    "@steedos/auth": "2.4.2",
-    "@steedos/meteor-bundle-runner": "2.4.2",
-    "@steedos/objectql": "2.4.2",
+    "@steedos/auth": "2.4.4",
+    "@steedos/meteor-bundle-runner": "2.4.4",
+    "@steedos/objectql": "2.4.4",
     "@types/dotenv-flow": "^3.0.0",
     "@types/node": "12.6.8",
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "dotenv-flow": "^3.1.0",
     "nodemon": "^2.0.19",
-    "steedos-server": "2.4.2",
+    "steedos-server": "2.4.4",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0e880759058022827b737df329c254aff2bc94dc"
+  "gitHead": "04caa0eb2226278f96c01825dd2828170c1f9789"
 }

package/src/rest-express/endpoints/geetestV3/geetest-init.ts

@@ -0,0 +1,125 @@
+import * as express from 'express';
+const axios = require("axios");
+const GeetestConfig = require('./sdk/geetest_config')
+const GeetestLib = require('./sdk/geetest_lib')
+const validator = require('validator');
+
+let geetest_status = null
+
+//初始化
+export const geetest_init = (data: any) => async (
+    req: express.Request,
+    res: express.Response
+) => {
+    try {
+        /*
+   必传参数
+       digestmod 此版本sdk可支持md5、sha256、hmac-sha256，md5之外的算法需特殊配置的账号，联系极验客服
+   自定义参数,可选择添加
+       user_id 客户端用户的唯一标识，确定用户的唯一性；作用于提供进阶数据分析服务，可在register和validate接口传入，不传入也不影响验证服务的使用；若担心用户信息风险，可作预处理(如哈希处理)再提供到极验
+       client_type 客户端类型，web：电脑上的浏览器；h5：手机上的浏览器，包括移动应用内完全内置的web_view；native：通过原生sdk植入app应用的方式；unknown：未知
+       ip_address 客户端请求sdk服务器的ip地址
+    */
+        const gtLib = new GeetestLib(GeetestConfig.GEETEST_ID, GeetestConfig.GEETEST_KEY);
+        const digestmod = "md5";
+        const userId = "test";
+        const params = { "digestmod": digestmod, "user_id": userId, "client_type": "web", "ip_address": "127.0.0.1" }
+        const bypasscache = geetest_status
+        let result;
+        if (bypasscache === "success") {
+            result = await gtLib.register(digestmod, params);
+        } else {
+            result = await gtLib.localRegister();
+        }
+        res.set('Content-Type', 'application/json;charset=UTF-8')
+        res.send(result.data)
+    } catch (err) {
+        console.log('err', err)
+    }
+    return
+};
+
+// 二次验证接口，POST请求
+export const geetest_validate = async function (req, res, next) {
+    if(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED){
+        if (validator.toBoolean(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED) === true) {
+            const gtLib = new GeetestLib(GeetestConfig.GEETEST_ID, GeetestConfig.GEETEST_KEY);
+    
+            if (req.body.geetest) {
+                const challenge = req.body.geetest[GeetestLib.GEETEST_CHALLENGE];
+                const validate = req.body.geetest[GeetestLib.GEETEST_VALIDATE];
+                const seccode = req.body.geetest[GeetestLib.GEETEST_SECCODE];
+                const bypasscache = geetest_status;
+                let result;
+                var params = new Array();
+                if (bypasscache === "success") {
+                    result = await gtLib.successValidate(challenge, validate, seccode, params);
+                } else {
+                    result = gtLib.failValidate(challenge, validate, seccode);
+                }
+                // 注意，不要更改返回的结构和值类型
+                if (result.status === 1) {
+                    next()
+                } else {
+                    return res.json({ "result": "fail", "version": GeetestLib.VERSION, "msg": result.msg });
+                }
+            } else {
+                next()
+            }
+        } else {
+            next()
+        }
+
+    }else{
+        next()
+    }
+}
+
+
+async function sendRequest(params) {
+    const request_url = GeetestConfig.BYPASS_URL;
+    let bypass_res;
+    try {
+        const res = await axios({
+            url: request_url,
+            method: "GET",
+            timeout: 5000,
+            params: params
+        });
+        const resBody = (res.status === 200) ? res.data : "";
+        bypass_res = resBody["status"];
+    } catch (e) {
+        bypass_res = "";
+    }
+    return bypass_res;
+}
+
+function sleep() {
+    return new Promise((resolve) => {
+        setTimeout(resolve, GeetestConfig.CYCLE_TIME * 1000);
+    })
+}
+let bypass_status = 'success';
+async function checkBypassStatus() {
+    while (true) {
+        bypass_status = await sendRequest({ "gt": GeetestConfig.GEETEST_ID });
+        if (bypass_status === "success") {
+            geetest_status = bypass_status
+        }
+        else {
+            bypass_status = "fail"
+            geetest_status = 'fail'
+        }
+        await sleep();
+    }
+}
+if (process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED === 'true') {
+    checkBypassStatus()
+}
+
+
+
+
+
+
+

package/src/rest-express/endpoints/geetestV3/sdk/geetest_config.js

@@ -0,0 +1,11 @@
+const GeetestConfig = Object.freeze({
+    GEETEST_ID: process.env.STEEDOS_CAPTCHA_GEETEST_ID,
+    GEETEST_KEY: process.env.STEEDOS_CAPTCHA_GEETEST_KEY,
+    REDIS_HOST: "127.0.0.1",
+    REDIS_PORT: "6379",
+    BYPASS_URL: "http://bypass.geetest.com/v1/bypass_status.php",
+    CYCLE_TIME: 10,
+    GEETEST_BYPASS_STATUS_KEY: "gt_server_bypass_status"
+})
+
+module.exports = GeetestConfig

package/src/rest-express/endpoints/geetestV3/sdk/geetest_lib.js

@@ -0,0 +1,217 @@
+const stringRandom = require('string-random');
+const crypto = require('crypto');
+const axios = require('axios');
+const qs = require('qs');
+
+const GeetestLibResult = require("./geetest_lib_result");
+
+class GeetestLib {
+    static IS_DEBUG = true; // 调试开关，是否输出调试日志
+    static API_URL = "http://api.geetest.com";
+    static REGISTER_URL = "/register.php";
+    static VALIDATE_URL = "/validate.php";
+    static JSON_FORMAT = "1";
+    static NEW_CAPTCHA = true;
+    static HTTP_TIMEOUT_DEFAULT = 5000; // 单位：毫秒
+    static VERSION = "node-express:3.1.1";
+    static GEETEST_CHALLENGE = "geetest_challenge"; // 极验二次验证表单传参字段 chllenge
+    static GEETEST_VALIDATE = "geetest_validate"; // 极验二次验证表单传参字段 validate
+    static GEETEST_SECCODE = "geetest_seccode"; // 极验二次验证表单传参字段 seccode
+    static GEETEST_SERVER_STATUS_SESSION_KEY = "gt_server_status"; // 极验验证API服务状态Session Key
+
+    constructor(geetest_id, geetest_key) {
+        this.geetest_id = geetest_id;
+        this.geetest_key = geetest_key;
+        this.libResult = new GeetestLibResult();
+    }
+
+    gtlog(message) {
+        if (GeetestLib.IS_DEBUG) {
+            console.log("gtlog: " + message);
+        }
+    }
+
+    /**
+     * 验证初始化
+     */
+    async register(digestmod, params) {
+        // this.gtlog(`register(): 开始验证初始化, digestmod=${digestmod}.`);
+        const origin_challenge = await this.requestRegister(params);
+        this.buildRegisterResult(origin_challenge, digestmod)
+        // this.gtlog(`register(): 验证初始化, lib包返回信息=${this.libResult}.`);
+        return this.libResult
+    }
+
+    /**
+     * 向极验发送验证初始化的请求，GET方式
+     */
+    async requestRegister(params) {
+        params = Object.assign(params, {
+            "gt": this.geetest_id,
+            "json_format": GeetestLib.JSON_FORMAT,
+            "sdk": GeetestLib.VERSION
+        });
+        const register_url = GeetestLib.API_URL + GeetestLib.REGISTER_URL;
+        // console.log('register_url是', register_url)
+        // this.gtlog(`requestRegister(): 验证初始化, 向极验发送请求, url=${register_url}, params=${JSON.stringify(params)}.`);
+        let origin_challenge;
+        try {
+            const res = await axios({
+                url: register_url,
+                method: "GET",
+                timeout: GeetestLib.HTTP_TIMEOUT_DEFAULT,
+                params: params
+            })
+            // console.log('返回值是', res)
+            const resBody = (res.status === 200) ? res.data : "";
+            // this.gtlog(`requestRegister(): 验证初始化, 与极验网络交互正常, 返回码=${res.status}, 返回body=${JSON.stringify(resBody)}.`);
+            origin_challenge = resBody["challenge"];
+        } catch (e) {
+            // this.gtlog("requestRegister(): 验证初始化, 请求异常，后续流程走宕机模式!, " + e.message);
+            origin_challenge = "";
+        }
+        return origin_challenge;
+    }
+    async localRegister() {
+        // this.gtlog("获取当前缓存中bypass状态为fail，后续流程走宕机模式 ");
+        this.buildRegisterResult("", "")
+        // this.gtlog(`register(): 验证初始化, lib包返回信息=${this.libResult}.`);
+        return this.libResult
+    }
+    /**
+     * 构建验证初始化返回数据
+     */
+    buildRegisterResult(origin_challenge, digestmod) {
+        // origin_challenge为空或者值为0代表失败
+        if (!origin_challenge || origin_challenge === "0") {
+            // 本地随机生成32位字符串
+            const challenge = stringRandom(32).toLowerCase();
+            const data = {
+                "success": 0,
+                "gt": this.geetest_id,
+                "challenge": challenge,
+                "new_captcha": GeetestLib.NEW_CAPTCHA
+            };
+            this.libResult.setAll(0, JSON.stringify(data), "获取当前缓存中bypass状态为fail，本地生成challenge，后续流程走宕机模式")
+        } else {
+            let challenge;
+            if (digestmod === "md5") {
+                challenge = this.md5_encode(origin_challenge + this.geetest_key);
+            } else if (digestmod === "sha256") {
+                challenge = this.sha256_encode(origin_challenge + this.geetest_key);
+            } else if (digestmod === "hmac-sha256") {
+                challenge = this.hmac_sha256_encode(origin_challenge, this.geetest_key);
+            } else {
+                challenge = this.md5_encode(origin_challenge + this.geetest_key);
+            }
+            const data = {
+                "success": 1,
+                "gt": this.geetest_id,
+                "challenge": challenge,
+                "new_captcha": GeetestLib.NEW_CAPTCHA
+            };
+            this.libResult.setAll(1, JSON.stringify(data), "");
+        }
+    }
+
+    /**
+     * 正常流程下（即验证初始化成功），二次验证
+     */
+    async successValidate(challenge, validate, seccode, params) {
+        // this.gtlog(`successValidate(): 开始二次验证 正常模式, challenge=${challenge}, validate=${validate}, seccode=${validate}.`);
+        if (!this.checkParam(challenge, validate, seccode)) {
+            this.libResult.setAll(0, "", "正常模式，本地校验，参数challenge、validate、seccode不可为空");
+        } else {
+            const response_seccode = await this.requestValidate(challenge, validate, seccode, params);
+            if (!response_seccode) {
+                this.libResult.setAll(0, "", "请求极验validate接口失败");
+            } else if (response_seccode === "false") {
+                this.libResult.setAll(0, "", "极验二次验证不通过");
+            } else {
+                this.libResult.setAll(1, "", "");
+            }
+        }
+        // this.gtlog(`successValidate(): 二次验证 正常模式, lib包返回信息=${this.libResult}.`);
+        return this.libResult;
+    }
+
+    /**
+     * 异常流程下（即验证初始化失败，宕机模式），二次验证
+     * 注意：由于是宕机模式，初衷是保证验证业务不会中断正常业务，所以此处只作简单的参数校验，可自行设计逻辑。
+     */
+    failValidate(challenge, validate, seccode) {
+        // this.gtlog(`failValidate(): 开始二次验证 宕机模式, challenge=${challenge}, validate=${validate}, seccode=${seccode}.`);
+        if (!this.checkParam(challenge, validate, seccode)) {
+            this.libResult.setAll(0, "", "宕机模式，本地校验，参数challenge、validate、seccode不可为空.");
+        } else {
+            this.libResult.setAll(1, "", "");
+        }
+        // this.gtlog(`failValidate(): 二次验证 宕机模式, lib包返回信息=${this.libResult}.`);
+        return this.libResult;
+    }
+
+    /**
+     * 向极验发送二次验证的请求，POST方式
+     */
+    async requestValidate(challenge, validate, seccode, params) {
+        params = Object.assign(params, {
+            "seccode": seccode,
+            "json_format": GeetestLib.JSON_FORMAT,
+            "challenge": challenge,
+            "sdk": GeetestLib.VERSION,
+            "captchaid": this.geetest_id
+        });
+        const validate_url = GeetestLib.API_URL + GeetestLib.VALIDATE_URL;
+        // this.gtlog(`requestValidate(): 二次验证 正常模式, 向极验发送请求, url=${validate_url}, params=${JSON.stringify(params)}.`);
+        let response_seccode;
+        try {
+            const res = await axios({
+                url: validate_url,
+                method: "POST",
+                timeout: GeetestLib.HTTP_TIMEOUT_DEFAULT,
+                data: qs.stringify(params),
+                headers: { "Content-Type": "application/x-www-form-urlencoded" }
+            }).catch(err => {
+                // console.log(err)
+            });
+            const resBody = (res.status === 200) ? res.data : "";
+            // this.gtlog(`requestValidate(): 二次验证 正常模式, 与极验网络交互正常, 返回码=${res.status}, 返回body=${JSON.stringify(resBody)}.`);
+            response_seccode = resBody["seccode"];
+        } catch (e) {
+            // this.gtlog("requestValidate(): 二次验证 正常模式, 请求异常, " + e.message);
+            response_seccode = "";
+        }
+        return response_seccode;
+    }
+
+    /**
+     * 校验二次验证的三个参数，校验通过返回true，校验失败返回false
+     */
+    checkParam(challenge, validate, seccode) {
+        return !(challenge == undefined || challenge.trim() === "" || validate == undefined || validate.trim() === "" || seccode == undefined || seccode.trim() === "");
+    }
+
+    /**
+     * md5 加密
+     */
+    md5_encode(value) {
+        return crypto.createHash("md5").update(value).digest("hex");
+    }
+
+    /**
+     * sha256加密
+     */
+    sha256_encode(value) {
+        return crypto.createHash("sha256").update(value).digest("hex");
+    }
+
+    /**
+     * hmac-sha256 加密
+     */
+    hmac_sha256_encode(value, key) {
+        return crypto.createHmac("sha256", key).update(value).digest("hex");
+    }
+
+}
+
+module.exports = GeetestLib;

package/src/rest-express/endpoints/geetestV3/sdk/geetest_lib_result.js

@@ -0,0 +1,20 @@
+// sdk lib包的返回结果信息。
+class GeetestLibResult {
+    constructor() {
+        this.status = 0; // 成功失败的标识码，1表示成功，0表示失败
+        this.data = ""; // 返回数据，json格式
+        this.msg = ""; // 备注信息，如异常信息等
+    }
+
+    setAll(status, data, msg) {
+        this.status = status;
+        this.data = data;
+        this.msg = msg;
+    }
+
+    toString() {
+        return `GeetestLibResult{status=${this.status}, data=${this.data}, msg=${this.msg}}`;
+    }
+}
+
+module.exports = GeetestLibResult;

package/src/rest-express/endpoints/password/verify-email.ts

@@ -35,7 +35,7 @@ export const sendVerificationCode = (accountsServer: AccountsServer) => async (
   res: express.Response
 ) => {
   try {
-    const { user } = req.body;
+    const { user} = req.body;
     const password: any = accountsServer.getServices().password;
     const userId = await password.sendVerificationCode(user);
     res.json(userId);

package/src/rest-express/endpoints/steedos/settings.ts

@@ -2,7 +2,7 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-03-28 09:35:34
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2022-11-15 10:15:34
+ * @LastEditTime: 2023-03-17 15:28:17
  * @Description: 
  */
 import * as express from 'express';
@@ -33,7 +33,9 @@ export const getSettings = (accountsServer: AccountsServer) => async (
     enable_email_code_login: false,
     enable_bind_mobile: false,
     enable_bind_email: false,
-    enable_saas: validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true)
+    enable_saas: validator.toBoolean(process.env.STEEDOS_TENANT_ENABLE_SAAS || 'false', true),
+    enable_open_geetest: validator.toBoolean(process.env.STEEDOS_CAPTCHA_GEETEST_ENABLED || 'false')
+
   }
 
   if (config.tenant) {
@@ -86,6 +88,7 @@ export const getSettings = (accountsServer: AccountsServer) => async (
     root_url: process.env.ROOT_URL,
     already_mail_service: already_mail_service,
     already_sms_service: already_sms_service,
-    serverInitInfo: serverInitInfo
+    serverInitInfo: serverInitInfo,
+    redirect_url_whitelist: process.env.REDIRECT_URL_WHITELIST
   })
 }

package/src/rest-express/express-middleware.ts

@@ -24,6 +24,7 @@ import { changeUserFullname } from './endpoints/put-user-name';
 import { login } from './endpoints/login';
 import { getMySpaces } from './endpoints/spaces';
 import { verify_email, verify_mobile} from './endpoints/password/verify';
+import { geetest_init,geetest_validate } from './endpoints/geetestV3/geetest-init'
 
 
 const defaultOptions: AccountsExpressOptions = {
@@ -65,6 +66,7 @@ const accountsExpress = (
 
   router.post(`${path}/:service/session`, userLoader(accountsServer), updateSession(accountsServer));
 
+
   const services = accountsServer.getServices();
 
   // @accounts/password
@@ -80,13 +82,15 @@ const accountsExpress = (
 
     router.post(`${path}/password/sendVerificationEmail`, sendVerificationEmail(accountsServer));
 
-    router.post(`${path}/password/sendVerificationCode`, sendVerificationCode(accountsServer));
+    router.post(`${path}/password/sendVerificationCode`,geetest_validate, sendVerificationCode(accountsServer));
 
     router.post(`${path}/password/sendResetPasswordEmail`, sendResetPasswordEmail(accountsServer));
 
     router.post(`${path}/password/verify/email`, userLoader(accountsServer), verify_email(accountsServer));
     router.post(`${path}/password/verify/mobile`, userLoader(accountsServer), verify_mobile(accountsServer));
     
+    router.post(`${path}/geetest/geetest-init`, geetest_init(accountsServer));
+    
     router.post(
       `${path}/password/changePassword`,
       userLoader(accountsServer),