cnpmcore 3.10.0 → 3.11.1

package/dist/app/common/CryptoUtil.d.ts

@@ -0,0 +1,6 @@
+export declare function genRSAKeys(): {
+    publicKey: string;
+    privateKey: string;
+};
+export declare function encryptRSA(publicKey: string, data: string): string;
+export declare function decryptRSA(privateKey: string, data: string): string;

package/dist/app/common/CryptoUtil.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decryptRSA = exports.encryptRSA = exports.genRSAKeys = void 0;
+const crypto_1 = require("crypto");
+// generate rsa key pair
+function genRSAKeys() {
+    const key = (0, crypto_1.generateKeyPairSync)('rsa', {
+        modulusLength: 512,
+    });
+    const publicKey = key.publicKey.export({
+        type: 'pkcs1',
+        format: 'pem',
+    }).toString('base64');
+    const privateKey = key.privateKey.export({
+        type: 'pkcs1',
+        format: 'pem',
+    }).toString('base64');
+    return { publicKey, privateKey };
+}
+exports.genRSAKeys = genRSAKeys;
+// encrypt rsa private key
+function encryptRSA(publicKey, data) {
+    return (0, crypto_1.publicEncrypt)({
+        key: publicKey,
+        padding: crypto_1.constants.RSA_PKCS1_PADDING,
+    }, Buffer.from(data, 'utf8')).toString('base64');
+}
+exports.encryptRSA = encryptRSA;
+// decrypt rsa private key
+function decryptRSA(privateKey, data) {
+    return (0, crypto_1.privateDecrypt)({
+        key: privateKey,
+        padding: crypto_1.constants.RSA_PKCS1_PADDING,
+    }, Buffer.from(data, 'base64')).toString('utf8');
+}
+exports.decryptRSA = decryptRSA;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3J5cHRvVXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL2FwcC9jb21tb24vQ3J5cHRvVXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FBdUY7QUFFdkYsd0JBQXdCO0FBQ3hCLFNBQWdCLFVBQVU7SUFDeEIsTUFBTSxHQUFHLEdBQUcsSUFBQSw0QkFBbUIsRUFBQyxLQUFLLEVBQUU7UUFDckMsYUFBYSxFQUFFLEdBQUc7S0FDbkIsQ0FBQyxDQUFDO0lBQ0gsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUM7UUFDckMsSUFBSSxFQUFFLE9BQU87UUFDYixNQUFNLEVBQUUsS0FBSztLQUNkLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDdEIsTUFBTSxVQUFVLEdBQUcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUM7UUFDdkMsSUFBSSxFQUFFLE9BQU87UUFDYixNQUFNLEVBQUUsS0FBSztLQUNkLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDdEIsT0FBTyxFQUFFLFNBQVMsRUFBRSxVQUFVLEVBQUUsQ0FBQztBQUNuQyxDQUFDO0FBYkQsZ0NBYUM7QUFFRCwwQkFBMEI7QUFDMUIsU0FBZ0IsVUFBVSxDQUFDLFNBQWlCLEVBQUUsSUFBWTtJQUN4RCxPQUFPLElBQUEsc0JBQWEsRUFBQztRQUNuQixHQUFHLEVBQUUsU0FBUztRQUNkLE9BQU8sRUFBRSxrQkFBUyxDQUFDLGlCQUFpQjtLQUNyQyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQ25ELENBQUM7QUFMRCxnQ0FLQztBQUVELDBCQUEwQjtBQUMxQixTQUFnQixVQUFVLENBQUMsVUFBa0IsRUFBRSxJQUFZO0lBQ3pELE9BQU8sSUFBQSx1QkFBYyxFQUFDO1FBQ3BCLEdBQUcsRUFBRSxVQUFVO1FBQ2YsT0FBTyxFQUFFLGtCQUFTLENBQUMsaUJBQWlCO0tBQ3JDLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDbkQsQ0FBQztBQUxELGdDQUtDIn0=

package/dist/app/common/UserUtil.d.ts

@@ -3,3 +3,5 @@ export declare function checkToken(token: string, prefix: string): boolean;
 export declare function integrity(plain: string): string;
 export declare function checkIntegrity(plain: string, expectedIntegrity: string): boolean;
 export declare function sha512(plain: string): string;
+export declare function getUAInfo(userAgent?: string): any;
+export declare function getBrowserTypeForWebauthn(userAgent?: string): any;

package/dist/app/common/UserUtil.js

@@ -26,11 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sha512 = exports.checkIntegrity = exports.integrity = exports.checkToken = exports.randomToken = void 0;
+exports.getBrowserTypeForWebauthn = exports.getUAInfo = exports.sha512 = exports.checkIntegrity = exports.integrity = exports.checkToken = exports.randomToken = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const base_x_1 = __importDefault(require("base-x"));
 const crc32_1 = require("@node-rs/crc32");
 const ssri = __importStar(require("ssri"));
