Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include organization information in push notification data #9

Merged
merged 2 commits into from
Feb 8, 2025
Merged

Include organization information in push notification data #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc20662
Include organization information in push notification data
ZiyamSanthosh Feb 8, 2025
213f68f
Remove tenantDomain from discovery data for organization user.
ZiyamSanthosh Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .../wso2/carbon/identity/notification/push/device/handler/impl/DeviceHandlerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,7 @@ private void resolveTenantAndOrganizationInfo(RegistrationDiscoveryData registra
.getOrganizationManager();
String orgId = organizationManager.resolveOrganizationId(domainIdentifier);
String organizationName = organizationManager.getOrganizationNameById(orgId);
String primaryOrgId = organizationManager.getPrimaryOrganizationId(orgId);
String primaryTenantDomain = organizationManager.resolveTenantDomain(primaryOrgId);

registrationDiscoveryData.setTenantDomain(primaryTenantDomain);
registrationDiscoveryData.setOrganizationId(orgId);
registrationDiscoveryData.setOrganizationName(organizationName);
} else {
Expand Down
35 changes: 34 additions & 1 deletion .../java/org/wso2/carbon/identity/notification/push/provider/model/PushNotificationData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public class PushNotificationData {
private final String deviceToken;
private final String username;
private final String tenantDomain;
private final String organizationId;
private final String organizationName;
private final String userStoreDomain;
private final String applicationName;
private final String notificationScenario;
Expand All @@ -48,6 +50,8 @@ private PushNotificationData(Builder builder) {
this.notificationBody = builder.notificationBody;
this.username = builder.username;
this.tenantDomain = builder.tenantDomain;
this.organizationId = builder.organizationId;
this.organizationName = builder.organizationName;
this.userStoreDomain = builder.userStoreDomain;
this.applicationName = builder.applicationName;
this.notificationScenario = builder.notificationScenario;
Expand Down Expand Up @@ -81,6 +85,16 @@ public String getTenantDomain() {
return tenantDomain;
}

public String getOrganizationId() {

return organizationId;
}

public String getOrganizationName() {

return organizationName;
}

public String getUserStoreDomain() {

return userStoreDomain;
Expand Down Expand Up @@ -134,10 +148,15 @@ public String getDeviceOS() {
public Map<String, String> getAdditionalData() {

Map<String, String> additionalData = new HashMap<>();
boolean isOrganizationUser = organizationId != null && organizationName != null;
if (username != null) {
additionalData.put("username", username);
}
if (tenantDomain != null) {
if (isOrganizationUser) {
additionalData.put("organizationId", organizationId);
additionalData.put("organizationName", organizationName);
}
if (tenantDomain != null && !isOrganizationUser) {
additionalData.put("tenantDomain", tenantDomain);
}
if (userStoreDomain != null) {
Expand Down Expand Up @@ -184,6 +203,8 @@ public static class Builder {
private String deviceId;
private String username;
private String tenantDomain;
private String organizationId;
private String organizationName;
private String userStoreDomain;
private String applicationName;
private String notificationScenario;
Expand Down Expand Up @@ -218,6 +239,18 @@ public Builder setTenantDomain(String tenantDomain) {
return this;
}

public Builder setOrganizationId(String organizationId) {

this.organizationId = organizationId;
return this;
}

public Builder setOrganizationName(String organizationName) {

this.organizationName = organizationName;
return this;
}

public Builder setUserStoreDomain(String userStoreDomain) {

this.userStoreDomain = userStoreDomain;
Expand Down