From 35eea55480b28dda0e1801fc2f6bb118a6762616 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Wed, 16 Dec 2020 10:00:16 +0100
Subject: [PATCH] we add some random char to the screenname created

---
 .settings/org.eclipse.wst.common.component       |   6 ++++++
 .../acceptinvite/InvitationAcceptedEvent.java    |   9 ++++++++-
 src/main/webapp/images/icon.png                  | Bin 0 -> 3559 bytes
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 src/main/webapp/images/icon.png

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 2530a4b..cf5fb55 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,12 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <dependent-module archiveName="invites-common-library-1.5.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/invites-common-library/invites-common-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="email-templates-library-1.4.3.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/email-templates-library/email-templates-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="context-root" value="accept-invite-portlet"/>
         <property name="java-output-path" value="/accept-invite-portlet/target/classes"/>
     </wb-module>
diff --git a/src/main/java/org/gcube/portlets/user/acceptinvite/InvitationAcceptedEvent.java b/src/main/java/org/gcube/portlets/user/acceptinvite/InvitationAcceptedEvent.java
index a1ebe10..b66f147 100644
--- a/src/main/java/org/gcube/portlets/user/acceptinvite/InvitationAcceptedEvent.java
+++ b/src/main/java/org/gcube/portlets/user/acceptinvite/InvitationAcceptedEvent.java
@@ -1,5 +1,7 @@
 package org.gcube.portlets.user.acceptinvite;
 
+import java.util.UUID;
+
 import org.gcube.portal.event.publisher.lr62.PortalEvent;
 
 import com.liferay.portal.security.auth.CompanyThreadLocal;
@@ -31,7 +33,12 @@ public class InvitationAcceptedEvent extends PortalEvent {
         try {
             Long companyId = PortletViewController.getCompany().getCompanyId();
             Long defaultUserId = UserLocalServiceUtil.getDefaultUserId(companyId);
-            return defaultScreenNameGenerator.generate(companyId, defaultUserId, email);
+            String screename = defaultScreenNameGenerator.generate(companyId, defaultUserId, email);
+            //here we add some random char to the screenname created
+            StringBuilder sb = new StringBuilder(screename)
+            		.append(UUID.randomUUID().toString().substring(0, 5));
+            String computedUsername =  sb.toString();
+            return computedUsername;
         } catch (Exception e) {
             log.error("Cannot generate username via screen name generator", e);
             return "";
diff --git a/src/main/webapp/images/icon.png b/src/main/webapp/images/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5f5ae98be4ff8a7ff30620b8feac63abc1c00b6
GIT binary patch
literal 3559
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

literal 0
HcmV?d00001