Skip to content
This repository was archived by the owner on Dec 9, 2025. It is now read-only.

Commit 8eaef01

Browse files
ThomasKranitsasThomasKranitsas
authored
Merge pull request #65 from appirio-tech/dev
Self-service prod release
2 parents 33e9948 + 441bf61 commit 8eaef01

File tree

5 files changed

+62
-3
lines changed

5 files changed

+62
-3
lines changed

‎buildtokenproperties.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ AUTH0_DOMAIN=$(eval "echo \$${ENV}_AUTH0_DOMAIN")
4545

4646
SENDGRID_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID=$(eval "echo \$${ENV}_SENDGRID_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID")
4747
SENDGRID_WELCOME_EMAIL_TEMPLATE_ID=$(eval "echo \$${ENV}_SENDGRID_WELCOME_EMAIL_TEMPLATE_ID")
48+
SENDGRID_SELF_SERVICE_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID=$(eval "echo \$${ENV}_SENDGRID_SELF_SERVICE_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID")
49+
SENDGRID_SELF_SERVICE_WELCOME_EMAIL_TEMPLATE_ID=$(eval "echo \$${ENV}_SENDGRID_SELF_SERVICE_WELCOME_EMAIL_TEMPLATE_ID")
4850

4951

5052
if [[ -z "$ENV" ]] ; then
@@ -110,4 +112,6 @@ perl -pi -e "s|\{\{M2MAUTHCONFIG_USERPROFILES_DELETE\}\}|$M2MAUTHCONFIG_USERPROF
110112
perl -pi -e "s/\{\{AUTH0_NEW_DOMAIN\}\}/$AUTH0_NEW_DOMAIN/g" $CONFFILENAME
111113
perl -pi -e "s/\{\{AUTH0_DOMAIN\}\}/$AUTH0_DOMAIN/g" $CONFFILENAME
112114
perl -pi -e "s/\{\{SENDGRID_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID\}\}/$SENDGRID_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID/g" $CONFFILENAME
113-
perl -pi -e "s/\{\{SENDGRID_WELCOME_EMAIL_TEMPLATE_ID\}\}/$SENDGRID_WELCOME_EMAIL_TEMPLATE_ID/g" $CONFFILENAME
115+
perl -pi -e "s/\{\{SENDGRID_WELCOME_EMAIL_TEMPLATE_ID\}\}/$SENDGRID_WELCOME_EMAIL_TEMPLATE_ID/g" $CONFFILENAME
116+
perl -pi -e "s/\{\{SENDGRID_SELF_SERVICE_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID\}\}/$SENDGRID_SELF_SERVICE_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID/g" $CONFFILENAME
117+
perl -pi -e "s/\{\{SENDGRID_SELF_SERVICE_WELCOME_EMAIL_TEMPLATE_ID\}\}/$SENDGRID_SELF_SERVICE_WELCOME_EMAIL_TEMPLATE_ID/g" $CONFFILENAME

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,10 @@ public void run(IdentityConfiguration configuration, Environment environment) th
237237
UserResource userResource = new UserResource(userDao, roleDao, cacheService, eventProducer, eventBusServiceClient, configuration.getM2mAuthConfiguration().getUserProfiles());
238238
userResource.setAuth0Client(configuration.getAuth0()); // TODO: constructor
239239
userResource.setDomain(configuration.getAuthDomain());
240-
userResource.setSendgridTemplateId(Utils.getString("sendGridTemplateId"));
241-
userResource.setSendgridWelcomeTemplateId(Utils.getString("sendGridWelcomeTemplateId"));
240+
userResource.setSendgridTemplateId(Utils.getString("sendGridTemplateId"));
241+
userResource.setSendgridWelcomeTemplateId(Utils.getString("sendGridWelcomeTemplateId"));
242+
userResource.setSendgridSelfServiceTemplateId(Utils.getString("sendGridSelfServiceTemplateId"));
243+
userResource.setSendgridSelfServiceWelcomeTemplateId(Utils.getString("sendGridSelfServiceWelcomeTemplateId"));
242244
// this secret _used_ to be different from the one used in AuthorizationResource.
243245
// it _was_ the secret x2. (userResource.setSecret(getSecret()+getSecret());)
244246
// 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‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ public class UserResource implements GetResource<User>, DDLResource<User> {
106106
private String sendgridTemplateId;
107107

108108
private String sendgridWelcomeTemplateId;
109+
110+
private String sendgridSelfServiceTemplateId;
111+
112+
private String sendgridSelfServiceWelcomeTemplateId;
109113

110114
protected UserDAO userDao;
111115

@@ -508,6 +512,11 @@ public ApiResponse createObject(
508512
assignRoleByName("Business User", user);
509513
}
510514

515+
// Add Self-Service Customer role if needed
516+
if (user.getRegSource() != null && user.getRegSource().matches("selfService")) {
517+
assignRoleByName("Self-Service Customer", user);
518+
}
519+
511520
// publish event
512521
publishUserEvent("event.user.created", user);
513522

@@ -918,6 +927,11 @@ public ApiResponse resendEmail(
918927
data.put("redirectUrl", "https%3A%2F%2Fconnect."+getDomain()+"%2F");
919928
}
920929

