From 783349a39f955eced37434ca731671541435f1ac Mon Sep 17 00:00:00 2001
From: Xavier Guimard <x.guimard@free.fr>
Date: Wed, 20 Jun 2018 06:56:32 +0200
Subject: [PATCH] Improvement in regex (#1431)

---
 lemonldap-ng-portal/site/coffee/portal.coffee          |  4 ++--
 .../site/htdocs/static/common/js/portal.js             | 10 +++++-----
 .../site/htdocs/static/common/js/portal.min.js         |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lemonldap-ng-portal/site/coffee/portal.coffee b/lemonldap-ng-portal/site/coffee/portal.coffee
index 8becb9ce1..6bb1279d3 100644
--- a/lemonldap-ng-portal/site/coffee/portal.coffee
+++ b/lemonldap-ng-portal/site/coffee/portal.coffee
@@ -60,8 +60,8 @@ setOrder = ->
 
 # Function used to remove an OIDC consent
 removeOidcConsent = (partner) ->
-	r = new RegExp partner, 'g'
-	datas['oidcConsents'] = datas['oidcConsents'].replace(r,'').replace(/,+/,',').replace(/^,/,'').replace(/,$/,'')
+	r = new RegExp "\b#{partner}\b,?"
+	datas['oidcConsents'] = datas['oidcConsents'].replace(r,'').replace(/,$/,'')
 	setKey '_oidcConnectedRP', datas['oidcConsents']
 		# Success
 		, () ->
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 e0b2472dd..334eede79 100644
--- a/lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
+++ b/lemonldap-ng-portal/site/htdocs/static/common/js/portal.js
@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.9.3
+// Generated by CoffeeScript 1.12.7
 
 /*
 LemonLDAP::NG Portal jQuery scripts
@@ -59,8 +59,8 @@ LemonLDAP::NG Portal jQuery scripts
           results.push(values[k] = tmp[k]);
         }
         return results;
-      } catch (_error) {
-        e = _error;
+      } catch (error1) {
+        e = error1;
         console.log('Parsing error', e);
         return console.log('JSON', $(this).text());
       }
@@ -76,8 +76,8 @@ LemonLDAP::NG Portal jQuery scripts
 
   removeOidcConsent = function(partner) {
     var r;
-    r = new RegExp(partner, 'g');
-    datas['oidcConsents'] = datas['oidcConsents'].replace(r, '').replace(/,+/, ',').replace(/^,/, '').replace(/,$/, '');
+    r = new RegExp("\b" + partner + "\b,?");
+    datas['oidcConsents'] = datas['oidcConsents'].replace(r, '').replace(/,$/, '');
     return setKey('_oidcConnectedRP', datas['oidcConsents'], function() {
       return $("[partner='" + partner + "']").hide();
     }, function(j, s, e) {
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 0f224220d..750a6d832 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 t,q,s,r;try{r=JSON.parse($(this).text());s=[];for(q in r){s.push(p[q]=r[q])}return s}catch(u){t=u;console.log("Parsing error",t);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(/,$/,"");return a("_oidcConnectedRP",f.oidcConsents,function(){return $("[partner='"+q+"']").hide()},function(r,t,u){return alert(t+" "+u)})};a=function(q,s,r,p){return $.ajax({type:"GET",url:f.scriptname+"/mysession/?gettoken",dataType:"json",error:p,success:function(t){var u;u={token:t.token};u[q]=s;return $.ajax({type:"PUT",url:f.scriptname+"/mysession/persistent",dataType:"json",data:u,success:r,error:p})}})};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 datas,getCookie,getValues,isHiddenFormValueSet,ping,removeOidcConsent,restoreOrder,setCookie,setKey,setOrder,setSelector,translate,translatePage,translationFields,indexOf=[].indexOf||function(item){for(var i=0,l=this.length;i<l;i++){if(i in this&&this[i]===item)return i}return-1};translationFields={};translatePage=function(lang){return $.getJSON(window.staticPrefix+"languages/"+lang+".json",function(data){translationFields=data;$("[trspan]").each(function(){var args,i,len,txt,v;args=$(this).attr("trspan").split(",");txt=translate(args.shift());for(i=0,len=args.length;i<len;i++){v=args[i];txt=txt.replace(/%[sd]/,v)}return $(this).text(txt)});$("[trmsg]").each(function(){return $(this).text(translate("PE"+$(this).attr("trmsg")))});$("[trplaceholder]").each(function(){return $(this).attr("placeholder",translate($(this).attr("trplaceholder")))});return $("[localtime]").each(function(){var d;d=new Date($(this).attr("localtime")*1e3);return $(this).text(d.toLocaleString())})})};translate=function(str){if(translationFields[str]){return translationFields[str]}else{return str}};window.translate=translate;getValues=function(){var values;values={};$("script[type='application/init']").each(function(){var e,k,results,tmp;try{tmp=JSON.parse($(this).text());results=[];for(k in tmp){results.push(values[k]=tmp[k])}return results}catch(error1){e=error1;console.log("Parsing error",e);return console.log("JSON",$(this).text())}});return values};setSelector="#appslist";setOrder=function(){return setKey("_appsListOrder",$(setSelector).sortable("toArray").join())};removeOidcConsent=function(partner){var r;r=new RegExp("\b"+partner+"\b,?");datas["oidcConsents"]=datas["oidcConsents"].replace(r,"").replace(/,$/,"");return setKey("_oidcConnectedRP",datas["oidcConsents"],function(){return $("[partner='"+partner+"']").hide()},function(j,s,e){return alert(s+" "+e)})};setKey=function(key,val,success,error){return $.ajax({type:"GET",url:datas["scriptname"]+"/mysession/?gettoken",dataType:"json",error:error,success:function(data){var d;d={token:data.token};d[key]=val;return $.ajax({type:"PUT",url:datas["scriptname"]+"/mysession/persistent",dataType:"json",data:d,success:success,error:error})}})};restoreOrder=function(){var IDs,child,i,item,itemID,items,l,len,len1,list,rebuild,savedOrd,v;list=$(setSelector);if(!(list!=null&&datas["appslistorder"])){return null}IDs=datas["appslistorder"].split(",");items=list.sortable("toArray");rebuild=[];for(i=0,len=items.length;i<len;i++){v=items[i];rebuild[v]=v}for(l=0,len1=IDs.length;l<len1;l++){itemID=IDs[l];if(rebuild[itemID]){item=rebuild[itemID];child=$(setSelector+".ui-sortable").children("#"+item);savedOrd=$(setSelector+".ui-sortable").children("#"+itemID);child.remove();$(setSelector+".ui-sortable").filter(":first").append(savedOrd)}}return 1};isHiddenFormValueSet=function(option){return $("#lmhidden_"+option).length};ping=function(){return $.ajax({type:"POST",url:datas["scriptname"],data:{ping:1},dataType:"json",success:function(data){if(data.result!=null&&data.result===1){return setTimeout(ping,datas["pingInterval"])}else{return location.reload(true)}},error:function(j,t,e){return location.reload(true)}})};window.ping=ping;getCookie=function(cname){var c,ca,i,len,name,re;name=cname+"=";ca=decodeURIComponent(document.cookie).split(";");re=new RegExp("^ *"+cname+"=");for(i=0,len=ca.length;i<len;i++){c=ca[i];if(c.match(re)){c=c.replace(re,"");return c}}return""};setCookie=function(name,value,exdays){var d;d=new Date;d.setTime(d.getTime()+exdays*864e5);return document.cookie=name+"="+value+"; expires="+d.toUTCString()+"; path=/"};datas={};$(document).ready(function(){var action,al,authMenuTabs,back_url,i,l,lang,langdiv,langs,langs2,len,len1,len2,link,m,menuIndex,menuTabs,method,nl,nlangs,ref,ref1;datas=getValues();window.datas=datas;if(datas["antiframe"]&&top!==self){top.location.href=location.href}$("#appslist").sortable({axis:"y",cursor:"move",opacity:.5,revert:true,items:"> div.category",update:function(){return setOrder()}});restoreOrder();$("div.message").fadeIn("slow");$("input[name=timezone]").val(-((new Date).getTimezoneOffset()/60));menuTabs=$("#menu").tabs({active:0});menuIndex=$('#menu a[href="#'+datas["displaytab"]+'"]').parent().index();if(menuIndex<0){menuIndex=0}menuTabs.tabs("option","active",menuIndex);authMenuTabs=$("#authMenu").tabs({active:0});if(datas["choicetab"]){authMenuTabs.tabs("option","active",$('#authMenu a[href="#'+datas["choicetab"]+'"]').parent().index())}if(datas["login"]){$("input[type=password]:first").focus()}else{$("input[type!=hidden]:first").focus()}if(datas["newwindow"]){$("#appslist a").attr("target","_blank")}if($("p.removeOther").length){action=$("form.login").attr("action");method=$("form.login").attr("method");back_url="";if(action.indexOf("?")!==-1){action.substring(0,action.indexOf("?"))+"?"}else{back_url=action+"?"}$("form.login input[type=hidden]").each(function(index){return back_url+="&"+$(this).attr("name")+"="+$(this).val()});link=$("p.removeOther a").attr("href")+"&method="+method+"&url="+btoa(back_url);$("p.removeOther a").attr("href",link)}lang=getCookie("llnglanguage");if(!lang){if(navigator){langs=[];langs2=[];nlangs=[navigator.language];if(navigator.languages){nlangs=navigator.languages}ref=window.availableLanguages;for(i=0,len=ref.length;i<len;i++){al=ref[i];langdiv+='<img class="langicon" src="'+window.staticPrefix+"common/"+al+'.png" title="'+al+'" alt="['+al+']"> ';for(l=0,len1=nlangs.length;l<len1;l++){nl=nlangs[l];if(al===nl){langs.push(al)}else if(al.substring(0,1)===nl.substring(0,1)){langs2.push(al)}}}lang=langs[0]?langs[0]:langs2[0]?langs2[0]:window.availableLanguages[0]}else{lang=window.availableLanguages[0]}}else if(indexOf.call(window.availableLanguages,lang)<0){lang=window.availableLanguages[0]}setCookie("llnglanguage",lang);translatePage(lang);langdiv="";ref1=window.availableLanguages;for(m=0,len2=ref1.length;m<len2;m++){al=ref1[m];langdiv+='<img class="langicon" src="'+window.staticPrefix+"common/"+al+'.png" title="'+al+'" alt="['+al+']"> '}$("#languages").html(langdiv);$(".langicon").on("click",function(){lang=$(this).attr("title");setCookie("llnglanguage",lang);return translatePage(lang)});if(datas["pingInterval"]&&datas["pingInterval"]>0){window.setTimeout(ping,datas["pingInterval"])}$(".localeDate").each(function(){var s;s=new Date($(this).attr("val")*1e3);return $(this).text(s.toLocaleString())});return $(".oidcConsent").on("click",function(){return removeOidcConsent($(this).attr("partner"))})})}).call(this);