Skip to content

fix(#verify-device-for-geojson-import): ensure device is verified dur… #1043

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

Merged
dgraf-gh merged 1 commit into from
Jun 22, 2026
Merged

fix(#verify-device-for-geojson-import): ensure device is verified dur… #1043

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/main/java/com/dedicatedcode/reitti/controller/api/GeoJsonApiController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.dedicatedcode.reitti.controller.api;

import com.dedicatedcode.reitti.model.devices.Device;
import com.dedicatedcode.reitti.model.security.DeviceTokenUser;
import com.dedicatedcode.reitti.model.security.User;
import com.dedicatedcode.reitti.repository.DeviceJdbcService;
import com.dedicatedcode.reitti.service.GeoJsonExportService;
Expand Down Expand Up @@ -78,13 +79,14 @@ public ResponseEntity<StreamingResponseBody> exportGeoJson(

@PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<Map<String, Object>> importGeoJson(
@AuthenticationPrincipal User user,
@AuthenticationPrincipal DeviceTokenUser user,
@RequestParam("file") MultipartFile file,
@RequestParam(value = "device", required = false) Long deviceId) {

Map<String, Object> response = new HashMap<>();

Device device = this.deviceJdbcService.find(user, deviceId).orElse(null);
Device device = this.deviceJdbcService.find(user, deviceId)
.orElse(user.getDevice().orElseThrow(() -> new IllegalArgumentException("Device not found")));
try {
if (file.isEmpty() || file.getOriginalFilename() == null) {
response.put("success", false);
Expand Down
Loading