#273 sending the cirrus sponsored no reply email address (#274)

tl-its-umich-edu · Dec 10, 2019 · 56fe149 · 56fe149
1 parent a88ae17
commit 56fe149
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>edu.umich.ctools</groupId>
 	<artifactId>canvasCourseManager</artifactId>
 	<packaging>war</packaging>
-	<version>4.0.4</version>
+	<version>4.0.5</version>
 	<name>canvasCourseManager</name>
 	<url>http://maven.apache.org</url>
 

diff --git a/src/main/java/edu/umich/ctools/sectionsUtilityTool/FriendServlet.java b/src/main/java/edu/umich/ctools/sectionsUtilityTool/FriendServlet.java
@@ -154,11 +154,13 @@ private StringEntity socialLoginApiRequestBody(String spURL, String nonUmichEmai
         apiPostBody.put(Utils.SOCIAL_LOGIN_SERVICE_NAME, "UMICH Invite");
         apiPostBody.put(Utils.SOCIAL_LOGIN_EMAIL_ADDRESS, nonUmichEmail);
         apiPostBody.put(Utils.SOCIAL_LOGIN_EMAIL_SUBJECT, String.format("UMICH Invitation for %s %s" ,friendFirstName, friendLastName));
-        apiPostBody.put(Utils.SOCIAL_LOGIN_SPONSOR_EPPN, Utils.FRIEND_CONTACT_EMAIL);
-        apiPostBody.put(Utils.SOCIAL_LOGIN_SPONSOR_MAIL, Utils.FRIEND_CONTACT_EMAIL);
+        apiPostBody.put(Utils.SOCIAL_LOGIN_SPONSOR_EPPN, appExtProperties.getProperty(Utils.SOCIAL_LOGIN_NO_REPLY_EMAIL));
+        apiPostBody.put(Utils.SOCIAL_LOGIN_SPONSOR_MAIL, appExtProperties.getProperty(Utils.SOCIAL_LOGIN_NO_REPLY_EMAIL));
         apiPostBody.put(Utils.SOCIAL_LOGIN_SPONSOR_GIVENNAME, "ITS");
         apiPostBody.put(Utils.SOCIAL_LOGIN_SPONSOR_SURNAME, "Service Center");
-        StringEntity stringEntity = new StringEntity(apiPostBody.toString());
+        String apiPostData = apiPostBody.toString();
+        M_log.debug(String.format("Social login form post data %s", apiPostData));
+        StringEntity stringEntity = new StringEntity(apiPostData);
         return stringEntity;
     }
 

diff --git a/src/main/java/edu/umich/ctools/sectionsUtilityTool/Utils.java b/src/main/java/edu/umich/ctools/sectionsUtilityTool/Utils.java
@@ -85,6 +85,7 @@ public class Utils {
 	protected static final String JSON_PARAM_IMPORTED_WITH_MESSAGES = "imported_with_messages";
 	protected static final String JSON_PARAM_IMPORTED = "imported";
 	protected static final String SOCIAL_LOGIN_API_SERVICE_PROVIDED_URL = "social.login.service.provider.url";
+	protected static final String SOCIAL_LOGIN_NO_REPLY_EMAIL = "social.login.no.reply.email";
 	protected static final String SOCIAL_LOGIN_API_URL = "social.login.url";
 	protected static final String SOCIAL_LOGIN_API_KEY = "social.login.key";
 	protected static final String SOCIAL_LOGIN_API_SECRET = "social.login.secret";