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.

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

Notifications: Add route to view active push notification tokens #10314

Closed
Closed
Show file tree
Hide file tree
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
@@ -0,0 +1,9 @@
package de.tum.cit.aet.artemis.communication.dto;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonInclude;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
public record PushNotificationDeviceConfigurationDTO(String deviceType, String token, String secretKey, Date expirationDate, String apiType, String userLogin) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ WHERE p.expirationDate > CURRENT_TIMESTAMP()
""")
List<PushNotificationDeviceConfiguration> findByUserIn(@Param("users") Set<User> users, @Param("deviceType") PushNotificationDeviceType deviceType);

List<PushNotificationDeviceConfiguration> findPushNotificationDeviceConfigurationsByOwner(User owner);

/**
* Cleans up the old/expired push notifications device configurations
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Arrays;
import java.util.Base64;
import java.util.Date;
import java.util.List;

import jakarta.validation.Valid;

Expand All @@ -15,10 +17,12 @@
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Profile;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
Expand All @@ -27,6 +31,8 @@
import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationApiType;
import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfiguration;
import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceConfigurationId;
import de.tum.cit.aet.artemis.communication.domain.push_notification.PushNotificationDeviceType;
import de.tum.cit.aet.artemis.communication.dto.PushNotificationDeviceConfigurationDTO;
import de.tum.cit.aet.artemis.communication.dto.PushNotificationRegisterBody;
import de.tum.cit.aet.artemis.communication.dto.PushNotificationRegisterDTO;
import de.tum.cit.aet.artemis.communication.dto.PushNotificationUnregisterRequest;
Expand Down Expand Up @@ -134,6 +140,27 @@ public ResponseEntity<Void> unregister(@Valid @RequestBody PushNotificationUnreg
return ResponseEntity.ok().build();
}

/**
* API endpoint to view user tokens
*
* @return the users push tokens
*/
@GetMapping(value = "push-tokens", produces = MediaType.APPLICATION_JSON_VALUE)
@EnforceAtLeastStudent
public ResponseEntity<List<PushNotificationDeviceConfigurationDTO>> userTokens() {
var user = userRepository.getUser();

var tokens = pushNotificationDeviceConfigurationRepository.findPushNotificationDeviceConfigurationsByOwner(user);

List<PushNotificationDeviceConfigurationDTO> ret = tokens.stream()
.map(token -> new PushNotificationDeviceConfigurationDTO(token.getDeviceType() == PushNotificationDeviceType.APNS ? "APNS" : "Firebase", token.getToken(),
Arrays.toString(token.getSecretKey()), token.getExpirationDate(), token.getApiType() == PushNotificationApiType.DEFAULT ? "DEFAULT" : "V2",
user.getLogin()))
.toList();

return ResponseEntity.ok(ret);
}

private String getToken() {
// TODO: we should rather get the token from the cookie, e.g. something like Cookie jwtCookie = WebUtils.getCookie(httpServletRequest, JWT_COOKIE_NAME);
UsernamePasswordAuthenticationToken auth = (UsernamePasswordAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
Expand Down
Loading