+const ua_parser_js_1 = __importDefault(require("ua-parser-js"));
 const base62 = (0, base_x_1.default)('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
 const crc32Buffer = Buffer.alloc(4);
 function randomToken(prefix) {
@@ -69,4 +70,22 @@ function sha512(plain) {
     return crypto_1.default.createHash('sha512').update(plain).digest('hex');
 }
 exports.sha512 = sha512;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvY29tbW9uL1VzZXJVdGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsb0RBQTRCO0FBQzVCLG9EQUEwQjtBQUMxQiwwQ0FBdUM7QUFDdkMsMkNBQTZCO0FBRTdCLE1BQU0sTUFBTSxHQUFHLElBQUEsZ0JBQUksRUFBQyxnRUFBZ0UsQ0FBQyxDQUFDO0FBRXRGLE1BQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFFcEMsU0FBZ0IsV0FBVyxDQUFDLE1BQWM7SUFDeEMsTUFBTSxLQUFLLEdBQUcsZ0JBQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDckMsTUFBTSxHQUFHLEdBQUcsSUFBQSxhQUFLLEVBQUMsS0FBSyxDQUFDLENBQUM7SUFDekIsV0FBVyxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMvQixPQUFPLEdBQUcsTUFBTSxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksTUFBTSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDO0FBQzNFLENBQUM7QUFMRCxrQ0FLQztBQUVELFNBQWdCLFVBQVUsQ0FBQyxLQUFhLEVBQUUsTUFBYztJQUN0RCxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ2hDLElBQUksTUFBTSxDQUFDLE1BQU0sS0FBSyxDQUFDO1FBQUUsT0FBTyxLQUFLLENBQUM7SUFDdEMsSUFBSSxNQUFNLENBQUMsQ0FBQyxDQUFDLEtBQUssTUFBTTtRQUFFLE9BQU8sS0FBSyxDQUFDO0lBQ3ZDLElBQUk7UUFDRixNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDMUMsT0FBTyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxLQUFLLElBQUEsYUFBSyxFQUFDLEtBQUssQ0FBQyxDQUFDO0tBQ2xEO0lBQUMsTUFBTTtRQUNOLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7QUFDSCxDQUFDO0FBWEQsZ0NBV0M7QUFFRCxTQUFnQixTQUFTLENBQUMsS0FBYTtJQUNyQyxPQUFPLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxFQUFFO1NBQ3hDLFFBQVEsRUFBRSxDQUFDO0FBQ2hCLENBQUM7QUFIRCw4QkFHQztBQUVELFNBQWdCLGNBQWMsQ0FBQyxLQUFhLEVBQUUsaUJBQXlCO0lBQ3JFLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztBQUNsRCxDQUFDO0FBRkQsd0NBRUM7QUFFRCxTQUFnQixNQUFNLENBQUMsS0FBYTtJQUNsQyxPQUFPLGdCQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDakUsQ0FBQztBQUZELHdCQUVDIn0=
+function getUAInfo(userAgent) {
+    if (!userAgent)
+        return null;
+    return new ua_parser_js_1.default(userAgent);
+}
+exports.getUAInfo = getUAInfo;
+function getBrowserTypeForWebauthn(userAgent) {
+    const ua = getUAInfo(userAgent);
+    if (!ua)
+        return null;
+    const os = ua.getOS();
+    if (os.name === 'iOS' || os.name === 'Android')
+        return 'mobile';
+    if (os.name === 'Mac OS')
+        return ua.getBrowser().name;
+    return null;
+}
+exports.getBrowserTypeForWebauthn = getBrowserTypeForWebauthn;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvY29tbW9uL1VzZXJVdGlsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsb0RBQTRCO0FBQzVCLG9EQUEwQjtBQUMxQiwwQ0FBdUM7QUFDdkMsMkNBQTZCO0FBQzdCLGdFQUFvQztBQUVwQyxNQUFNLE1BQU0sR0FBRyxJQUFBLGdCQUFJLEVBQUMsZ0VBQWdFLENBQUMsQ0FBQztBQUV0RixNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBRXBDLFNBQWdCLFdBQVcsQ0FBQyxNQUFjO0lBQ3hDLE1BQU0sS0FBSyxHQUFHLGdCQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3JDLE1BQU0sR0FBRyxHQUFHLElBQUEsYUFBSyxFQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3pCLFdBQVcsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDL0IsT0FBTyxHQUFHLE1BQU0sSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQztBQUMzRSxDQUFDO0FBTEQsa0NBS0M7QUFFRCxTQUFnQixVQUFVLENBQUMsS0FBYSxFQUFFLE1BQWM7SUFDdEQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNoQyxJQUFJLE1BQU0sQ0FBQyxNQUFNLEtBQUssQ0FBQztRQUFFLE9BQU8sS0FBSyxDQUFDO0lBQ3RDLElBQUksTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLE1BQU07UUFBRSxPQUFPLEtBQUssQ0FBQztJQUN2QyxJQUFJO1FBQ0YsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2QyxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzFDLE9BQU8sUUFBUSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsS0FBSyxJQUFBLGFBQUssRUFBQyxLQUFLLENBQUMsQ0FBQztLQUNsRDtJQUFDLE1BQU07UUFDTixPQUFPLEtBQUssQ0FBQztLQUNkO0FBQ0gsQ0FBQztBQVhELGdDQVdDO0FBRUQsU0FBZ0IsU0FBUyxDQUFDLEtBQWE7SUFDckMsT0FBTyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLE1BQU0sRUFBRTtTQUN4QyxRQUFRLEVBQUUsQ0FBQztBQUNoQixDQUFDO0FBSEQsOEJBR0M7QUFFRCxTQUFnQixjQUFjLENBQUMsS0FBYSxFQUFFLGlCQUF5QjtJQUNyRSxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLGlCQUFpQixDQUFDLENBQUM7QUFDbEQsQ0FBQztBQUZELHdDQUVDO0FBRUQsU0FBZ0IsTUFBTSxDQUFDLEtBQWE7SUFDbEMsT0FBTyxnQkFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO0FBQ2pFLENBQUM7QUFGRCx3QkFFQztBQUVELFNBQWdCLFNBQVMsQ0FBQyxTQUFrQjtJQUMxQyxJQUFJLENBQUMsU0FBUztRQUFFLE9BQU8sSUFBSSxDQUFDO0lBQzVCLE9BQU8sSUFBSSxzQkFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQ2pDLENBQUM7QUFIRCw4QkFHQztBQUVELFNBQWdCLHlCQUF5QixDQUFDLFNBQWtCO0lBQzFELE1BQU0sRUFBRSxHQUFHLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNoQyxJQUFJLENBQUMsRUFBRTtRQUFFLE9BQU8sSUFBSSxDQUFDO0lBQ3JCLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUN0QixJQUFJLEVBQUUsQ0FBQyxJQUFJLEtBQUssS0FBSyxJQUFJLEVBQUUsQ0FBQyxJQUFJLEtBQUssU0FBUztRQUFFLE9BQU8sUUFBUSxDQUFDO0lBQ2hFLElBQUksRUFBRSxDQUFDLElBQUksS0FBSyxRQUFRO1FBQUUsT0FBTyxFQUFFLENBQUMsVUFBVSxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQ3RELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQVBELDhEQU9DIn0=

package/dist/app/common/enum/User.d.ts

@@ -3,3 +3,8 @@ export declare enum LoginResultCode {
     Success = 1,
     Fail = 2
 }
+export declare enum WanStatusCode {
+    UserNotFound = 0,
+    Unbound = 1,
+    Bound = 2
+}

package/dist/app/common/enum/User.js

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoginResultCode = void 0;
+exports.WanStatusCode = exports.LoginResultCode = void 0;
 var LoginResultCode;
 (function (LoginResultCode) {
     LoginResultCode[LoginResultCode["UserNotFound"] = 0] = "UserNotFound";
     LoginResultCode[LoginResultCode["Success"] = 1] = "Success";
     LoginResultCode[LoginResultCode["Fail"] = 2] = "Fail";
 })(LoginResultCode = exports.LoginResultCode || (exports.LoginResultCode = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb21tb24vZW51bS9Vc2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLElBQVksZUFJWDtBQUpELFdBQVksZUFBZTtJQUN6QixxRUFBWSxDQUFBO0lBQ1osMkRBQU8sQ0FBQTtJQUNQLHFEQUFJLENBQUE7QUFDTixDQUFDLEVBSlcsZUFBZSxHQUFmLHVCQUFlLEtBQWYsdUJBQWUsUUFJMUIifQ==
+var WanStatusCode;
+(function (WanStatusCode) {
+    WanStatusCode[WanStatusCode["UserNotFound"] = 0] = "UserNotFound";
+    WanStatusCode[WanStatusCode["Unbound"] = 1] = "Unbound";
+    WanStatusCode[WanStatusCode["Bound"] = 2] = "Bound";
+})(WanStatusCode = exports.WanStatusCode || (exports.WanStatusCode = {}));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL2FwcC9jb21tb24vZW51bS9Vc2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLElBQVksZUFJWDtBQUpELFdBQVksZUFBZTtJQUN6QixxRUFBWSxDQUFBO0lBQ1osMkRBQU8sQ0FBQTtJQUNQLHFEQUFJLENBQUE7QUFDTixDQUFDLEVBSlcsZUFBZSxHQUFmLHVCQUFlLEtBQWYsdUJBQWUsUUFJMUI7QUFFRCxJQUFZLGFBSVg7QUFKRCxXQUFZLGFBQWE7SUFDdkIsaUVBQVksQ0FBQTtJQUNaLHVEQUFPLENBQUE7SUFDUCxtREFBSyxDQUFBO0FBQ1AsQ0FBQyxFQUpXLGFBQWEsR0FBYixxQkFBYSxLQUFiLHFCQUFhLFFBSXhCIn0=

package/dist/app/core/entity/WebauthnCredential.d.ts

@@ -0,0 +1,19 @@
+import { Entity, EntityData } from './Entity';
+import { EasyData } from '../util/EntityUtil';
+interface WebauthnCredentialData extends EntityData {
+    wancId: string;
+    userId: string;
+    credentialId: string;
+    publicKey: string;
+    browserType?: string;
+}
+export declare class WebauthnCredential extends Entity {
+    wancId: string;
+    userId: string;
+    credentialId: string;
+    publicKey: string;
+    browserType?: string;
+    constructor(data: WebauthnCredentialData);
+    static create(data: EasyData<WebauthnCredentialData, 'wancId'>): WebauthnCredential;
+}
+export {};

package/dist/app/core/entity/WebauthnCredential.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebauthnCredential = void 0;
+const Entity_1 = require("./Entity");
+const EntityUtil_1 = require("../util/EntityUtil");
+class WebauthnCredential extends Entity_1.Entity {
+    constructor(data) {
+        super(data);
+        this.wancId = data.wancId;
+        this.userId = data.userId;
+        this.credentialId = data.credentialId;
+        this.publicKey = data.publicKey;
+        this.browserType = data.browserType;
+    }
+    static create(data) {
+        const newData = EntityUtil_1.EntityUtil.defaultData(data, 'wancId');
+        return new WebauthnCredential(newData);
+    }
+}
+exports.WebauthnCredential = WebauthnCredential;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViYXV0aG5DcmVkZW50aWFsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL2NvcmUvZW50aXR5L1dlYmF1dGhuQ3JlZGVudGlhbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxQ0FBOEM7QUFDOUMsbURBQTBEO0FBVTFELE1BQWEsa0JBQW1CLFNBQVEsZUFBTTtJQU81QyxZQUFZLElBQTRCO1FBQ3RDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNaLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUMxQixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7UUFDMUIsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDO1FBQ3RDLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQztRQUNoQyxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUM7SUFDdEMsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBZ0Q7UUFDNUQsTUFBTSxPQUFPLEdBQUcsdUJBQVUsQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZELE9BQU8sSUFBSSxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN6QyxDQUFDO0NBQ0Y7QUFwQkQsZ0RBb0JDIn0=

package/dist/app/core/service/UserService.d.ts

@@ -1,5 +1,6 @@
 import { User as UserEntity } from '../entity/User';
 import { Token as TokenEntity } from '../entity/Token';
+import { WebauthnCredential as WebauthnCredentialEntity } from '../entity/WebauthnCredential';
 import { LoginResultCode } from '../../common/enum/User';
 import { AbstractService } from '../../common/AbstractService';
 type Optional<T, K extends keyof T> = Omit<T, K> & Partial<T>;
@@ -19,11 +20,20 @@ type CreateTokenOptions = {
     isAutomation?: boolean;
     cidrWhitelist?: string[];
 };
+type CreateWebauthnCredentialOptions = {
+    credentialId: string;
+    publicKey: string;
+    browserType?: string;
+};
 export declare class UserService extends AbstractService {
     private readonly userRepository;
     checkPassword(user: UserEntity, password: string): boolean;
+    findUserByName(name: string): Promise<UserEntity | null>;
     login(name: string, password: string): Promise<LoginResult>;
-    ensureTokenByUser({ name, email, password, ip }: Optional<CreateUser, 'password'>): Promise<TokenEntity>;
+    ensureTokenByUser({ name, email, password, ip }: Optional<CreateUser, 'password'>): Promise<{
+        user: UserEntity;
+        token: TokenEntity;
+    }>;
     create(createUser: CreateUser): Promise<{
         user: UserEntity;
         token: TokenEntity;
@@ -34,5 +44,8 @@ export declare class UserService extends AbstractService {
     }>;
     createToken(userId: string, options?: CreateTokenOptions): Promise<TokenEntity>;
     removeToken(userId: string, tokenKeyOrTokenValue: string): Promise<void>;
+    findWebauthnCredential(userId: string, browserType?: string): Promise<WebauthnCredentialEntity | null>;
+    createWebauthnCredential(userId: string, options: CreateWebauthnCredentialOptions): Promise<WebauthnCredentialEntity>;
+    removeWebauthnCredential(userId: string, browserType?: string): Promise<void>;
 }
 export {};

package/dist/app/core/service/UserService.js

@@ -19,6 +19,7 @@ const egg_errors_1 = require("egg-errors");
 const UserRepository_1 = require("../../repository/UserRepository");
 const User_1 = require("../entity/User");
 const Token_1 = require("../entity/Token");
+const WebauthnCredential_1 = require("../entity/WebauthnCredential");
 const User_2 = require("../../common/enum/User");
 const UserUtil_1 = require("../../common/UserUtil");
 const AbstractService_1 = require("../../common/AbstractService");
@@ -27,6 +28,9 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
         const plain = `${user.passwordSalt}${password}`;
         return (0, UserUtil_1.checkIntegrity)(plain, user.passwordIntegrity);
     }
+    async findUserByName(name) {
+        return await this.userRepository.findUserByName(name);
+    }
     async login(name, password) {
         const user = await this.userRepository.findUserByName(name);
         if (!user)
@@ -51,7 +55,7 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
             user = createRes.user;
         }
         const token = await this.createToken(user.userId);
-        return token;
+        return { user, token };
     }
     async create(createUser) {
         const passwordSalt = crypto_1.default.randomBytes(30).toString('hex');
@@ -126,6 +130,26 @@ let UserService = class UserService extends AbstractService_1.AbstractService {
         }
         await this.userRepository.removeToken(token.tokenId);
     }
+    async findWebauthnCredential(userId, browserType) {
+        const credential = await this.userRepository.findCredentialByUserIdAndBrowserType(userId, browserType || null);
+        return credential;
+    }
+    async createWebauthnCredential(userId, options) {
+        const credentialEntity = WebauthnCredential_1.WebauthnCredential.create({
+            userId,
+            credentialId: options.credentialId,
+            publicKey: options.publicKey,
+            browserType: options.browserType,
+        });
+        await this.userRepository.saveCredential(credentialEntity);
+        return credentialEntity;
+    }
+    async removeWebauthnCredential(userId, browserType) {
+        const credential = await this.userRepository.findCredentialByUserIdAndBrowserType(userId, browserType || null);
+        if (credential) {
+            await this.userRepository.removeCredential(credential.wancId);
+        }
+    }
 };
 __decorate([
     (0, tegg_1.Inject)(),
@@ -137,4 +161,4 @@ UserService = __decorate([
     })
 ], UserService);
 exports.UserService = UserService;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL1VzZXJTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG9EQUE0QjtBQUM1QixzQ0FJcUI7QUFDckIsMkNBQTJEO0FBQzNELG9FQUFpRTtBQUNqRSx5Q0FBb0Q7QUFDcEQsMkNBQXVEO0FBQ3ZELGlEQUF5RDtBQUN6RCxvREFBdUY7QUFDdkYsa0VBQStEO0FBMEJ4RCxJQUFNLFdBQVcsR0FBakIsTUFBTSxXQUFZLFNBQVEsaUNBQWU7SUFJOUMsYUFBYSxDQUFDLElBQWdCLEVBQUUsUUFBZ0I7UUFDOUMsTUFBTSxLQUFLLEdBQUcsR0FBRyxJQUFJLENBQUMsWUFBWSxHQUFHLFFBQVEsRUFBRSxDQUFDO1FBQ2hELE9BQU8sSUFBQSx5QkFBYyxFQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFZLEVBQUUsUUFBZ0I7UUFDeEMsTUFBTSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM1RCxJQUFJLENBQUMsSUFBSTtZQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsc0JBQWUsQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN6RCxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLEVBQUU7WUFDdkMsT0FBTyxFQUFFLElBQUksRUFBRSxzQkFBZSxDQUFDLElBQUksRUFBRSxDQUFDO1NBQ3ZDO1FBQ0QsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNsRCxPQUFPLEVBQUUsSUFBSSxFQUFFLHNCQUFlLENBQUMsT0FBTyxFQUFFLElB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvY29yZS9zZXJ2aWNlL1VzZXJTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG9EQUE0QjtBQUM1QixzQ0FJcUI7QUFDckIsMkNBQTJEO0FBQzNELG9FQUFpRTtBQUNqRSx5Q0FBb0Q7QUFDcEQsMkNBQXVEO0FBQ3ZELHFFQUE4RjtBQUM5RixpREFBeUQ7QUFDekQsb0RBQXVGO0FBQ3ZGLGtFQUErRDtBQWdDeEQsSUFBTSxXQUFXLEdBQWpCLE1BQU0sV0FBWSxTQUFRLGlDQUFlO0lBSTlDLGFBQWEsQ0FBQyxJQUFnQixFQUFFLFFBQWdCO1FBQzlDLE1BQU0sS0FBSyxHQUFHLEdBQUcsSUFBSSxDQUFDLFlBQVksR0FBRyxRQUFRLEVBQUUsQ0FBQztRQUNoRCxPQUFPLElBQUEseUJBQWMsRUFBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDdkQsQ0FBQztJQUVELEtBQUssQ0FBQyxjQUFjLENBQUMsSUFBWTtRQUMvQixPQUFPLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEQsQ0FBQztJQUVELEtBQUssQ0FBQyxLQUFLLENBQUMsSUFBWSxFQUFFLFFBQWdCO1FBQ3hDLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDNUQsSUFBSSxDQUFDLElBQUk7WUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLHNCQUFlLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDekQsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLFFBQVEsQ0FBQyxFQUFFO1lBQ3ZDLE9BQU8sRUFBRSxJQUFJLEVBQUUsc0JBQWUsQ0FBQyxJQUFJLEVBQUUsQ0FBQztTQUN2QztRQUNE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

package/dist/app/port/webauth/WebauthController.d.ts

@@ -1,12 +1,18 @@
 import { EggContext } from '@eggjs/tegg';
 import { EggLogger, EggAppConfig } from 'egg';
 import { Static } from '@sinclair/typebox';
+import type { PublicKeyCredentialCreationOptionsJSON, PublicKeyCredentialRequestOptionsJSON } from '@simplewebauthn/typescript-types';
 import { UserService } from '../../core/service/UserService';
 import { MiddlewareController } from '../middleware';
 declare const LoginRequestRule: import("@sinclair/typebox").TObject<{
     hostname: import("@sinclair/typebox").TString;
 }>;
 type LoginRequest = Static<typeof LoginRequestRule>;
+type LoginPrepareResult = {
+    wanStatus: number;
+    wanCredentialRegiOption?: PublicKeyCredentialCreationOptionsJSON;
+    wanCredentialAuthOption?: PublicKeyCredentialRequestOptionsJSON;
+};
 export declare class WebauthController extends MiddlewareController {
     private cacheAdapter;
     private authAdapter;
@@ -14,8 +20,18 @@ export declare class WebauthController extends MiddlewareController {
     protected config: EggAppConfig;
     protected userService: UserService;
     login(ctx: EggContext, loginRequest: LoginRequest): Promise<import("../../common/typing").AuthUrlResult>;
-    private setBasicAuth;
-    loginRequest(ctx: EggContext, sessionId: string): Promise<string | undefined>;
+    loginRender(ctx: EggContext, sessionId: string): Promise<"<h1>😭😭😭 Session not found, please try again on your command line 😭😭😭</h1>" | undefined>;
+    loginImplement(ctx: EggContext, sessionId: string, loginImplementRequest: any): Promise<{
+        ok: boolean;
+        message: string;
+    } | {
+        ok: boolean;
+        message?: undefined;
+    }>;
+    loginPrepare(ctx: EggContext, sessionId: string, name: string): Promise<LoginPrepareResult | {
+        ok: boolean;
+        message: string;
+    }>;
     ssoRequest(ctx: EggContext, sessionId: string): Promise<{
         success: boolean;
     }>;

package/dist/app/port/webauth/WebauthController.js

@@ -11,16 +11,24 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebauthController = void 0;
 const tegg_1 = require("@eggjs/tegg");
 const typebox_1 = require("@sinclair/typebox");
 const egg_errors_1 = require("egg-errors");
+const crypto_1 = require("crypto");
+const base64url_1 = __importDefault(require("base64url"));
+const server_1 = require("@simplewebauthn/server");
 const User_1 = require("../../common/enum/User");
 const CacheAdapter_1 = require("../../common/adapter/CacheAdapter");
 const UserService_1 = require("../../core/service/UserService");
 const middleware_1 = require("../middleware");
 const AuthAdapter_1 = require("../../infra/AuthAdapter");
+const CryptoUtil_1 = require("../../common/CryptoUtil");
+const UserUtil_1 = require("../../common/UserUtil");
 const LoginRequestRule = typebox_1.Type.Object({
     // cli 所在机器的 hostname
     hostname: typebox_1.Type.String({ minLength: 1, maxLength: 100 }),
@@ -39,11 +47,7 @@ let WebauthController = class WebauthController extends middleware_1.MiddlewareC
         ctx.tValidate(LoginRequestRule, loginRequest);
         return this.authAdapter.getAuthUrl(ctx);
     }
-    setBasicAuth(ctx) {
-        ctx.status = 401;
-        ctx.set('WWW-Authenticate', 'Basic realm="Login to cnpmcore"');
-    }
-    async loginRequest(ctx, sessionId) {
+    async loginRender(ctx, sessionId) {
         ctx.tValidate(SessionRule, { sessionId });
         ctx.type = 'html';
         const sessionToken = await this.cacheAdapter.get(sessionId);
@@ -51,66 +55,190 @@ let WebauthController = class WebauthController extends middleware_1.MiddlewareC
             ctx.status = 404;
             return '<h1>😭😭😭 Session not found, please try again on your command line 😭😭😭</h1>';
         }
-        // Basic auth
-        const authorization = ctx.get('authorization');
-        if (!authorization) {
-            this.setBasicAuth(ctx);
-            return 'Unauthorized';
-        }
-        // 'Basic xxxx=='
-        if (!authorization.startsWith('Basic ')) {
-            this.setBasicAuth(ctx);
-            return 'Unauthorized, invalid authorization, only support "Basic" authorization';
-        }
-        const base64String = authorization.replace('Basic ', '');
-        // {user}:{pass}
-        const userAuth = Buffer.from(base64String, 'base64').toString();
-        const sepIndex = userAuth.indexOf(':');
-        const username = userAuth.substring(0, sepIndex);
-        const password = userAuth.substring(sepIndex + 1);
-        const user = {
-            name: username,
-            password,
-        };
+        const keys = (0, CryptoUtil_1.genRSAKeys)();
+        await this.cacheAdapter.set(`${sessionId}_privateKey`, keys.privateKey);
+        await ctx.render('login.html', {
+            sessionId,
+            publicKey: keys.publicKey,
+            enableWebauthn: this.config.cnpmcore.enableWebAuthn,
+        });
+    }
+    async loginImplement(ctx, sessionId, loginImplementRequest) {
+        ctx.tValidate(SessionRule, { sessionId });
+        const sessionToken = await this.cacheAdapter.get(sessionId);
+        if (typeof sessionToken !== 'string') {
+            return { ok: false, message: 'Session not found, please try again on your command line' };
+        }
+        const { accData, wanCredentialRegiData, wanCredentialAuthData, needUnbindWan } = loginImplementRequest;
+        const { username, password = '' } = accData;
+        const enableWebAuthn = this.config.cnpmcore.enableWebAuthn;
+        const isSupportWebAuthn = ctx.protocol === 'https' || ctx.hostname === 'localhost';
+        let token = '';
+        let user;
+        // public registration
+        if (this.config.cnpmcore.allowPublicRegistration === false) {
+            if (!this.config.cnpmcore.admins[username]) {
+                return { ok: false, message: 'Public registration is not allowed' };
+            }
+        }
+        const browserType = (0, UserUtil_1.getBrowserTypeForWebauthn)(ctx.headers['user-agent']);
+        const expectedChallenge = (await this.cacheAdapter.get(`${sessionId}_challenge`)) || '';
+        const expectedOrigin = this.config.cnpmcore.registry;
+        const expectedRPID = new URL(expectedOrigin).hostname;
+        // webauthn authentication
+        if (enableWebAuthn && isSupportWebAuthn && wanCredentialAuthData) {
+            user = await this.userService.findUserByName(username);
+            if (!user) {
+                return { ok: false, message: 'Unauthorized, Please check your login name' };
+            }
+            const credential = await this.userService.findWebauthnCredential(user.userId, browserType);
+            if (!credential?.credentialId || !credential?.publicKey) {
+                return { ok: false, message: 'Unauthorized, Please check your login name' };
+            }
+            try {
+                const verification = await (0, server_1.verifyAuthenticationResponse)({
+                    response: wanCredentialAuthData,
+                    expectedChallenge,
+                    expectedOrigin,
+                    expectedRPID,
+                    authenticator: {
+                        credentialPublicKey: base64url_1.default.toBuffer(credential.publicKey),
+                        credentialID: base64url_1.default.toBuffer(credential.credentialId),
+                        counter: 0,
+                    },
+                });
+                const { verified } = verification;
+                if (!verified) {
+                    return { ok: false, message: 'Invalid security arguments, please try again on your browser' };
+                }
+            }
+            catch (err) {
+                this.logger.error('[WebauthController.loginImplement:verify-authentication-fail] expectedChallenge: %s, expectedOrigin: %s, expectedRPID: %s, wanCredentialAuthData: %j, error: %j', expectedChallenge, expectedOrigin, expectedRPID, wanCredentialAuthData, err);
+                return { ok: false, message: 'Authentication failed, please continue to sign in with your password' };
+            }
+            const createToken = await this.userService.createToken(user.userId);
+            token = createToken.token;
+            await this.cacheAdapter.set(sessionId, token);
+            return { ok: true };
+        }
+        // check privateKey valid
+        const privateKey = await this.cacheAdapter.get(`${sessionId}_privateKey`);
+        if (!privateKey) {
+            return { ok: false, message: 'Invalid security arguments, please try again on your browser' };
+        }
+        // check login name and password valid
+        const realPassword = (0, CryptoUtil_1.decryptRSA)(privateKey, password);
         try {
-            ctx.tValidate(UserRule, user);
+            ctx.tValidate(UserRule, {
+                name: username,
+                password: realPassword,
+            });
         }
         catch (err) {
             const message = err.message;
-            this.setBasicAuth(ctx);
-            return `Unauthorized, ${message}`;
-        }
-        if (this.config.cnpmcore.allowPublicRegistration === false) {
-            if (!this.config.cnpmcore.admins[user.name]) {
-                ctx.status = 403;
-                return '<h1>😭😭😭 Public registration is not allowed 😭😭😭</h1>';
-            }
+            return { ok: false, message: `Unauthorized, ${message}` };
         }
-        const result = await this.userService.login(user.name, user.password);
+        const result = await this.userService.login(username, realPassword);
         // user exists and password not match
         if (result.code === User_1.LoginResultCode.Fail) {
-            this.setBasicAuth(ctx);
-            return '<h1>😭😭😭 Please check your login name and password 😭😭😭</h1>';
+            return { ok: false, message: 'Please check your login name and password' };
         }
-        let token = '';
         if (result.code === User_1.LoginResultCode.Success) {
             // login success
             token = result.token.token;
+            user = result.user;
+            // need unbind webauthn credential
+            if (needUnbindWan) {
+                await this.userService.removeWebauthnCredential(user.userId, browserType);
+            }
         }
         else {
             // others: LoginResultCode.UserNotFound
             // create user request
             const createRes = await this.userService.ensureTokenByUser({
-                name: user.name,
-                password: user.password,
+                name: username,
+                password: realPassword,
                 // FIXME: email verify
-                email: `${user.name}@webauth.cnpmjs.org`,
+                email: `${username}@webauth.cnpmjs.org`,
                 ip: ctx.ip,
             });
-            token = createRes.token;
+            token = createRes.token.token;
+            user = createRes.user;
         }
         await this.cacheAdapter.set(sessionId, token);
-        ctx.redirect('/-/v1/login/request/success');
+        // webauthn registration
+        if (enableWebAuthn && isSupportWebAuthn && wanCredentialRegiData) {
+            try {
+                const verification = await (0, server_1.verifyRegistrationResponse)({
+                    response: wanCredentialRegiData,
+                    expectedChallenge,
+                    expectedOrigin,
+                    expectedRPID,
+                });
+                const { verified, registrationInfo } = verification;
+                if (verified && registrationInfo) {
+                    const { credentialPublicKey, credentialID } = registrationInfo;
+                    const base64CredentialPublicKey = base64url_1.default.encode(Buffer.from(new Uint8Array(credentialPublicKey)));
+                    const base64CredentialID = base64url_1.default.encode(Buffer.from(new Uint8Array(credentialID)));
+                    this.userService.createWebauthnCredential(user.userId, {
+                        credentialId: base64CredentialID,
+                        publicKey: base64CredentialPublicKey,
+                        browserType,
+                    });
+                }
+            }
+            catch (err) {
+                this.logger.error('[WebauthController.loginImplement:verify-registration-fail] expectedChallenge: %s, expectedOrigin: %s, expectedRPID: %s, wanCredentialRegiData: %j, error: %j', expectedChallenge, expectedOrigin, expectedRPID, wanCredentialRegiData, err);
+            }
+        }
+        return { ok: true };
+    }
+    async loginPrepare(ctx, sessionId, name) {
+        ctx.tValidate(SessionRule, { sessionId });
+        const sessionToken = await this.cacheAdapter.get(sessionId);
+        if (typeof sessionToken !== 'string') {
+            return { ok: false, message: 'Session not found, please try again on your command line' };
+        }
+        const browserType = (0, UserUtil_1.getBrowserTypeForWebauthn)(ctx.headers['user-agent']);
+        const expectedRPID = new URL(this.config.cnpmcore.registry).hostname;
+        const user = await this.userService.findUserByName(name);
+        const result = { wanStatus: User_1.WanStatusCode.UserNotFound };
+        let credential;
+        if (user) {
+            credential = await this.userService.findWebauthnCredential(user.userId, browserType);
+            result.wanStatus = User_1.WanStatusCode.Unbound;
+        }
+        if (credential?.credentialId && credential?.publicKey) {
+            result.wanStatus = User_1.WanStatusCode.Bound;
+            result.wanCredentialAuthOption = (0, server_1.generateAuthenticationOptions)({
+                timeout: 60000,
+                rpID: expectedRPID,
+                allowCredentials: [{
+                        id: base64url_1.default.toBuffer(credential.credentialId),
+                        type: 'public-key',
+                        transports: ['internal'],
+                    }],
+            });
+            await this.cacheAdapter.set(`${sessionId}_challenge`, result.wanCredentialAuthOption.challenge);
+        }
+        else {
+            const encoder = new TextEncoder();
+            const regUserIdBuffer = (0, crypto_1.createHash)('sha256').update(encoder.encode(name)).digest();
+            result.wanCredentialRegiOption = (0, server_1.generateRegistrationOptions)({
+                rpName: ctx.app.config.name,
+                rpID: expectedRPID,
+                userID: base64url_1.default.encode(Buffer.from(regUserIdBuffer)),
+                userName: name,
+                userDisplayName: name,
+                timeout: 60000,
+                attestationType: 'direct',
+                authenticatorSelection: {
+                    authenticatorAttachment: 'platform',
+                },
+            });
+            await this.cacheAdapter.set(`${sessionId}_challenge`, result.wanCredentialRegiOption.challenge);
+        }
+        return result;
     }
     async ssoRequest(ctx, sessionId) {
         ctx.tValidate(SessionRule, { sessionId });
@@ -126,7 +254,7 @@ let WebauthController = class WebauthController extends middleware_1.MiddlewareC
         }
         const { name, email } = userRes;
         const { token } = await this.userService.ensureTokenByUser({ name, email, ip: ctx.ip });
-        await this.cacheAdapter.set(sessionId, token);
+        await this.cacheAdapter.set(sessionId, token.token);
         return { success: true };
     }
     async loginRequestSuccess(ctx) {
@@ -147,6 +275,8 @@ let WebauthController = class WebauthController extends middleware_1.MiddlewareC
         }
         // only get once
         await this.cacheAdapter.delete(sessionId);
+        await this.cacheAdapter.delete(`${sessionId}_challenge`);
+        await this.cacheAdapter.delete(`${sessionId}_privateKey`);
         return { token };
     }
 };
@@ -191,7 +321,31 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, String]),
     __metadata("design:returntype", Promise)
