Merge pull request #48 from appirio-tech/dev

JIRA-28 shutdown AP-Notifications legacy service

Author: sachin-maheshwari

.circleci/config.yml

@@ -146,7 +146,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: [dev, 'shapeup3']
+              only: [dev, 'feature/jira-plat-28']
       # Production build is executed on "master" branch only.
       - "build-prod":
           context : org-global

buildtokenproperties.sh

@@ -44,7 +44,7 @@ AUTH0_NEW_DOMAIN=$(eval "echo \$${ENV}_AUTH0_NEW_DOMAIN")
 AUTH0_DOMAIN=$(eval "echo \$${ENV}_AUTH0_DOMAIN")
 
 SENDGRID_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID=$(eval "echo \$${ENV}_SENDGRID_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID")
-
+SENDGRID_WELCOME_EMAIL_TEMPLATE_ID=$(eval "echo \$${ENV}_SENDGRID_WELCOME_EMAIL_TEMPLATE_ID")
 
 
 if [[ -z "$ENV" ]] ; then
@@ -110,3 +110,4 @@ perl -pi -e "s|\{\{M2MAUTHCONFIG_USERPROFILES_DELETE\}\}|$M2MAUTHCONFIG_USERPROF
 perl -pi -e "s/\{\{AUTH0_NEW_DOMAIN\}\}/$AUTH0_NEW_DOMAIN/g" $CONFFILENAME
 perl -pi -e "s/\{\{AUTH0_DOMAIN\}\}/$AUTH0_DOMAIN/g" $CONFFILENAME
 perl -pi -e "s/\{\{SENDGRID_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID\}\}/$SENDGRID_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID/g" $CONFFILENAME
+perl -pi -e "s/\{\{SENDGRID_WELCOME_EMAIL_TEMPLATE_ID\}\}/$SENDGRID_WELCOME_EMAIL_TEMPLATE_ID/g" $CONFFILENAME

src/main/java/com/appirio/tech/core/service/identity/IdentityApplication.java

@@ -234,6 +234,7 @@ public void run(IdentityConfiguration configuration, Environment environment) th
     	userResource.setAuth0Client(configuration.getAuth0()); // TODO: constructor
     	userResource.setDomain(configuration.getAuthDomain());
 		userResource.setSendgridTemplateId(Utils.getString("sendGridTemplateId"));
+		userResource.setSendgridWelcomeTemplateId(Utils.getString("sendGridWelcomeTemplateId"));
     	// this secret _used_ to be different from the one used in AuthorizationResource.
     	// it _was_ the secret x2. (userResource.setSecret(getSecret()+getSecret());)
 		// we assume this was done to further limit the usability of the oneTimeToken generated in userResource

src/main/java/com/appirio/tech/core/service/identity/resource/UserResource.java

