Skip to content

Commit 053f881

Browse files
committed
remove duplicate code
1 parent 39ae135 commit 053f881

File tree

1 file changed

+3
-18
lines changed

1 file changed

+3
-18
lines changed

src/main/java/org/purpurmc/papyrus/controller/v2/CreationController.java

+3-18
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import org.purpurmc.papyrus.db.repository.VersionRepository;
1919
import org.purpurmc.papyrus.exception.BuildAlreadyExists;
2020
import org.purpurmc.papyrus.exception.FileUploadError;
21-
import org.purpurmc.papyrus.exception.InvalidAuthToken;
2221
import org.purpurmc.papyrus.exception.InvalidStateKey;
22+
import org.purpurmc.papyrus.util.AuthUtil;
2323
import org.springframework.beans.factory.annotation.Autowired;
2424
import org.springframework.http.HttpHeaders;
2525
import org.springframework.http.ResponseEntity;
@@ -78,7 +78,7 @@ public CreationController(
7878
@PostMapping
7979
@ResponseBody
8080
public CreateBuild createBuild(@RequestHeader(HttpHeaders.AUTHORIZATION) String authHeader, @RequestBody CreateBuildBody body) {
81-
this.requireAuth(authHeader);
81+
AuthUtil.requireAuth(configuration, authHeader);
8282

8383
Project project = null;
8484
Version version = null;
@@ -130,7 +130,7 @@ public CreateBuild createBuild(@RequestHeader(HttpHeaders.AUTHORIZATION) String
130130
@PostMapping("/upload")
131131
@ResponseBody
132132
public ResponseEntity<String> uploadFile(@RequestHeader(HttpHeaders.AUTHORIZATION) String authHeader, @RequestParam("stateKey") String stateKey, @RequestParam("file") MultipartFile uploadFile) {
133-
this.requireAuth(authHeader);
133+
AuthUtil.requireAuth(configuration, authHeader);
134134

135135
CreationState state;
136136
try {
@@ -174,21 +174,6 @@ public ResponseEntity<String> uploadFile(@RequestHeader(HttpHeaders.AUTHORIZATIO
174174
return ResponseEntity.ok("");
175175
}
176176

177-
private void requireAuth(String authHeader) {
178-
String[] parts = authHeader.trim().split(" ");
179-
if (parts.length != 2) {
180-
throw new InvalidAuthToken();
181-
}
182-
183-
if (!parts[0].equals("Basic")) {
184-
throw new InvalidAuthToken();
185-
}
186-
187-
if (!parts[1].equals(configuration.getAuthToken())) {
188-
throw new InvalidAuthToken();
189-
}
190-
}
191-
192177
private record CreateBuildBody(String project,
193178
String version,
194179
String build,

0 commit comments

Comments
 (0)