From 0afac36590637b725995f6a6e1a7304b59b19f6b Mon Sep 17 00:00:00 2001
From: Mauro Mugnaini <mauro.mugnaini@nubisware.com>
Date: Wed, 16 Feb 2022 13:26:13 +0100
Subject: [PATCH] New resource IDs and URI path mappings

---
 .../keycloak/avatar/AvatarResourceProviderFactory.java   | 9 +++------
 .../DeleteAccountRealmResourceProviderFactory.java       | 2 +-
 .../gcube/keycloak/account/DeleteAccountResource.java    | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/AvatarResourceProviderFactory.java b/avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/AvatarResourceProviderFactory.java
index 75a5d23..3023c11 100644
--- a/avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/AvatarResourceProviderFactory.java
+++ b/avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/AvatarResourceProviderFactory.java
@@ -13,7 +13,7 @@ public class AvatarResourceProviderFactory implements RealmResourceProviderFacto
 
     private static final Logger logger = Logger.getLogger(AvatarResourceProviderFactory.class);
 
-    private AvatarResourceProvider avatarResourceProvider;
+    public static final String ID = "account-avatar";
 
     public AvatarResourceProviderFactory() {
         logger.debug("Creating new avatar resource provider factory");
@@ -21,10 +21,7 @@ public class AvatarResourceProviderFactory implements RealmResourceProviderFacto
 
     @Override
     public RealmResourceProvider create(KeycloakSession keycloakSession) {
-        if (avatarResourceProvider == null) {
-            avatarResourceProvider = new AvatarResourceProvider(keycloakSession);
-        }
-        return avatarResourceProvider;
+        return new AvatarResourceProvider(keycloakSession);
     }
 
     @Override
@@ -42,6 +39,6 @@ public class AvatarResourceProviderFactory implements RealmResourceProviderFacto
 
     @Override
     public String getId() {
-        return "avatar-provider";
+        return ID;
     }
 }
diff --git a/delete-account/src/main/java/org/gcube/keycloak/account/DeleteAccountRealmResourceProviderFactory.java b/delete-account/src/main/java/org/gcube/keycloak/account/DeleteAccountRealmResourceProviderFactory.java
index fb9c858..5f10c58 100644
--- a/delete-account/src/main/java/org/gcube/keycloak/account/DeleteAccountRealmResourceProviderFactory.java
+++ b/delete-account/src/main/java/org/gcube/keycloak/account/DeleteAccountRealmResourceProviderFactory.java
@@ -10,7 +10,7 @@ public class DeleteAccountRealmResourceProviderFactory implements RealmResourceP
 
     protected static final Logger logger = Logger.getLogger(DeleteAccountRealmResourceProviderFactory.class);
 
-    public static final String ID = "delete-account";
+    public static final String ID = "account-delete";
 
     public DeleteAccountRealmResourceProviderFactory() {
         logger.info("Created new DeleteAccountRealmResourceProviderFactory object");
diff --git a/delete-account/src/main/java/org/gcube/keycloak/account/DeleteAccountResource.java b/delete-account/src/main/java/org/gcube/keycloak/account/DeleteAccountResource.java
index ddb757c..a0a7f44 100644
--- a/delete-account/src/main/java/org/gcube/keycloak/account/DeleteAccountResource.java
+++ b/delete-account/src/main/java/org/gcube/keycloak/account/DeleteAccountResource.java
@@ -36,7 +36,7 @@ public class DeleteAccountResource {
 
     @NoCache
     @POST()
-    @Path("delete")
+    @Path("request-delete")
 //    public Response performDeleteAccount(@FormParam(STATE_CHECKER_PARAMETER) String stateChecker) {
     public Response performDeleteAccount() {
         if (auth == null) {