added missing configuration

Author: coderReview

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

@@ -233,6 +233,7 @@ public void run(IdentityConfiguration configuration, Environment environment) th
     	UserResource userResource = new UserResource(userDao, roleDao, cacheService, eventProducer, eventBusServiceClient, configuration.getM2mAuthConfiguration().getUserProfiles());
     	userResource.setAuth0Client(configuration.getAuth0()); // TODO: constructor
     	userResource.setDomain(configuration.getAuthDomain());
+		userResource.setSendgridTemplateId(configuration.getContext().get("sendGridTemplateId"));
     	// 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

@@ -102,6 +102,8 @@ public class UserResource implements GetResource<User>, DDLResource<User> {
     private int oneTimeTokenExpirySeconds = 10 * 60; //10min
 
     private String domain;
+
+    private String sendgridTemplateId;
 
     protected UserDAO userDao;
 
@@ -891,29 +893,32 @@ public ApiResponse resendEmail(
             throw new APIRuntimeException(SC_UNAUTHORIZED, "Credentials are incorrect.");
         }
 
-        //user.setRoles(roles);
-        if(!user.isActive()) {
-            EventMessage msg = EventMessage.getDefault();
-            msg.setTopic("identity.action.email.resend");
+        // return 400 if user has been activated
+        if(user.isActive())
+            throw new APIRuntimeException(SC_BAD_REQUEST, MSG_TEMPLATE_USER_ALREADY_ACTIVATED);
 
-            Map<String,Object> payload = new LinkedHashMap<String,Object>();
+        EventMessage msg = EventMessage.getDefault();
+        msg.setTopic("external.action.email");
 
-            Map<String,Object> data = new LinkedHashMap<String,Object>();
-            data.put("handle", user.getHandle());
-            data.put("code", user.getCredential().getActivationCode());
+        Map<String,Object> payload = new LinkedHashMap<String,Object>();
 
-            payload.put("data", data);
-            payload.put("version", "v3");
-            payload.put("sendgrid_template_id", "ddd");
+        Map<String,Object> data = new LinkedHashMap<String,Object>();
+        data.put("handle", user.getHandle());
+        data.put("code", user.getCredential().getActivationCode());
+        data.put("domain", getDomain());
 
-            ArrayList<String> recipients = new ArrayList<String>();
-            recipients.add(user.getEmail());
+        payload.put("data", data);
+        payload.put("version", "v3");
+        payload.put("sendgrid_template_id", this.getSendgridTemplateId());
 
-            payload.put("recipients", recipients);
+        ArrayList<String> recipients = new ArrayList<String>();
+        recipients.add(user.getEmail());
+
+        payload.put("recipients", recipients);
+
+        msg.setPayload(payload);
+        this.eventBusServiceClient.reFireEvent(msg);
 
-            msg.setPayload(payload);
-            this.eventBusServiceClient.reFireEvent(msg);
-        }
         return ApiResponseFactory.createResponse(user);
     }
 
@@ -1721,6 +1726,14 @@ public void setDomain(String domain) {
         this.domain = domain;
     }
 
+    public String getSendgridTemplateId() {
+        return sendgridTemplateId;
+    }
+
+    public void setSendgridTemplateId(String sendgridTemplateId) {
+        this.sendgridTemplateId = sendgridTemplateId;
+    }
+
     public String getSecret() {
         return secret;
     }

src/main/resources/config.yml

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