From 0c35144d82d72200b83461527b231a4463b81d08 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Tue, 19 Sep 2017 08:08:53 +0000
Subject: [PATCH] #826 in progress

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm   | 2 +-
 lemonldap-ng-portal/site/coffee/portal.coffee                 | 4 ++--
 lemonldap-ng-portal/site/htdocs/static/common/js/portal.js    | 4 ++--
 .../site/htdocs/static/common/js/portal.min.js                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
index 7b05c98ff..4b91f7b34 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
@@ -471,7 +471,7 @@ sub mkOidcConsent {
     # TODO: add JS to remove consent
     if ( $session->{_oidcConnectedRP} ) {
         $tmp .=
-qq'<tr><td>$_ <a class="oidcConsent" partner="$_">remove</a></td></tr>'
+qq'<tr partner="$_"><td>$_ <a class="oidcConsent" partner="$_">remove</a></td></tr>'
           foreach ( split /,/, $session->{_oidcConnectedRP} );
         $tmp .= qq'</tbody></table><script type="application/init">
 {
diff --git a/lemonldap-ng-portal/site/coffee/portal.coffee b/lemonldap-ng-portal/site/coffee/portal.coffee
index 6395b5f31..32a7fa9c9 100644
--- a/lemonldap-ng-portal/site/coffee/portal.coffee
+++ b/lemonldap-ng-portal/site/coffee/portal.coffee
@@ -53,9 +53,9 @@ setOrder = ->
 
 removeOidcConsent = (partner) ->
 	r = new RegExp partner, 'g'
-	datas['oidcConsents'] = datas['oidcConsents'].replace(r,'').replace(',+',',')
+	datas['oidcConsents'] = datas['oidcConsents'].replace(r,'').replace(/,+/,',').replace(/^,/,'').replace(/,$/,'')
 	setKey '_oidcConnectedRP', datas['oidcConsents']
-	$(this).text()
+	$("tr[partner='#{partner}']").hide()
 
 setKey = (key,val) ->
 	$.ajax
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/js/portal.js b/lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
index ab023b339..c576754a2 100644
--- a/lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
+++ b/lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
@@ -77,9 +77,9 @@ LemonLDAP::NG Portal jQuery scripts
   removeOidcConsent = function(partner) {
     var r;
     r = new RegExp(partner, 'g');
-    datas['oidcConsents'] = datas['oidcConsents'].replace(r, '').replace(',+', ',');
+    datas['oidcConsents'] = datas['oidcConsents'].replace(r, '').replace(/,+/, ',').replace(/^,/, '').replace(/,$/, '');
     setKey('_oidcConnectedRP', datas['oidcConsents']);
-    return $(this).text();
+    return $("tr[partner='" + partner + "']").hide();
   };
 
   setKey = function(key, val) {
diff --git a/lemonldap-ng-portal/site/htdocs/static/common/js/portal.min.js b/lemonldap-ng-portal/site/htdocs/static/common/js/portal.min.js
index a65a91e38..38f97a7c8 100644
--- a/lemonldap-ng-portal/site/htdocs/static/common/js/portal.min.js
+++ b/lemonldap-ng-portal/site/htdocs/static/common/js/portal.min.js
@@ -1 +1 @@
-(function(){var f,i,e,b,m,h,l,o,a,k,g,c,n,d,j=[].indexOf||function(r){for(var q=0,p=this.length;q<p;q++){if(q in this&&this[q]===r){return q}}return -1};d={};n=function(p){return $.getJSON(window.staticPrefix+"languages/"+p+".json",function(q){d=q;$("[trspan]").each(function(){var u,w,s,r,t;u=$(this).attr("trspan").split(",");r=c(u.shift());for(w=0,s=u.length;w<s;w++){t=u[w];r=r.replace(/%[sd]/,t)}return $(this).text(r)});$("[trmsg]").each(function(){return $(this).text(c("PE"+($(this).attr("trmsg"))))});$("[trplaceholder]").each(function(){return $(this).attr("placeholder",c($(this).attr("trplaceholder")))});return $("[localtime]").each(function(){var r;r=new Date($(this).attr("localtime")*1000);return $(this).text(r.toLocaleString())})})};c=function(p){if(d[p]){return d[p]}else{return p}};window.translate=c;e=function(){var p;p={};$("script[type='application/init']").each(function(){var u,r,q,t,s;try{s=JSON.parse($(this).text());t=[];for(q in s){t.push(p[q]=s[q])}return t}catch(r){u=r;console.log("Parsing error",u);return console.log("JSON",$(this).text())}});return p};g="#appslist";k=function(){return a("_appsListOrder",$(g).sortable("toArray").join())};h=function(q){var p;p=new RegExp(q,"g");f.oidcConsents=f.oidcConsents.replace(p,"").replace(",+",",");a("_oidcConnectedRP",f.oidcConsents);return $(this).text()};a=function(p,q){return $.ajax({type:"GET",url:f.scriptname+"/mysession/?gettoken",dataType:"json",success:function(r){var s;s={token:r.token};s[p]=q;return $.ajax({type:"PUT",url:f.scriptname+"/mysession/persistent",dataType:"json",data:s})}})};l=function(){var r,q,u,C,p,z,s,w,t,y,A,x,B;y=$(g);if(!((y!=null)&&f.appslistorder)){return null}r=f.appslistorder.split(",");z=y.sortable("toArray");A=[];for(u=0,w=z.length;u<w;u++){B=z[u];A[B]=B}for(s=0,t=r.length;s<t;s++){p=r[s];if(A[p]){C=A[p];q=$(g+".ui-sortable").children("#"+C);x=$(g+".ui-sortable").children("#"+p);q.remove();$(g+".ui-sortable").filter(":first").append(x)}}return 1};b=function(p){return $("#lmhidden_"+p).length};m=function(){return $.ajax({type:"POST",url:f.scriptname,data:{ping:1},dataType:"json",success:function(p){if((p.result!=null)&&p.result===1){return setTimeout(m,f.pingInterval)}else{return location.reload(true)}},error:function(p,q,r){return location.reload(true)}})};window.ping=m;i=function(s){var v,q,t,p,r,u;r=s+"=";q=decodeURIComponent(document.cookie).split(";");u=new RegExp("^ *"+s+"=");for(t=0,p=q.length;t<p;t++){v=q[t];if(v.match(u)){v=v.replace(u,"");return v}}return""};o=function(p,r,q){var s;s=new Date();s.setTime(s.getTime()+q*86400000);return document.cookie=p+"="+r+"; expires="+(s.toUTCString())+"; path=/"};f={};$(document).ready(function(){var G,F,H,E,I,D,K,A,z,y,J,w,v,u,B,C,s,r,q,p,t,x;f=e();window.datas=f;if(f.antiframe&&top!==self){top.location.href=location.href}$("#appslist").sortable({axis:"y",cursor:"move",opacity:0.5,revert:true,items:"> div.category",update:function(){return k()}});l();$("div.message").fadeIn("slow");$("input[name=timezone]").val(-(new Date().getTimezoneOffset()/60));s=$("#menu").tabs({active:0});C=$('#menu a[href="#'+f.displaytab+'"]').parent().index();if(C<0){C=0}s.tabs("option","active",C);H=$("#authMenu").tabs({active:0});if(f.choicetab){H.tabs("option","active",$('#authMenu a[href="#'+f.choicetab+'"]').parent().index())}if(f.login){$("input[type=password]:first").focus()}else{$("input[type!=hidden]:first").focus()}if(f.newwindow){$("#appslist a").attr("target","_blank")}if($("p.removeOther").length){G=$("form.login").attr("action");r=$("form.login").attr("method");E="";if(G.indexOf("?")!==-1){G.substring(0,G.indexOf("?"))+"?"}else{E=G+"?"}$("form.login input[type=hidden]").each(function(L){return E+="&"+$(this).attr("name")+"="+$(this).val()});u=$("p.removeOther a").attr("href")+"&method="+r+"&url="+btoa(E);$("p.removeOther a").attr("href",u)}K=i("llnglanguage");if(!K){if(navigator){z=[];y=[];p=[navigator.language];if(navigator.languages){p=navigator.languages}t=window.availableLanguages;for(I=0,J=t.length;I<J;I++){F=t[I];A+='<img class="langicon" src="'+window.staticPrefix+"common/"+F+'.png" title="'+F+'" alt="['+F+']"> ';for(D=0,w=p.length;D<w;D++){q=p[D];if(F===q){z.push(F)}else{if(F.substring(0,1)===q.substring(0,1)){y.push(F)}}}}K=z[0]?z[0]:y[0]?y[0]:window.availableLanguages[0]}else{K=window.availableLanguages[0]}}else{if(j.call(window.availableLanguages,K)<0){K=window.availableLanguages[0]}}o("llnglanguage",K);n(K);A="";x=window.availableLanguages;for(B=0,v=x.length;B<v;B++){F=x[B];A+='<img class="langicon" src="'+window.staticPrefix+"common/"+F+'.png" title="'+F+'" alt="['+F+']"> '}$("#languages").html(A);$(".langicon").on("click",function(){K=$(this).attr("title");o("llnglanguage",K);return n(K)});if(f.pingInterval&&f.pingInterval>0){window.setTimeout(m,f.pingInterval)}$(".localeDate").each(function(){var L;L=new Date($(this).attr("val")*1000);return $(this).text(L.toLocaleString())});return $(".oidcConsent").on("click",function(){return h($(this).attr("partner"))})})}).call(this);
\ No newline at end of file
+(function(){var f,i,e,b,m,h,l,o,a,k,g,c,n,d,j=[].indexOf||function(r){for(var q=0,p=this.length;q<p;q++){if(q in this&&this[q]===r){return q}}return -1};d={};n=function(p){return $.getJSON(window.staticPrefix+"languages/"+p+".json",function(q){d=q;$("[trspan]").each(function(){var u,w,s,r,t;u=$(this).attr("trspan").split(",");r=c(u.shift());for(w=0,s=u.length;w<s;w++){t=u[w];r=r.replace(/%[sd]/,t)}return $(this).text(r)});$("[trmsg]").each(function(){return $(this).text(c("PE"+($(this).attr("trmsg"))))});$("[trplaceholder]").each(function(){return $(this).attr("placeholder",c($(this).attr("trplaceholder")))});return $("[localtime]").each(function(){var r;r=new Date($(this).attr("localtime")*1000);return $(this).text(r.toLocaleString())})})};c=function(p){if(d[p]){return d[p]}else{return p}};window.translate=c;e=function(){var p;p={};$("script[type='application/init']").each(function(){var u,r,q,t,s;try{s=JSON.parse($(this).text());t=[];for(q in s){t.push(p[q]=s[q])}return t}catch(r){u=r;console.log("Parsing error",u);return console.log("JSON",$(this).text())}});return p};g="#appslist";k=function(){return a("_appsListOrder",$(g).sortable("toArray").join())};h=function(q){var p;p=new RegExp(q,"g");f.oidcConsents=f.oidcConsents.replace(p,"").replace(/,+/,",").replace(/^,/,"").replace(/,$/,"");a("_oidcConnectedRP",f.oidcConsents);return $("tr[partner='"+q+"']").hide()};a=function(p,q){return $.ajax({type:"GET",url:f.scriptname+"/mysession/?gettoken",dataType:"json",success:function(r){var s;s={token:r.token};s[p]=q;return $.ajax({type:"PUT",url:f.scriptname+"/mysession/persistent",dataType:"json",data:s})}})};l=function(){var r,q,u,C,p,z,s,w,t,y,A,x,B;y=$(g);if(!((y!=null)&&f.appslistorder)){return null}r=f.appslistorder.split(",");z=y.sortable("toArray");A=[];for(u=0,w=z.length;u<w;u++){B=z[u];A[B]=B}for(s=0,t=r.length;s<t;s++){p=r[s];if(A[p]){C=A[p];q=$(g+".ui-sortable").children("#"+C);x=$(g+".ui-sortable").children("#"+p);q.remove();$(g+".ui-sortable").filter(":first").append(x)}}return 1};b=function(p){return $("#lmhidden_"+p).length};m=function(){return $.ajax({type:"POST",url:f.scriptname,data:{ping:1},dataType:"json",success:function(p){if((p.result!=null)&&p.result===1){return setTimeout(m,f.pingInterval)}else{return location.reload(true)}},error:function(p,q,r){return location.reload(true)}})};window.ping=m;i=function(s){var v,q,t,p,r,u;r=s+"=";q=decodeURIComponent(document.cookie).split(";");u=new RegExp("^ *"+s+"=");for(t=0,p=q.length;t<p;t++){v=q[t];if(v.match(u)){v=v.replace(u,"");return v}}return""};o=function(p,r,q){var s;s=new Date();s.setTime(s.getTime()+q*86400000);return document.cookie=p+"="+r+"; expires="+(s.toUTCString())+"; path=/"};f={};$(document).ready(function(){var G,F,H,E,I,D,K,A,z,y,J,w,v,u,B,C,s,r,q,p,t,x;f=e();window.datas=f;if(f.antiframe&&top!==self){top.location.href=location.href}$("#appslist").sortable({axis:"y",cursor:"move",opacity:0.5,revert:true,items:"> div.category",update:function(){return k()}});l();$("div.message").fadeIn("slow");$("input[name=timezone]").val(-(new Date().getTimezoneOffset()/60));s=$("#menu").tabs({active:0});C=$('#menu a[href="#'+f.displaytab+'"]').parent().index();if(C<0){C=0}s.tabs("option","active",C);H=$("#authMenu").tabs({active:0});if(f.choicetab){H.tabs("option","active",$('#authMenu a[href="#'+f.choicetab+'"]').parent().index())}if(f.login){$("input[type=password]:first").focus()}else{$("input[type!=hidden]:first").focus()}if(f.newwindow){$("#appslist a").attr("target","_blank")}if($("p.removeOther").length){G=$("form.login").attr("action");r=$("form.login").attr("method");E="";if(G.indexOf("?")!==-1){G.substring(0,G.indexOf("?"))+"?"}else{E=G+"?"}$("form.login input[type=hidden]").each(function(L){return E+="&"+$(this).attr("name")+"="+$(this).val()});u=$("p.removeOther a").attr("href")+"&method="+r+"&url="+btoa(E);$("p.removeOther a").attr("href",u)}K=i("llnglanguage");if(!K){if(navigator){z=[];y=[];p=[navigator.language];if(navigator.languages){p=navigator.languages}t=window.availableLanguages;for(I=0,J=t.length;I<J;I++){F=t[I];A+='<img class="langicon" src="'+window.staticPrefix+"common/"+F+'.png" title="'+F+'" alt="['+F+']"> ';for(D=0,w=p.length;D<w;D++){q=p[D];if(F===q){z.push(F)}else{if(F.substring(0,1)===q.substring(0,1)){y.push(F)}}}}K=z[0]?z[0]:y[0]?y[0]:window.availableLanguages[0]}else{K=window.availableLanguages[0]}}else{if(j.call(window.availableLanguages,K)<0){K=window.availableLanguages[0]}}o("llnglanguage",K);n(K);A="";x=window.availableLanguages;for(B=0,v=x.length;B<v;B++){F=x[B];A+='<img class="langicon" src="'+window.staticPrefix+"common/"+F+'.png" title="'+F+'" alt="['+F+']"> '}$("#languages").html(A);$(".langicon").on("click",function(){K=$(this).attr("title");o("llnglanguage",K);return n(K)});if(f.pingInterval&&f.pingInterval>0){window.setTimeout(m,f.pingInterval)}$(".localeDate").each(function(){var L;L=new Date($(this).attr("val")*1000);return $(this).text(L.toLocaleString())});return $(".oidcConsent").on("click",function(){return h($(this).attr("partner"))})})}).call(this);
\ No newline at end of file