From 9674510863d4c274e557eaedbe22f82fa3ddb85e Mon Sep 17 00:00:00 2001 From: Maxime Besson Date: Fri, 3 Jun 2022 15:50:35 +0200 Subject: [PATCH] add mfaDeleted event (#2756) --- lemonldap-ng-portal/site/coffee/2fregistration.coffee | 1 + .../site/htdocs/static/common/js/2fregistration.js | 6 ++++++ .../site/htdocs/static/common/js/2fregistration.min.js | 2 +- .../site/htdocs/static/common/js/2fregistration.min.js.map | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lemonldap-ng-portal/site/coffee/2fregistration.coffee b/lemonldap-ng-portal/site/coffee/2fregistration.coffee index 763af4093..6c7fb9aa7 100644 --- a/lemonldap-ng-portal/site/coffee/2fregistration.coffee +++ b/lemonldap-ng-portal/site/coffee/2fregistration.coffee @@ -47,6 +47,7 @@ delete2F = (device, epoch) -> else setMsg 'unknownAction', 'warning' else if resp.result $("#delete-#{epoch}").hide() + $(document).trigger "mfaDeleted", [ { "type": device, "epoch": epoch } ] setMsg 'yourKeyIsUnregistered', 'positive' error: displayError diff --git a/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.js b/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.js index 0ef5531a1..048b4e7d5 100644 --- a/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.js +++ b/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.js @@ -63,6 +63,12 @@ LemonLDAP::NG 2F registration script } } else if (resp.result) { $("#delete-" + epoch).hide(); + $(document).trigger("mfaDeleted", [ + { + "type": device, + "epoch": epoch + } + ]); return setMsg('yourKeyIsUnregistered', 'positive'); } }, diff --git a/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.min.js b/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.min.js index 6c6108588..6ab62ced3 100644 --- a/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.min.js +++ b/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.min.js @@ -1 +1 @@ -!function(){var o=function(e,r){return $("#msg").attr("trspan",e),$("#msg").html(window.translate(e)),$("#color").removeClass("message-positive message-warning alert-success alert-warning"),$("#color").addClass("message-"+r),"positive"===r&&(r="success"),$("#color").addClass("alert-"+r),$("#color").attr("role","status")},t=function(e,r,t){if(console.log("Error",t),(e=JSON.parse(e.responseText))&&e.error)return e=e.error.replace(/.* /,""),console.log("Returned error",e),e.match(/module/)?o("notAuthorized","warning"):o(e,"warning")},e=function(e,r){return"U2F"===e?e="u":"UBK"===e?e="yubikey":"TOTP"===e?e="totp":"WebAuthn"===e?e="webauthn":o("u2fFailed","warning"),$.ajax({type:"POST",url:portal+"2fregisters/"+e+"/delete",data:{epoch:r},dataType:"json",error:t,success:function(e){return e.error?e.error.match(/notAuthorized/)?o("notAuthorized","warning"):o("unknownAction","warning"):e.result?($("#delete-"+r).hide(),o("yourKeyIsUnregistered","positive")):void 0}})};$(document).ready(function(){return $("body").on("click",".remove2f",function(){return e($(this).attr("device"),$(this).attr("epoch"))}),$("#goback").attr("href",portal),$(".data-epoch").each(function(){var e=new Date(1e3*$(this).text());return $(this).text(e.toLocaleString())})})}.call(this); \ No newline at end of file +!function(){var o=function(e,r){return $("#msg").attr("trspan",e),$("#msg").html(window.translate(e)),$("#color").removeClass("message-positive message-warning alert-success alert-warning"),$("#color").addClass("message-"+r),"positive"===r&&(r="success"),$("#color").addClass("alert-"+r),$("#color").attr("role","status")},e=function(e,r,t){if(console.log("Error",t),(e=JSON.parse(e.responseText))&&e.error)return e=e.error.replace(/.* /,""),console.log("Returned error",e),e.match(/module/)?o("notAuthorized","warning"):o(e,"warning")},r=function(r,t){return"U2F"===r?r="u":"UBK"===r?r="yubikey":"TOTP"===r?r="totp":"WebAuthn"===r?r="webauthn":o("u2fFailed","warning"),$.ajax({type:"POST",url:portal+"2fregisters/"+r+"/delete",data:{epoch:t},dataType:"json",error:e,success:function(e){return e.error?e.error.match(/notAuthorized/)?o("notAuthorized","warning"):o("unknownAction","warning"):e.result?($("#delete-"+t).hide(),$(document).trigger("mfaDeleted",[{type:r,epoch:t}]),o("yourKeyIsUnregistered","positive")):void 0}})};$(document).ready(function(){return $("body").on("click",".remove2f",function(){return r($(this).attr("device"),$(this).attr("epoch"))}),$("#goback").attr("href",portal),$(".data-epoch").each(function(){var e=new Date(1e3*$(this).text());return $(this).text(e.toLocaleString())})})}.call(this); \ No newline at end of file diff --git a/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.min.js.map b/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.min.js.map index 73ee988cd..e3e1a68e7 100644 --- a/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.min.js.map +++ b/lemonldap-ng-portal/site/htdocs/static/common/js/2fregistration.min.js.map @@ -1 +1 @@ -{"version":3,"sources":["2fregistration.js"],"names":["setMsg","msg","level","$","attr","html","window","translate","removeClass","addClass","displayError","j","status","err","console","log","res","JSON","parse","responseText","error","replace","match","delete2F","device","epoch","ajax","type","url","portal","data","dataType","success","resp","result","hide","document","ready","on","this","each","myDate","Date","text","toLocaleString","call"],"mappings":"CAMA,WACE,IAEAA,EAAS,SAASC,EAAKC,GASrB,OARAC,EAAE,QAAQC,KAAK,SAAUH,GACzBE,EAAE,QAAQE,KAAKC,OAAOC,UAAUN,IAChCE,EAAE,UAAUK,YAAY,gEACxBL,EAAE,UAAUM,SAAS,WAAaP,GACpB,aAAVA,IACFA,EAAQ,WAEVC,EAAE,UAAUM,SAAS,SAAWP,GACzBC,EAAE,UAAUC,KAAK,OAAQ,WAGlCM,EAAe,SAASC,EAAGC,EAAQC,GAIjC,GAFAC,QAAQC,IAAI,QAASF,IACrBG,EAAMC,KAAKC,MAAMP,EAAEQ,gBACRH,EAAII,MAGb,OAFAJ,EAAMA,EAAII,MAAMC,QAAQ,MAAO,IAC/BP,QAAQC,IAAI,iBAAkBC,GAC1BA,EAAIM,MAAM,UACLtB,EAAO,gBAAiB,WAExBA,EAAOgB,EAAK,YAKzBO,EAAW,SAASC,EAAQC,GAY1B,MAXe,QAAXD,EACFA,EAAS,IACW,QAAXA,EACTA,EAAS,UACW,SAAXA,EACTA,EAAS,OACW,aAAXA,EACTA,EAAS,WAETxB,EAAO,YAAa,WAEfG,EAAEuB,KAAK,CACZC,KAAM,OACNC,IAAKC,OAAS,eAAiBL,EAAS,UACxCM,KAAM,CACJL,MAAOA,GAETM,SAAU,OANEX,MAoBLV,EAZPsB,QAAS,SAASC,GAChB,OAAIA,EAAKb,MACHa,EAAKb,MAAME,MAAM,iBACZtB,EAAO,gBAAiB,WAExBA,EAAO,gBAAiB,WAExBiC,EAAKC,QACd/B,EAAE,WAAasB,GAAOU,OACfnC,EAAO,wBAAyB,kBAFlC,MASbG,EAAEiC,UAAUC,MAAM,WAKhB,OAJAlC,EAAE,QAAQmC,GAAG,QAAS,YAAa,WACjC,OAAOf,EAASpB,EAAEoC,MAAMnC,KAAK,UAAWD,EAAEoC,MAAMnC,KAAK,YAEvDD,EAAE,WAAWC,KAAK,OAAQyB,QACnB1B,EAAE,eAAeqC,KAAK,WAC3B,IACAC,EAAS,IAAIC,KAAsB,IAAjBvC,EAAEoC,MAAMI,QAC1B,OAAOxC,EAAEoC,MAAMI,KAAKF,EAAOG,uBAI9BC,KAAKN"} \ No newline at end of file +{"version":3,"sources":["2fregistration.js"],"names":["setMsg","msg","level","$","attr","html","window","translate","removeClass","addClass","displayError","j","status","err","console","log","res","JSON","parse","responseText","error","replace","match","delete2F","device","epoch","ajax","type","url","portal","data","dataType","success","resp","result","hide","document","trigger","ready","on","this","each","myDate","Date","text","toLocaleString","call"],"mappings":"CAMA,WACE,IAEAA,EAAS,SAASC,EAAKC,GASrB,OARAC,EAAE,QAAQC,KAAK,SAAUH,GACzBE,EAAE,QAAQE,KAAKC,OAAOC,UAAUN,IAChCE,EAAE,UAAUK,YAAY,gEACxBL,EAAE,UAAUM,SAAS,WAAaP,GACpB,aAAVA,IACFA,EAAQ,WAEVC,EAAE,UAAUM,SAAS,SAAWP,GACzBC,EAAE,UAAUC,KAAK,OAAQ,WAGlCM,EAAe,SAASC,EAAGC,EAAQC,GAIjC,GAFAC,QAAQC,IAAI,QAASF,IACrBG,EAAMC,KAAKC,MAAMP,EAAEQ,gBACRH,EAAII,MAGb,OAFAJ,EAAMA,EAAII,MAAMC,QAAQ,MAAO,IAC/BP,QAAQC,IAAI,iBAAkBC,GAC1BA,EAAIM,MAAM,UACLtB,EAAO,gBAAiB,WAExBA,EAAOgB,EAAK,YAKzBO,EAAW,SAASC,EAAQC,GAY1B,MAXe,QAAXD,EACFA,EAAS,IACW,QAAXA,EACTA,EAAS,UACW,SAAXA,EACTA,EAAS,OACW,aAAXA,EACTA,EAAS,WAETxB,EAAO,YAAa,WAEfG,EAAEuB,KAAK,CACZC,KAAM,OACNC,IAAKC,OAAS,eAAiBL,EAAS,UACxCM,KAAM,CACJL,MAAOA,GAETM,SAAU,OANEX,MA0BLV,EAlBPsB,QAAS,SAASC,GAChB,OAAIA,EAAKb,MACHa,EAAKb,MAAME,MAAM,iBACZtB,EAAO,gBAAiB,WAExBA,EAAO,gBAAiB,WAExBiC,EAAKC,QACd/B,EAAE,WAAasB,GAAOU,OACtBhC,EAAEiC,UAAUC,QAAQ,aAAc,CAChC,CACEV,KAAQH,EACRC,MAASA,KAGNzB,EAAO,wBAAyB,kBARlC,MAebG,EAAEiC,UAAUE,MAAM,WAKhB,OAJAnC,EAAE,QAAQoC,GAAG,QAAS,YAAa,WACjC,OAAOhB,EAASpB,EAAEqC,MAAMpC,KAAK,UAAWD,EAAEqC,MAAMpC,KAAK,YAEvDD,EAAE,WAAWC,KAAK,OAAQyB,QACnB1B,EAAE,eAAesC,KAAK,WAC3B,IACAC,EAAS,IAAIC,KAAsB,IAAjBxC,EAAEqC,MAAMI,QAC1B,OAAOzC,EAAEqC,MAAMI,KAAKF,EAAOG,uBAI9BC,KAAKN"} \ No newline at end of file