From 9bc84b40ec28941d5e5c2db0e3a6466709e9da9d Mon Sep 17 00:00:00 2001
From: dcore94 <m.lettere@gmail.com>
Date: Tue, 23 Mar 2021 19:17:08 +0100
Subject: [PATCH] fix encoding of rootvo

---
 templates/group_created.json.j2 | 4 ++--
 templates/role_created.json.j2  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/group_created.json.j2 b/templates/group_created.json.j2
index 204b44b..5d9f19d 100644
--- a/templates/group_created.json.j2
+++ b/templates/group_created.json.j2
@@ -12,7 +12,7 @@
 		  "taskReferenceName": "init",
 		  "type": "LAMBDA",
 		  "inputParameters": {
-			  "root_vo": "{{ root_vo }}",
+			  "root_vo": "{{ encodeURI(root_vo) }}",
 			  "keycloak": "{{ keycloak }}/{{ keycloak_realm }}",
 			  "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}",
 			  "clientId" : "${workflow.input.group}",
@@ -158,7 +158,7 @@
               "taskReferenceName" : "get_rootvo",
               "type" : "SIMPLE",
               "inputParameters" : {
-                  "url" : "${init.input.keycloak_admin}/clients?clientId=${workflow.input.root_vo}",
+                  "url" : "${init.input.keycloak_admin}/clients?clientId=${init.input.root_vo}",
                   "method" : "GET",
                   "headers" : {
                       "Authorization" : "Bearer ${authorize.output.body.access_token}",
diff --git a/templates/role_created.json.j2 b/templates/role_created.json.j2
index 7e3c77e..54fbc42 100644
--- a/templates/role_created.json.j2
+++ b/templates/role_created.json.j2
@@ -12,7 +12,7 @@
 		  "taskReferenceName": "init",
 		  "type": "LAMBDA",
 		  "inputParameters": {
-			  "root_vo": "{{ root_vo }}",
+			  "root_vo": "{{ encodeURI(root_vo) }}",
 			  "keycloak": "{{ keycloak }}/{{ keycloak_realm }}",
 			  "keycloak_admin" : "{{ keycloak_admin }}/{{ keycloak_realm }}",
 			  "scriptExpression": "1 == 1"
@@ -55,7 +55,7 @@
       "inputParameters": {
         "role" : "${workflow.input.role}",
         "vres" : "${get_all_vres.output.body}",
-        "scriptExpression": "inputs={};tasks=[];for(var i=0;i<$.vres.length;i++)vre=$.vres[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'create_role'+i}),inputs['create_role'+i]={url:'${init.input.keycloak_admin}/clients/' + vres.id + '/roles',body:{clientRole:true,name:$.role,description:''},method:'POST',headers:{Authorization:'Bearer ${authorize.output.body.access_token}','Content-Type':'application/json'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
+        "scriptExpression": "inputs={};tasks=[];for(var i=0;i<$.vres.length;i++)vre=$.vres[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'create_role'+i}),inputs['create_role'+i]={url:'${init.input.keycloak_admin}/clients/' + vre.id + '/roles',body:{clientRole:true,name:$.role,description:''},method:'POST',headers:{Authorization:'Bearer ${authorize.output.body.access_token}','Content-Type':'application/json'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
             }
           },
           {