@@ -104,6 +104,8 @@ public class UserResource implements GetResource<User>, DDLResource<User> {
     private String domain;
 
     private String sendgridTemplateId;
+
+    private String sendgridWelcomeTemplateId;
 
     protected UserDAO userDao;
 
@@ -908,12 +910,15 @@ public ApiResponse resendEmail(
         data.put("domain", getDomain());
         data.put("subDomain", "platform");
         data.put("path", "/onboard");
+        data.put("redirectUrl", "https%3A%2F%2Fplatform."+getDomain()+"%2Fonboard");
 
         if (user.getRegSource() != null && user.getRegSource().matches("tcBusiness")) {
             data.put("subDomain", "connect");
             data.put("path", "/");
+            data.put("redirectUrl", "https%3A%2F%2Fconnect."+getDomain()+"%2F");
         }
 
+
         payload.put("data", data);
 
         Map<String,Object> from = new LinkedHashMap<String,Object>();
@@ -1742,10 +1747,19 @@ public String getSendgridTemplateId() {
         return sendgridTemplateId;
     }
 
+    public void setSendgridWelcomeTemplateId(String sendgridWelcomeTemplateId) {
+        this.sendgridWelcomeTemplateId = sendgridWelcomeTemplateId;
+    }
+
+    public String getSendgridWelcomeTemplateId() {
+        return sendgridWelcomeTemplateId;
+    }
+
     public void setSendgridTemplateId(String sendgridTemplateId) {
         this.sendgridTemplateId = sendgridTemplateId;
     }
 
+
     public String getSecret() {
         return secret;
     }
@@ -1758,13 +1772,99 @@ protected void publishUserEvent(String topic, User user) {
         if(user==null)
             return;
         logger.info(String.format("Publishing a user event to '%s'. userId: %s, handle: %s", topic, user.getId(), user.getHandle()));
+
+        /**
+         * trigger event for new kafka
+         */
         publishEvent(topic, user);
     }
 
 
     protected void notifyActivation(User user, String redirectUrl) {
     	NotificationPayload payload = createActivationNotificationPayload(user, redirectUrl);
     	publishNotificationEvent(payload.getMailRepresentation());
+
+        /**
+         * trigger event for new kafka
+         */
+        sendActivationEmailEvent(user, redirectUrl);
+    }
+
+    private void sendActivationEmailEvent(User user, String redirectUrl) {
+
+        EventMessage msg = EventMessage.getDefault();
+        msg.setTopic("external.action.email");
+
+        Map<String,Object> payload = new LinkedHashMap<String,Object>();
+
+        Map<String,Object> data = new LinkedHashMap<String,Object>();
+        data.put("handle", user.getHandle());
+        data.put("code", user.getCredential().getActivationCode());
+        data.put("domain", getDomain());
+        data.put("redirectUrl", redirectUrl);
+
+        if ((redirectUrl ==null) || (redirectUrl.isEmpty())) {
+            data.put("subDomain", "platform");
+            data.put("path", "/onboard");
+
+            if (user.getRegSource() != null && user.getRegSource().matches("tcBusiness")) {
+                data.put("subDomain", "connect");
+                data.put("path", "/");
+            }
+        }
+
+        payload.put("data", data);
+
+        Map<String,Object> from = new LinkedHashMap<String,Object>();
+        from.put("email", String.format("Topcoder <noreply@%s>", getDomain()));
+        payload.put("from", from);
+
+        payload.put("version", "v3");
+        payload.put("sendgrid_template_id", this.getSendgridTemplateId());
+
+        ArrayList<String> recipients = new ArrayList<String>();
+        recipients.add(user.getEmail());
+
+        payload.put("recipients", recipients);
+
+        msg.setPayload(payload);
+        try {
+            this.eventBusServiceClient.reFireEvent(msg);
+        } catch (Exception e) {
+            logger.error("Error occured while publishing the events to new kafka.");
+        }
+    }
+
+    private void sendWelcomeEmailEvent(User user) {
+
+        EventMessage msg = EventMessage.getDefault();
+        msg.setTopic("external.action.email");
+
+        Map<String,Object> payload = new LinkedHashMap<String,Object>();
+
+        Map<String,Object> data = new LinkedHashMap<String,Object>();
+        data.put("handle", user.getHandle());
+
+        payload.put("data", data);
+
+        Map<String,Object> from = new LinkedHashMap<String,Object>();
+        from.put("email", String.format("Topcoder <noreply@%s>", getDomain()));
+        payload.put("from", from);
+
+        payload.put("version", "v3");
+        payload.put("sendgrid_template_id", this.getSendgridWelcomeTemplateId());
+
+        ArrayList<String> recipients = new ArrayList<String>();
+        recipients.add(user.getEmail());
+
+        payload.put("recipients", recipients);
+
+        msg.setPayload(payload);
+        try {
+            this.eventBusServiceClient.reFireEvent(msg);
+        } catch (Exception e) {
+            logger.error("Error occured while publishing the events to new kafka.");
+        }
     }
 
     protected NotificationPayload createActivationNotificationPayload(User user, String redirectUrl) {
@@ -1784,6 +1884,7 @@ protected void notifyPasswordReset(User user, String resetToken, String resetPas
     protected void notifyWelcome(User user) {
         publishNotificationEvent(
                 new NotificationPayload.WelcomePayload(user).getMailRepresentation());
+        sendWelcomeEmailEvent(user);
     }
 
     protected void publishNotificationEvent(MailRepresentation mail) {
@@ -1821,8 +1922,6 @@ protected void publishEvent(String topic, Object payload) {
             logger.error(String.format("Failed to convert the payload - %s", payload), e);
         }
 
-
-
     }
 
     /**

src/main/resources/config.yml

@@ -12,6 +12,7 @@ context:
   passwordHashKey: @application.password.key@
   ssoTokenSalt: @application.ssotoken.salt@
   sendGridTemplateId: @application.sendgrid.template.id@
+  sendGridWelcomeTemplateId: @application.sendgrid.welcome.template.id@
   jwtExpirySeconds: 600
   cookieExpirySeconds: 7776000
 

token.properties.template

@@ -9,6 +9,7 @@
 
 #sendgrid
 @application.sendgrid.template.id@={{SENDGRID_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID}}
+@application.sendgrid.welcome.template.id@={{SENDGRID_WELCOME_EMAIL_TEMPLATE_ID}}
 
 @ldap.host@={{LDAP_SERVER}}
 @ldap.port@=389