Skip to content

When an anonymous user visits a published app, a log entry is added to the app_usage_log table. #1730

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.

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

Merged
merged 1 commit into from
May 31, 2025
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ public Mono<Void> publishApplicationCommonEvent(ApplicationView originalApplicat
public Mono<Void> publishApplicationCommonEvent(ApplicationView originalApplicationView, ApplicationView applicationView, EventType eventType) {
return sessionUserService.isAnonymousUser()
.flatMap(anonymous -> {
if (anonymous) {
return Mono.empty();
}
return sessionUserService.getVisitorOrgMemberCache()
.zipWith(Mono.defer(() -> {
String folderId = applicationView.getApplicationInfoView().getFolderId();
Expand Down Expand Up @@ -204,50 +201,45 @@ public Mono<Void> publishApplicationCommonEvent(ApplicationView originalApplicat
});
});
}


public Mono<Void> publishApplicationPermissionEvent(String applicationId, Set<String> userIds, Set<String> groupIds, String permissionId, String role) {
return sessionUserService.isAnonymousUser()
.flatMap(anonymous -> {
if (anonymous) {
return Mono.empty();
}
return sessionUserService.getVisitorOrgMemberCache()
.zipWith(sessionUserService.getVisitorToken())
.zipWith(applicationService.findById(applicationId)
.zipWhen(application -> application.getCategory(applicationRecordServiceImpl))
.zipWhen(application -> application.getT1().getDescription(applicationRecordServiceImpl)))
.flatMap(tuple -> {
OrgMember orgMember = tuple.getT1().getT1();
String token = tuple.getT1().getT2();
String category = tuple.getT2().getT1().getT2();
String description = tuple.getT2().getT2();
Application application = tuple.getT2().getT1().getT1();

ApplicationCommonEvent event = ApplicationCommonEvent.builder()
.orgId(orgMember.getOrgId())
.userId(orgMember.getUserId())
.applicationId(application.getId())
.applicationGid(application.getGid())
.applicationName(application.getName())
.applicationCategory(category)
.applicationDescription(description)
.type(EventType.APPLICATION_PERMISSION_CHANGE)
.permissionId(permissionId)
.role(role)
.userIds(userIds)
.groupIds(groupIds)
.isAnonymous(anonymous)
.sessionHash(Hashing.sha512().hashString(token, StandardCharsets.UTF_8).toString())
.build();

return Mono.deferContextual(contextView -> {
event.populateDetails(contextView);
applicationEventPublisher.publishEvent(event);
return Mono.empty();
}).then(); // **Fix: Ensures Mono<Void> is returned**
});
})
.flatMap(anonymous -> sessionUserService.getVisitorOrgMemberCache()
.zipWith(sessionUserService.getVisitorToken())
.zipWith(applicationService.findById(applicationId)
.zipWhen(application -> application.getCategory(applicationRecordServiceImpl))
.zipWhen(application -> application.getT1().getDescription(applicationRecordServiceImpl)))
.flatMap(tuple -> {
OrgMember orgMember = tuple.getT1().getT1();
String token = tuple.getT1().getT2();
String category = tuple.getT2().getT1().getT2();
String description = tuple.getT2().getT2();
Application application = tuple.getT2().getT1().getT1();

ApplicationCommonEvent event = ApplicationCommonEvent.builder()
.orgId(orgMember.getOrgId())
.userId(orgMember.getUserId())
.applicationId(application.getId())
.applicationGid(application.getGid())
.applicationName(application.getName())
.applicationCategory(category)
.applicationDescription(description)
.type(EventType.APPLICATION_PERMISSION_CHANGE)
.permissionId(permissionId)
.role(role)
.userIds(userIds)
.groupIds(groupIds)
.isAnonymous(anonymous)
.sessionHash(Hashing.sha512().hashString(token, StandardCharsets.UTF_8).toString())
.build();

return Mono.deferContextual(contextView -> {
event.populateDetails(contextView);
applicationEventPublisher.publishEvent(event);
return Mono.empty();
}).then(); // **Fix: Ensures Mono<Void> is returned**
}))
.onErrorResume(throwable -> {
log.error("publishApplicationPermissionEvent error. {}, {}, {}", applicationId, permissionId, role, throwable);
return Mono.empty();
Expand Down
Loading