diff --git a/wco/apxauth/apxauth.js b/wco/apxauth/apxauth.js index d7db95c..7b27dc7 100644 --- a/wco/apxauth/apxauth.js +++ b/wco/apxauth/apxauth.js @@ -351,7 +351,8 @@ apx.apxauth.recoverykey = (id, aliasoremail) => { return false; } const recodata = { tribe: apx.data.headers.xtribe, search: aliasoremail }; - recodata.emailalias = Checkjson.testformat(aliasoremail, "email") + const validator= new Checkjson({properties:{email:{type:"string",format:"email"}}}); + recodata.emailalias = validator.verify({email:aliasoremail}) ? "email" : "alias"; document.querySelector(`#${id} .msginfo`).innerHTML = ""; @@ -561,7 +562,8 @@ apx.apxauth.createIdentity = async (id, alias, recoemail, passphrase = "") => { ); return false; } - if (recoemail.length > 0 && !Checkjson.testformat(recoemail, "email")) { + const validator= new Checkjson({properties:{email:{type:"string",format:"email"}}}); + if (recoemail.length > 0 && !validator.verify({email:recoemail})) { apx.notification(`#${id} .msginfo`, { status: 406, ref: "Pagans", @@ -664,13 +666,10 @@ apx.apxauth.registerIdentity = async (id, trustedtribe) => { const data = {}; data.alias = apx.data.tmpauth.keys.alias; data.publickey = apx.data.tmpauth.keys.publickey; - console.log( - apx.data.tmpauth.recoemail, - Checkjson.testformat(apx.data.tmpauth.recoemail, "email") - ); + const validator= new Checkjson({properties:{email:{type:"string",format:"email"}}}); if ( apx.data.tmpauth.recoemail && - Checkjson.testformat(apx.data.tmpauth.recoemail, "email") + validator.verify({email:apx.data.tmpauth.recoemail}) ) { data.passphrase = apx.data.tmpauth.keyspassphrase; data.privatekey = apx.data.tmpauth.keysprivatekey; diff --git a/wwws/itm/admin.json b/wwws/itm/admin.json index 47e3c5b..05cc34e 100644 --- a/wwws/itm/admin.json +++ b/wwws/itm/admin.json @@ -86,7 +86,11 @@ "privatri_main_privatri": "apxtri/objects/wwws/admin/src/tpldata/privatri_main_privatri" }, "schema": [], - "ref": {}, + "ref": { + "Checkjson": "apxtri/models/tplstrings/Checkjson", + "Notification": "apxtri/models/tplstrings/Notifications", + "Middlewares": "apxtri/models/tplstrings/Middlewares" + }, "wco": {}, "appdata": {} }