-], WebauthController.prototype, "loginRequest", null);
+], WebauthController.prototype, "loginRender", null);
+__decorate([
+    (0, tegg_1.HTTPMethod)({
+        path: '/-/v1/login/request/session/:sessionId',
+        method: tegg_1.HTTPMethodEnum.POST,
+    }),
+    __param(0, (0, tegg_1.Context)()),
+    __param(1, (0, tegg_1.HTTPParam)()),
+    __param(2, (0, tegg_1.HTTPBody)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, String, Object]),
+    __metadata("design:returntype", Promise)
+], WebauthController.prototype, "loginImplement", null);
+__decorate([
+    (0, tegg_1.HTTPMethod)({
+        path: '/-/v1/login/request/prepare/:sessionId',
+        method: tegg_1.HTTPMethodEnum.GET,
+    }),
+    __param(0, (0, tegg_1.Context)()),
+    __param(1, (0, tegg_1.HTTPParam)()),
+    __param(2, (0, tegg_1.HTTPQuery)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, String, String]),
+    __metadata("design:returntype", Promise)
+], WebauthController.prototype, "loginPrepare", null);
 __decorate([
     (0, tegg_1.HTTPMethod)({
         path: '/-/v1/login/sso/:sessionId',
@@ -228,4 +382,4 @@ WebauthController = __decorate([
     (0, tegg_1.HTTPController)()
 ], WebauthController);
 exports.WebauthController = WebauthController;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViYXV0aENvbnRyb2xsZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9hcHAvcG9ydC93ZWJhdXRoL1dlYmF1dGhDb250cm9sbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHNDQVNxQjtBQUtyQiwrQ0FBaUQ7QUFDakQsMkNBQTJEO0FBQzNELGlEQUF5RDtBQUN6RCxvRUFBaUU7QUFDakUsZ0VBQTZEO0FBQzdELDhDQUFxRDtBQUNyRCx5REFBc0Q7QUFFdEQsTUFBTSxnQkFBZ0IsR0FBRyxjQUFJLENBQUMsTUFBTSxDQUFDO0lBQ25DLHFCQUFxQjtJQUNyQixRQUFRLEVBQUUsY0FBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDLEVBQUUsU0FBUyxFQUFFLEdBQUcsRUFBRSxDQUFDO0NBQ3hELENBQUMsQ0FBQztBQUdILE1BQU0sUUFBUSxHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDM0IsSUFBSSxFQUFFLGNBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsQ0FBQztJQUNuRCxRQUFRLEVBQUUsY0FBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUFDLEVBQUUsU0FBUyxFQUFFLEdBQUcsRUFBRSxDQUFDO0NBQ3hELENBQUMsQ0FBQztBQUdILE1BQU0sV0FBVyxHQUFHLGNBQUksQ0FBQyxNQUFNLENBQUM7SUFDOUIsT0FBTztJQUNQLFNBQVMsRUFBRSxjQUFJLENBQUMsTUFBTSxDQUFDLEVBQUUsU0FBUyxFQUFFLEVBQUUsRUFBRSxTQUFTLEVBQUUsRUFBRSxFQUFFLENBQUM7Q0FDekQsQ0FBQyxDQUFDO0FBR0ksSUFBTSxpQkFBaUIsR0FBdkIsTUFBTSxpQkFBa0IsU0FBUSxpQ0FBb0I7SUFZekQsOENBQThDO0lBS3hDLEFBQU4sS0FBSyxDQUFDLEtBQUssQ0FBWSxHQUFlLEVBQWMsWUFBMEI7UUFDNUUsR0FBRyxDQUFDLFNBQVMsQ0FBQyxnQkFBZ0IsRUFBRSxZQUFZLENBQUMsQ0FBQztRQUM5QyxPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzFDLENBQUM7SUFFTyxZQUFZLENBQUMsR0FBZTtRQUNsQyxHQUFHLENBQUMsTUFBTSxHQUFHLEdBQUcsQ0FBQztRQUNqQixHQUFHLENBQUMsR0FBRyxDQUFDLGtCQUFrQixFQUFFLGlDQUFpQyxDQUFDLENBQUM7SUFDakUsQ0FBQztJQU1LLEFBQU4sS0FBSyxDQUFDLFlBQVksQ0FBWSxHQUFlLEVBQWUsU0FBaUI7UUFDM0UsR0FBRyxDQUFDLFNBQVMsQ0FBQyxXQUFXLEVBQUUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO1FBQzFDLEdBQUcsQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDO1FBQ2xCLE1BQU0sWUFBWSxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDNUQsSUFBSSxPQUFPLFlBQVksS0FBSyxRQUFRLEVBQUU7WUFDcEMsR0FBRyxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUM7WUFDakIsT0FBTyxpRkFBaUYsQ0FBQztTQUMxRjtRQUNELGFBQWE7UUFDYixNQUFNLGFBQWEsR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQy9DLElBQUksQ0FBQyxhQUFhLEVBQUU7WUFDbEIsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUN2QixPQUFPLGNBQWMsQ0FBQztTQUN2QjtRQUNELGlCQUFpQjtRQUNqQixJQUFJLENBQUMsYUFBYSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBRTtZQUN2QyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3ZCLE9BQU8seUVBQXlFLENBQUM7U0FDbEY7UUFDRCxNQUFNLFlBQVksR0FBRyxhQUFhLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUN6RCxnQkFBZ0I7UUFDaEIsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDaEUsTUFBTSxRQUFRLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN2QyxNQUFNLFFBQVEsR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxRQUFRLENBQUMsQ0FBQztRQUNqRCxNQUFNLFFBQVEsR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNsRCxNQUFNLElBQUksR0FBUztZQUNqQixJQUFJLEVBQUUsUUFBUTtZQUNkLFFBQVE7U0FDVCxDQUFDO1FBQ0YsSUFBSTtZQUNGLEdBQUcsQ0FBQyxTQUFTLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO1NBQy9CO1FBQUMsT0FBTyxHQUFHLEVBQUU7WUFDWixNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDO1lBQzVCLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDdkIsT0FBTyxpQkFBaUIsT0FBTyxFQUFFLENBQUM7U0FDbkM7UUFFRCxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLHVCQUF1QixLQUFLLEtBQUssRUFBRTtZQUMxRCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDM0MsR0FBRyxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUM7Z0JBQ2pCLE9BQU8sMkRBQTJELENBQUM7YUFDcEU7U0FDRjtRQUVELE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDdEUscUNBQXFDO1FBQ3JDLElBQUksTUFBTSxDQUFDLElBQUksS0FBSyxzQkFBZSxDQUFDLElBQUksRUFBRTtZQUN4QyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3ZCLE9BQU8sa0VBQWtFLENBQUM7U0FDM0U7UUFFRCxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7UUFDZixJQUFJLE1BQU0sQ0FBQyxJQUFJLEtBQUssc0JBQWUsQ0FBQyxPQUFPLEVBQUU7WUFDM0MsZ0JBQWdCO1lBQ2hCLEtBQUssR0FBRyxNQUFNLENBQUMsS0FBTSxDQUFDLEtBQU0sQ0FBQztTQUM5QjthQUFNO1lBQ0wsdUNBQXVDO1lBQ3ZDLHNCQUFzQjtZQUN0QixNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQUM7Z0JBQ3pELElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTtnQkFDZixRQUFRLEVBQUUsSUFBSSxDQUFDLFFBQVE7Z0JBQ3ZCLHNCQUFzQjtnQkFDdEIsS0FBSyxFQUFFLEdBQUcsSUFBSSxDQUFDLElBQUkscUJBQXFCO2dCQUN4QyxFQUFFLEVBQUUsR0FBRyxDQUFDLEVBQUU7YUFDWCxDQUFDLENBQUM7WUFDSCxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQU0sQ0FBQztTQUMxQjtRQUVELE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzlDLEdBQUcsQ0FBQyxRQUFRLENBQUMsNkJBQTZCLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBTUssQUFBTixLQUFLLENBQUMsVUFBVSxDQUFZLEdBQWUsRUFBZSxTQUFpQjtRQUN6RSxHQUFHLENBQUMsU0FBUyxDQUFDLFdBQVcsRUFBRSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUM7UUFDMUMsTUFBTSxXQUFXLEdBQUcsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUMzRCxJQUFJLFdBQVcsS0FBSyxFQUFFLEVBQUU7WUFDdEIsTUFBTSxJQUFJLDJCQUFjLENBQUMsbUJBQW1CLENBQUMsQ0FBQztTQUMvQztRQUNELGtDQUFrQztRQUNsQyxnREFBZ0Q7UUFDaEQsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLGlCQUFpQixFQUFFLENBQUM7UUFDM0QsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsS0FBSyxFQUFFO1lBQ3JDLE1BQU0sSUFBSSwyQkFBYyxDQUFDLG1CQUFtQixDQUFDLENBQUM7U0FDL0M7UUFDRCxNQUFNLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxHQUFHLE9BQU8sQ0FBQztRQUNoQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLGlCQUFpQixDQUFDLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsR0FBRyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDeEYsTUFBTSxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsS0FBTSxDQUFDLENBQUM7UUFFL0MsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBTUssQUFBTixLQUFLLENBQUMsbUJBQW1CLENBQVksR0FBZTtRQUNsRCxHQUFHLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQztRQUNsQixPQUFPO21FQUN3RCxDQUFDO0lBQ2xFLENBQUM7SUFNSyxBQUFOLEtBQUssQ0FBQyxTQUFTLENBQVksR0FBZSxFQUFlLFNBQWlCO1FBQ3hFLEdBQUcsQ0FBQyxTQUFTLENBQUMsV0FBVyxFQUFFLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQztRQUMxQyxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3JELElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxFQUFFO1lBQzdCLE1BQU0sSUFBSSwwQkFBYSxDQUFDLG1CQUFtQixDQUFDLENBQUM7U0FDOUM7UUFDRCxJQUFJLEtBQUssS0FBSyxFQUFFLEVBQUU7WUFDaEIsR0FBRyxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUM7WUFDakIsR0FBRyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEVBQUUsR0FBRyxDQUFDLENBQUM7WUFDNUIsT0FBTyxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsQ0FBQztTQUNsQztRQUNELGdCQUFnQjtRQUNoQixNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzFDLE9BQU8sRUFBRSxLQUFLLEVBQUUsQ0FBQztJQUNuQixDQUFDO0NBQ0YsQ0FBQTtBQTFKQztJQUFDLElBQUEsYUFBTSxHQUFFOzhCQUNhLDJCQUFZO3VEQUFDO0FBQ25DO0lBQUMsSUFBQSxhQUFNLEdBQUU7OEJBQ1kseUJBQVc7c0RBQUM7QUFDakM7SUFBQyxJQUFBLGFBQU0sR0FBRTs7aURBQ21CO0FBQzVCO0lBQUMsSUFBQSxhQUFNLEdBQUU7O2lEQUNzQjtBQUMvQjtJQUFDLElBQUEsYUFBTSxHQUFFOzhCQUNjLHlCQUFXO3NEQUFDO0FBTzdCO0lBSkwsSUFBQSxpQkFBVSxFQUFDO1FBQ1YsSUFBSSxFQUFFLGFBQWE7UUFDbkIsTUFBTSxFQUFFLHFCQUFjLENBQUMsSUFBSTtLQUM1QixDQUFDO0lBQ1csV0FBQSxJQUFBLGNBQU8sR0FBRSxDQUFBO0lBQW1CLFdBQUEsSUFBQSxlQUFRLEdBQUUsQ0FBQTs7Ozs4Q0FHbEQ7QUFXSztJQUpMLElBQUEsaUJBQVUsRUFBQztRQUNWLElBQUksRUFBRSx3Q0FBd0M7UUFDOUMsTUFBTSxFQUFFLHFCQUFjLENBQUMsR0FBRztLQUMzQixDQUFDO0lBQ2tCLFdBQUEsSUFBQSxjQUFPLEdBQUUsQ0FBQTtJQUFtQixXQUFBLElBQUEsZ0JBQVMsR0FBRSxDQUFBOzs7O3FEQXNFMUQ7QUFNSztJQUpMLElBQUEsaUJBQVUsRUFBQztRQUNWLElBQUksRUFBRSw0QkFBNEI7UUFDbEMsTUFBTSxFQUFFLHFCQUFjLENBQUMsSUFBSTtLQUM1QixDQUFDO0lBQ2dCLFdBQUEsSUFBQSxjQUFPLEdBQUUsQ0FBQTtJQUFtQixXQUFBLElBQUEsZ0JBQVMsR0FBRSxDQUFBOzs7O21EQWlCeEQ7QUFNSztJQUpMLElBQUEsaUJBQVUsRUFBQztRQUNWLElBQUksRUFBRSw2QkFBNkI7UUFDbkMsTUFBTSxFQUFFLHFCQUFjLENBQUMsR0FBRztLQUMzQixDQUFDO0lBQ3lCLFdBQUEsSUFBQSxjQUFPLEdBQUUsQ0FBQTs7Ozs0REFJbkM7QUFNSztJQUpMLElBQUEsaUJBQVUsRUFBQztRQUNWLElBQUksRUFBRSxxQ0FBcUM7UUFDM0MsTUFBTSxFQUFFLHFCQUFjLENBQUMsR0FBRztLQUMzQixDQUFDO0lBQ2UsV0FBQSxJQUFBLGNBQU8sR0FBRSxDQUFBO0lBQW1CLFdBQUEsSUFBQSxnQkFBUyxHQUFFLENBQUE7Ozs7a0RBY3ZEO0FBMUpVLGlCQUFpQjtJQUQ3QixJQUFBLHFCQUFjLEdBQUU7R0FDSixpQkFBaUIsQ0EySjdCO0FBM0pZLDhDQUFpQiJ9
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WebauthController.js","sourceRoot":"","sources":["../../../../app/port/webauth/WebauthController.ts"],"names":[],"mappings":"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"}

package/dist/app/repository/UserRepository.d.ts

@@ -1,9 +1,11 @@
 import { User as UserEntity } from '../core/entity/User';
 import { Token as TokenEntity } from '../core/entity/Token';
+import { WebauthnCredential as WebauthnCredentialEntity } from '../core/entity/WebauthnCredential';
 import { AbstractRepository } from './AbstractRepository';
 export declare class UserRepository extends AbstractRepository {
     private readonly User;
     private readonly Token;
+    private readonly WebauthnCredential;
     saveUser(user: UserEntity): Promise<void>;
     findUserByName(name: string): Promise<UserEntity | null>;
     findUserByUserId(userId: string): Promise<UserEntity | null>;
@@ -15,4 +17,7 @@ export declare class UserRepository extends AbstractRepository {
     saveToken(token: TokenEntity): Promise<void>;
     removeToken(tokenId: string): Promise<void>;
     listTokens(userId: string): Promise<TokenEntity[]>;
+    saveCredential(credential: WebauthnCredentialEntity): Promise<void>;
+    findCredentialByUserIdAndBrowserType(userId: string, browserType: string | null): Promise<WebauthnCredentialEntity | null>;
+    removeCredential(wancId: string): Promise<void>;
 }

package/dist/app/repository/UserRepository.js

@@ -14,6 +14,7 @@ const tegg_1 = require("@eggjs/tegg");
 const ModelConvertor_1 = require("./util/ModelConvertor");
 const User_1 = require("../core/entity/User");
 const Token_1 = require("../core/entity/Token");
+const WebauthnCredential_1 = require("../core/entity/WebauthnCredential");
 const AbstractRepository_1 = require("./AbstractRepository");
 let UserRepository = class UserRepository extends AbstractRepository_1.AbstractRepository {
     async saveUser(user) {
@@ -78,6 +79,31 @@ let UserRepository = class UserRepository extends AbstractRepository_1.AbstractR
         const models = await this.Token.find({ userId });
         return models.map(model => ModelConvertor_1.ModelConvertor.convertModelToEntity(model, Token_1.Token));
     }
+    async saveCredential(credential) {
+        if (credential.id) {
+            const model = await this.WebauthnCredential.findOne({ id: credential.id });
+            if (!model)
+                return;
+            await ModelConvertor_1.ModelConvertor.saveEntityToModel(credential, model);
+        }
+        else {
+            const model = await ModelConvertor_1.ModelConvertor.convertEntityToModel(credential, this.WebauthnCredential);
+            this.logger.info('[UserRepository:saveCredential:new] id: %s, wancId: %s', model.id, model.wancId);
+        }
+    }
+    async findCredentialByUserIdAndBrowserType(userId, browserType) {
+        const model = await this.WebauthnCredential.findOne({
+            userId,
+            browserType,
+        });
+        if (!model)
+            return null;
+        return ModelConvertor_1.ModelConvertor.convertModelToEntity(model, WebauthnCredential_1.WebauthnCredential);
+    }
+    async removeCredential(wancId) {
+        const removeCount = await this.WebauthnCredential.remove({ wancId });
+        this.logger.info('[UserRepository:removeCredential:remove] %d rows, wancId: %s', removeCount, wancId);
+    }
 };
 __decorate([
     (0, tegg_1.Inject)(),
@@ -87,10 +113,14 @@ __decorate([
     (0, tegg_1.Inject)(),
     __metadata("design:type", Object)
 ], UserRepository.prototype, "Token", void 0);
+__decorate([
+    (0, tegg_1.Inject)(),
+    __metadata("design:type", Object)
+], UserRepository.prototype, "WebauthnCredential", void 0);
 UserRepository = __decorate([
     (0, tegg_1.SingletonProto)({
         accessLevel: tegg_1.AccessLevel.PUBLIC,
     })
 ], UserRepository);
 exports.UserRepository = UserRepository;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9Vc2VyUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FBa0U7QUFDbEUsMERBQXVEO0FBR3ZELDhDQUF5RDtBQUN6RCxnREFBNEQ7QUFDNUQsNkRBQTBEO0FBS25ELElBQU0sY0FBYyxHQUFwQixNQUFNLGNBQWUsU0FBUSx1Q0FBa0I7SUFPcEQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFnQjtRQUM3QixJQUFJLElBQUksQ0FBQyxFQUFFLEVBQUU7WUFDWCxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ3ZELElBQUksQ0FBQyxLQUFLO2dCQUFFLE9BQU87WUFDbkIsTUFBTSwrQkFBYyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztTQUNyRDthQUFNO1lBQ0wsTUFBTSxLQUFLLEdBQUcsTUFBTSwrQkFBYyxDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDekUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0RBQWtELEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRSxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7U0FDOUY7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLGNBQWMsQ0FBQyxJQUFZO1FBQy9CLE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ2hELElBQUksQ0FBQyxLQUFLO1lBQUUsT0FBTyxJQUFJLENBQUM7UUFDeEIsT0FBTywrQkFBYyxDQUFDLG9CQUFvQixDQUFDLEtB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlclJlcG9zaXRvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9hcHAvcmVwb3NpdG9yeS9Vc2VyUmVwb3NpdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FBa0U7QUFDbEUsMERBQXVEO0FBSXZELDhDQUF5RDtBQUN6RCxnREFBNEQ7QUFDNUQsMEVBQW1HO0FBQ25HLDZEQUEwRDtBQUtuRCxJQUFNLGNBQWMsR0FBcEIsTUFBTSxjQUFlLFNBQVEsdUNBQWtCO0lBVXBELEtBQUssQ0FBQyxRQUFRLENBQUMsSUFBZ0I7UUFDN0IsSUFBSSxJQUFJLENBQUMsRUFBRSxFQUFFO1lBQ1gsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN2RCxJQUFJLENBQUMsS0FBSztnQkFBRSxPQUFPO1lBQ25CLE1BQU0sK0JBQWMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDckQ7YUFBTTtZQUNMLE1BQU0sS0FBSyxHQUFHLE1BQU0sK0JBQWMsQ0FBQyxvQkFBb0IsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3pFLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGtEQUFrRCxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1NBQzlGO0lBQ0gsQ0FBQztJQUVELEtBQUssQ0FBQyxjQUFjLENBQUMsSUFBWTtRQUMvQixNQUFNLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUNoRCxJQUFJLENBQUMsS0FBSztZQUFFLE9BQU8sSUFBSSxDQUFDO1FBQ3hCLE9BQU8sK0JBQWMsQ0FBQyxv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

package/dist/app/repository/model/WebauthnCredential.d.ts

@@ -0,0 +1,11 @@
+import { Bone } from 'leoric';
+export declare class WebauthnCredential extends Bone {
+    id: bigint;
+    createdAt: Date;
+    updatedAt: Date;
+    wancId: string;
+    userId: string;
+    credentialId: string;
+    publicKey: string;
+    browserType: string;
+}

package/dist/app/repository/model/WebauthnCredential.js

@@ -0,0 +1,58 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebauthnCredential = void 0;
+const orm_1 = require("@eggjs/tegg/orm");
+const leoric_1 = require("leoric");
+let WebauthnCredential = class WebauthnCredential extends leoric_1.Bone {
+};
+__decorate([
+    (0, orm_1.Attribute)(leoric_1.DataTypes.BIGINT, {
+        primary: true,
+        autoIncrement: true,
+    }),
+    __metadata("design:type", BigInt)
+], WebauthnCredential.prototype, "id", void 0);
+__decorate([
+    (0, orm_1.Attribute)(leoric_1.DataTypes.DATE, { name: 'gmt_create' }),
+    __metadata("design:type", Date)
+], WebauthnCredential.prototype, "createdAt", void 0);
+__decorate([
+    (0, orm_1.Attribute)(leoric_1.DataTypes.DATE, { name: 'gmt_modified' }),
+    __metadata("design:type", Date)
+], WebauthnCredential.prototype, "updatedAt", void 0);
+__decorate([
+    (0, orm_1.Attribute)(leoric_1.DataTypes.STRING(24), {
+        unique: true,
+    }),
+    __metadata("design:type", String)
+], WebauthnCredential.prototype, "wancId", void 0);
+__decorate([
+    (0, orm_1.Attribute)(leoric_1.DataTypes.STRING(24)),
+    __metadata("design:type", String)
+], WebauthnCredential.prototype, "userId", void 0);
+__decorate([
+    (0, orm_1.Attribute)(leoric_1.DataTypes.STRING(200)),
+    __metadata("design:type", String)
+], WebauthnCredential.prototype, "credentialId", void 0);
+__decorate([
+    (0, orm_1.Attribute)(leoric_1.DataTypes.STRING(512)),
+    __metadata("design:type", String)
+], WebauthnCredential.prototype, "publicKey", void 0);
+__decorate([
+    (0, orm_1.Attribute)(leoric_1.DataTypes.STRING(24), { allowNull: true }),
+    __metadata("design:type", String)
+], WebauthnCredential.prototype, "browserType", void 0);
+WebauthnCredential = __decorate([
+    (0, orm_1.Model)()
+], WebauthnCredential);
+exports.WebauthnCredential = WebauthnCredential;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV2ViYXV0aG5DcmVkZW50aWFsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vYXBwL3JlcG9zaXRvcnkvbW9kZWwvV2ViYXV0aG5DcmVkZW50aWFsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLHlDQUFtRDtBQUNuRCxtQ0FBeUM7QUFHbEMsSUFBTSxrQkFBa0IsR0FBeEIsTUFBTSxrQkFBbUIsU0FBUSxhQUFJO0NBNkIzQyxDQUFBO0FBNUJDO0lBQUMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxNQUFNLEVBQUU7UUFDM0IsT0FBTyxFQUFFLElBQUk7UUFDYixhQUFhLEVBQUUsSUFBSTtLQUNwQixDQUFDOzs4Q0FDUztBQUVYO0lBQUMsSUFBQSxlQUFTLEVBQUMsa0JBQVMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLENBQUM7OEJBQ3ZDLElBQUk7cURBQUM7QUFFaEI7SUFBQyxJQUFBLGVBQVMsRUFBQyxrQkFBUyxDQUFDLElBQUksRUFBRSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsQ0FBQzs4QkFDekMsSUFBSTtxREFBQztBQUVoQjtJQUFDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFO1FBQy9CLE1BQU0sRUFBRSxJQUFJO0tBQ2IsQ0FBQzs7a0RBQ2E7QUFFZjtJQUFDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDOztrREFDakI7QUFFZjtJQUFDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDOzt3REFDWjtBQUVyQjtJQUFDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDOztxREFDZjtBQUVsQjtJQUFDLElBQUEsZUFBUyxFQUFDLGtCQUFTLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDOzt1REFDakM7QUE1QlQsa0JBQWtCO0lBRDlCLElBQUEsV0FBSyxHQUFFO0dBQ0ssa0JBQWtCLENBNkI5QjtBQTdCWSxnREFBa0IifQ==

package/dist/config/config.default.js

@@ -70,6 +70,9 @@ exports.default = (appInfo) => {
             // name: email
             cnpmcore_admin: 'admin@cnpmjs.org',
         },
+        // use webauthn for login, https://webauthn.guide/
+        // only support platform authenticators, browser support: https://webauthn.me/browser-support
+        enableWebAuthn: false,
         // http response cache control header
         enableCDN: false,
         // if you are using CDN, can set it to 'max-age=0, s-maxage=120, must-revalidate'
@@ -165,6 +168,10 @@ exports.default = (appInfo) => {
     config.httpclient = {
         useHttpClientNext: true,
     };
+    config.view = {
+        root: (0, path_1.join)(appInfo.baseDir, 'app/port'),
+        defaultViewEngine: 'nunjucks',
+    };
     return config;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvY29uZmlnLmRlZmF1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxvREFBNEI7QUFDNUIsK0JBQTRCO0FBRTVCLHdEQUFpQztBQUNqQyxpREFBK0M7QUFDL0MsdURBQW1FO0FBRW5FLGtCQUFlLENBQUMsT0FBcUIsRUFBRSxFQUFFO0lBQ3ZDLE1BQU0sTUFBTSxHQUFHLEVBQWdDLENBQUM7SUFFaEQsTUFBTSxDQUFDLFFBQVEsR0FBRztRQUNoQixJQUFJLEVBQUUsTUFBTTtRQUNaLFVBQVUsRUFBRSxFQUFFO1FBQ2QsY0FBYyxFQUFFLDRCQUE0QjtRQUM1QyxpREFBaUQ7UUFDakQsZ0VBQWdFO1FBQ2hFLG9CQUFvQixFQUFFLEtBQUs7UUFDM0IsaUJBQWlCLEVBQUUsS0FBSztRQUN4QixTQUFTO1FBQ1QseUJBQXlCLEVBQUUsTUFBTTtRQUNqQyxzQkFBc0IsRUFBRSxHQUFHO1FBQzNCLFlBQVk7UUFDWixzRUFBc0U7UUFDdEUsZ0NBQWdDO1FBQ2hDLHFIQUFxSDtRQUNySCxRQUFRLEVBQUUsb0JBQVEsQ0FBQyxJQUFJO1FBQ3ZCLGNBQWMsRUFBRSwwQkFBYyxDQUFDLE1BQU07UUFDckMsVUFBVSxFQUFFLEtBQUs7UUFDakIsbUNBQW1DLEVBQUUsRUFBRTtRQUN2QyxtQ0FBbUMsRUFBRSxFQUFFO1FBQ3ZDLHlDQUF5QyxFQUFFLEVBQUU7UUFDN0Msd0NBQXdDO1FBQ3hDLG9CQUFvQixFQUFFLEVBQUU7UUFDeEIsMEdBQTBHO1FBQzFHLDhCQUE4QjtRQUM5QiwwQkFBMEIsRUFBRSxJQUFJO1FBQ2hDLGtDQUFrQztRQUNsQyxnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLDhDQUE4QztRQUM5Qyx1QkFBdUIsRUFBRSxFQUFFO1FBQzNCLDhGQUE4RjtRQUM5RiwwRUFBMEU7UUFDMUUsc0JBQXNCLEVBQUUsS0FBSztRQUM3Qiw4QkFBOEIsRUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9jb25maWcvY29uZmlnLmRlZmF1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxvREFBNEI7QUFDNUIsK0JBQTRCO0FBRTVCLHdEQUFpQztBQUNqQyxpREFBK0M7QUFDL0MsdURBQW1FO0FBRW5FLGtCQUFlLENBQUMsT0FBcUIsRUFBRSxFQUFFO0lBQ3ZDLE1BQU0sTUFBTSxHQUFHLEVBQWdDLENBQUM7SUFFaEQsTUFBTSxDQUFDLFFBQVEsR0FBRztRQUNoQixJQUFJLEVBQUUsTUFBTTtRQUNaLFVBQVUsRUFBRSxFQUFFO1FBQ2QsY0FBYyxFQUFFLDRCQUE0QjtRQUM1QyxpREFBaUQ7UUFDakQsZ0VBQWdFO1FBQ2hFLG9CQUFvQixFQUFFLEtBQUs7UUFDM0IsaUJBQWlCLEVBQUUsS0FBSztRQUN4QixTQUFTO1FBQ1QseUJBQXlCLEVBQUUsTUFBTTtRQUNqQyxzQkFBc0IsRUFBRSxHQUFHO1FBQzNCLFlBQVk7UUFDWixzRUFBc0U7UUFDdEUsZ0NBQWdDO1FBQ2hDLHFIQUFxSDtRQUNySCxRQUFRLEVBQUUsb0JBQVEsQ0FBQyxJQUFJO1FBQ3ZCLGNBQWMsRUFBRSwwQkFBYyxDQUFDLE1BQU07UUFDckMsVUFBVSxFQUFFLEtBQUs7UUFDakIsbUNBQW1DLEVBQUUsRUFBRTtRQUN2QyxtQ0FBbUMsRUFBRSxFQUFFO1FBQ3ZDLHlDQUF5QyxFQUFFLEVBQUU7UUFDN0Msd0NBQXdDO1FBQ3hDLG9CQUFvQixFQUFFLEVBQUU7UUFDeEIsMEdBQTBHO1FBQzFHLDhCQUE4QjtRQUM5QiwwQkFBMEIsRUFBRSxJQUFJO1FBQ2hDLGtDQUFrQztRQUNsQyxnQkFBZ0IsRUFBRSxLQUFLO1FBQ3ZCLDhDQUE4QztRQUM5Qyx1QkFBdUIsRUFBRSxFQUFFO1FBQzNCLDhGQUE4RjtRQUM5RiwwRUFBMEU7UUFDMUUsc0JBQXNCLEVBQUUsS0FBSztRQUM3Qiw4QkFBOEIsRUFB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

package/dist/config/plugin.js

@@ -30,7 +30,11 @@ const plugin = {
         package: '@eggjs/tegg-aop-plugin',
     },
     view: {
-        enable: false,
+        enable: true,
+    },
+    nunjucks: {
+        enable: true,
+        package: 'egg-view-nunjucks',
     },
     tracer: {
         enable: true,
@@ -50,4 +54,4 @@ const plugin = {
     },
 };
 exports.default = plugin;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vY29uZmlnL3BsdWdpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLE1BQU0sTUFBTSxHQUFjO0lBQ3hCLElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLG9CQUFvQjtLQUM5QjtJQUNELFVBQVUsRUFBRTtRQUNWLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLG9CQUFvQjtLQUM5QjtJQUNELGNBQWMsRUFBRTtRQUNkLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLCtCQUErQjtLQUN6QztJQUNELFlBQVksRUFBRTtRQUNaLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLDZCQUE2QjtLQUN2QztJQUNELE9BQU8sRUFBRTtRQUNQLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLHdCQUF3QjtLQUNsQztJQUNELGNBQWMsRUFBRTtRQUNkLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLDZCQUE2QjtLQUN2QztJQUNELFNBQVMsRUFBRTtRQUNULE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLHdCQUF3QjtLQUNsQztJQUNELElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxLQUFLO0tBQ2Q7SUFDRCxNQUFNLEVBQUU7UUFDTixNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxZQUFZO0tBQ3RCO0lBQ0QsZUFBZSxFQUFFO1FBQ2YsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUsc0JBQXNCO0tBQ2hDO0lBQ0QsS0FBSyxFQUFFO1FBQ0wsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUsV0FBVztLQUNyQjtJQUNELElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLFVBQVU7S0FDcEI7Q0FDRixDQUFDO0FBRUYsa0JBQWUsTUFBTSxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vY29uZmlnL3BsdWdpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLE1BQU0sTUFBTSxHQUFjO0lBQ3hCLElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLG9CQUFvQjtLQUM5QjtJQUNELFVBQVUsRUFBRTtRQUNWLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLG9CQUFvQjtLQUM5QjtJQUNELGNBQWMsRUFBRTtRQUNkLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLCtCQUErQjtLQUN6QztJQUNELFlBQVksRUFBRTtRQUNaLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLDZCQUE2QjtLQUN2QztJQUNELE9BQU8sRUFBRTtRQUNQLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLHdCQUF3QjtLQUNsQztJQUNELGNBQWMsRUFBRTtRQUNkLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLDZCQUE2QjtLQUN2QztJQUNELFNBQVMsRUFBRTtRQUNULE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLHdCQUF3QjtLQUNsQztJQUNELElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxJQUFJO0tBQ2I7SUFDRCxRQUFRLEVBQUU7UUFDUixNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxtQkFBbUI7S0FDN0I7SUFDRCxNQUFNLEVBQUU7UUFDTixNQUFNLEVBQUUsSUFBSTtRQUNaLE9BQU8sRUFBRSxZQUFZO0tBQ3RCO0lBQ0QsZUFBZSxFQUFFO1FBQ2YsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUsc0JBQXNCO0tBQ2hDO0lBQ0QsS0FBSyxFQUFFO1FBQ0wsTUFBTSxFQUFFLElBQUk7UUFDWixPQUFPLEVBQUUsV0FBVztLQUNyQjtJQUNELElBQUksRUFBRTtRQUNKLE1BQU0sRUFBRSxJQUFJO1FBQ1osT0FBTyxFQUFFLFVBQVU7S0FDcEI7Q0FDRixDQUFDO0FBRUYsa0JBQWUsTUFBTSxDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmcore",
-  "version": "3.10.0",
+  "version": "3.11.1",
   "description": "npm core",
   "files": [
     "dist/**/*"
@@ -77,8 +77,10 @@
     "@eggjs/tegg-schedule-plugin": "^3.2.1",
     "@eggjs/tsconfig": "^1.0.0",
     "@node-rs/crc32": "^1.2.2",
+    "@simplewebauthn/server": "^7.0.1",
     "@sinclair/typebox": "^0.23.0",
     "base-x": "^3.0.9",
+    "base64url": "^3.0.1",
     "bson-objectid": "^2.0.1",
     "dayjs": "^1.10.7",
     "egg": "^3.9.2",
@@ -88,6 +90,7 @@
     "egg-scripts": "^2.15.2",
     "egg-tracer": "^1.1.0",
     "egg-typebox-validate": "^2.0.0",
+    "egg-view-nunjucks": "^2.3.0",
     "fs-cnpm": "^2.4.0",
     "ioredis": "^5.3.1",
     "leoric": "^2.6.2",
@@ -99,9 +102,12 @@
     "semver": "^7.3.5",
     "ssri": "^8.0.1",
     "type-fest": "^2.5.3",
+    "ua-parser-js": "^1.0.34",
     "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
+    "@cnpmjs/npm-cli-login": "^1.1.0",
+    "@simplewebauthn/typescript-types": "^7.0.0",
     "@types/mocha": "^10.0.1",
     "@types/mysql": "^2.15.21",
     "@types/semver": "^7.3.12",
@@ -111,7 +117,6 @@
     "eslint": "^8.29.0",
     "eslint-config-egg": "^12.1.0",
     "git-contributor": "2",
-    "@cnpmjs/npm-cli-login": "^1.1.0",
     "typescript": "^4.9.4"
   },
   "author": "killagu",