From bd5f59d5c943af04542cd41c41a71cf73457783d Mon Sep 17 00:00:00 2001
From: "m.lettere" <marco.lettere@nubisware.com>
Date: Wed, 13 Oct 2021 15:20:35 +0200
Subject: [PATCH] fix encoding of rootvo

---
 defaults/main.yaml                    | 30 +++++++++++++--------------
 templates/delete-user-account.json.j2 |  6 ++++--
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/defaults/main.yaml b/defaults/main.yaml
index 1ae5ee7..09af6c7 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -1,21 +1,21 @@
 ---
 workflows:
-   - create-user-add-to-vre
-   - group_deleted
-   - user-group_created
-   - user-group-role_created
-   - group_created
-   - invitation-accepted
-   - user-group_deleted
-   - user-group-role_deleted
+#   - create-user-add-to-vre
+#   - group_deleted
+#   - user-group_created
+#   - user-group-role_created
+#   - group_created
+#   - invitation-accepted
+#   - user-group_deleted
+#   - user-group-role_deleted
    - delete-user-account
-   - role_deleted
-   - role_created
-   - add_role_policy_permission 
-   - add_all_member_roles
-   - create_system_service
-   - delete_system_service
-   - add_all_system_services_to_vre
+#   - role_deleted
+#   - role_created
+#   - add_role_policy_permission 
+#   - add_all_member_roles
+#   - create_system_service
+#   - delete_system_service
+#   - add_all_system_services_to_vre
 keycloak_host: "https://accounts.dev.d4science.org/auth"
 keycloak: "{{ keycloak_host }}/realms"
 keycloak_realm: "d4science"
diff --git a/templates/delete-user-account.json.j2 b/templates/delete-user-account.json.j2
index 7796865..9adc640 100644
--- a/templates/delete-user-account.json.j2
+++ b/templates/delete-user-account.json.j2
@@ -18,7 +18,7 @@
           "liferay": "{{ liferay }}",
           "liferay_auth": "{{ liferay_auth }}",
           "keycloak_userid" : "${workflow.input.userid}",
-          "scriptExpression": "return { 'decoded_root_vo' : $.root_vo.replace('%2F','/')}"
+          "scriptExpression": "return { 'decoded_root_vo' : $.root_vo.replace('%2F','/'), 'encoded_root_vo' : encodeURIComponent($.root_vo)}"
 	    }
 		},
     {
@@ -163,7 +163,7 @@
                 "taskReferenceName" : "get_rootvo",
                 "type" : "SIMPLE",
                 "inputParameters" : {
-                    "url" : "${init.input.keycloak_admin}/clients?clientId=${init.input.root_vo}",
+                    "url" : "${init.input.keycloak_admin}/clients?clientId=${init.output.result.encoded_root_vo}",
                     "method" : "GET",
                     "headers" : {
                         "Authorization" : "Bearer ${authorize.output.body.access_token}",
@@ -178,6 +178,7 @@
                 "inputParameters" : {
                     "url" : "${init.input.keycloak_admin}/clients/${get_rootvo.output.body[0].id}/roles",
                     "method" : "GET",
+                    "expect" : [200, 404],
                     "headers" : {
                         "Authorization" : "Bearer ${authorize.output.body.access_token}",
                         "Accept" : "application/json"
@@ -191,6 +192,7 @@
                 "inputParameters" : {
                     "url" : "${init.input.keycloak_admin}/clients/${get_rootvo.output.body[0].id}/roles/Infrastructure-Manager/users",
                     "method" : "GET",
+                    "expect" : [200, 404],
                     "headers" : {
                         "Authorization" : "Bearer ${authorize.output.body.access_token}",
                         "Accept" : "application/json"