930+
if (user.getRegSource() != null && user.getRegSource().matches("selfService")) {
931+
data.put("subDomain", "platform");
932+
data.put("path", "/self-service");
933+
data.put("redirectUrl", "https%3A%2F%2Fplatform."+getDomain()+"%2Fself-service");
934+
}
921935

922936
payload.put("data", data);
923937

@@ -927,6 +941,9 @@ public ApiResponse resendEmail(
927941

928942
payload.put("version", "v3");
929943
payload.put("sendgrid_template_id", this.getSendgridTemplateId());
944+
if (user.getRegSource() != null && user.getRegSource().matches("selfService")) {
945+
payload.put("sendgrid_template_id", this.getSendgridSelfServiceTemplateId());
946+
}
930947

931948
ArrayList<String> recipients = new ArrayList<String>();
932949
recipients.add(user.getEmail());
@@ -981,6 +998,11 @@ public ApiResponse activateUser(
981998
// assign a default user role
982999
assignDefaultUserRole(user);
9831000

1001+
1002+
if (user.getRegSource() != null && user.getRegSource().matches("selfService")) {
1003+
assignRoleByName("Self-Service Customer", user);
1004+
}
1005+
9841006
return ApiResponseFactory.createResponse(user);
9851007
}
9861008

@@ -1759,6 +1781,21 @@ public void setSendgridTemplateId(String sendgridTemplateId) {
17591781
this.sendgridTemplateId = sendgridTemplateId;
17601782
}
17611783

1784+
public String getSendgridSelfServiceTemplateId() {
1785+
return sendgridSelfServiceTemplateId;
1786+
}
1787+
1788+
public void setSendgridSelfServiceWelcomeTemplateId(String sendgridSelfServiceWelcomeTemplateId) {
1789+
this.sendgridSelfServiceWelcomeTemplateId = sendgridSelfServiceWelcomeTemplateId;
1790+
}
1791+
1792+
public String getSendgridSelfServiceWelcomeTemplateId() {
1793+
return sendgridSelfServiceWelcomeTemplateId;
1794+
}
1795+
1796+
public void setSendgridSelfServiceTemplateId(String sendgridSelfServiceTemplateId) {
1797+
this.sendgridSelfServiceTemplateId = sendgridSelfServiceTemplateId;
1798+
}
17621799

17631800
public String getSecret() {
17641801
return secret;
@@ -1811,6 +1848,12 @@ private void sendActivationEmailEvent(User user, String redirectUrl) {
18111848
data.put("subDomain", "connect");
18121849
data.put("path", "/");
18131850
}
1851+
1852+
1853+
if (user.getRegSource() != null && user.getRegSource().matches("selfService")) {
1854+
data.put("subDomain", "platform");
1855+
data.put("path", "/self-service");
1856+
}
18141857
}
18151858

18161859
payload.put("data", data);
@@ -1821,6 +1864,9 @@ private void sendActivationEmailEvent(User user, String redirectUrl) {
18211864

18221865
payload.put("version", "v3");
18231866
payload.put("sendgrid_template_id", this.getSendgridTemplateId());
1867+
if (user.getRegSource() != null && user.getRegSource().matches("selfService")) {
1868+
payload.put("sendgrid_template_id", this.getSendgridSelfServiceTemplateId());
1869+
}
18241870

18251871
ArrayList<String> recipients = new ArrayList<String>();
18261872
recipients.add(user.getEmail());
@@ -1853,6 +1899,9 @@ private void sendWelcomeEmailEvent(User user) {
18531899

18541900
payload.put("version", "v3");
18551901
payload.put("sendgrid_template_id", this.getSendgridWelcomeTemplateId());
1902+
if (user.getRegSource() != null && user.getRegSource().matches("selfService")) {
1903+
payload.put("sendgrid_template_id", this.getSendgridSelfServiceWelcomeTemplateId());
1904+
}
18561905

18571906
ArrayList<String> recipients = new ArrayList<String>();
18581907
recipients.add(user.getEmail());

‎src/main/resources/config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ context:
1313
ssoTokenSalt: @application.ssotoken.salt@
1414
sendGridTemplateId: @application.sendgrid.template.id@
1515
sendGridWelcomeTemplateId: @application.sendgrid.welcome.template.id@
16+
sendGridSelfServiceTemplateId: @application.sendgrid.selfservice.template.id@
17+
sendGridSelfServiceWelcomeTemplateId: @application.sendgrid.selfservice.welcome.template.id@
1618
jwtExpirySeconds: 600
1719
cookieExpirySeconds: 7776000
1820

‎token.properties.template‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#sendgrid
1111
@application.sendgrid.template.id@={{SENDGRID_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID}}
1212
@application.sendgrid.welcome.template.id@={{SENDGRID_WELCOME_EMAIL_TEMPLATE_ID}}
13+
@application.sendgrid.selfservice.template.id@={{SENDGRID_SELF_SERVICE_RESEND_ACTIVATION_EMAIL_TEMPLATE_ID}}
14+
@application.sendgrid.selfservice.welcome.template.id@={{SENDGRID_SELF_SERVICE_WELCOME_EMAIL_TEMPLATE_ID}}
1315

1416
@ldap.host@={{LDAP_SERVER}}
1517
@ldap.port@=389

0 commit comments

Comments
 (0)