Qortal/qortal
1
0
Fork 0
mirror of https://github.com/Qortal/qortal.git synced 2025-05-02 07:47:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kennycud 2023-11-29 17:30:26 -08:00
commit 3c307f15b3
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/qortal/api/restricted/resource/AdminResource.java
View File

@ -268,10 +268,7 @@ public class AdminResource {
} }
) )
@ApiErrors({ApiError.REPOSITORY_ISSUE}) @ApiErrors({ApiError.REPOSITORY_ISSUE})
@SecurityRequirement(name = "apiKey") public ActivitySummary summary() {
public ActivitySummary summary(@HeaderParam(Security.API_KEY_HEADER) String apiKey) {
Security.checkApiCallAllowed(request);
ActivitySummary summary = new ActivitySummary(); ActivitySummary summary = new ActivitySummary();
long now = NTP.getTime(); long now = NTP.getTime();

2
src/test/java/org/qortal/test/api/AdminApiTests.java
View File

@ -35,7 +35,7 @@ public class AdminApiTests extends ApiCommon {
// Set localAuthBypassEnabled to true, since we don't need to test authentication here // Set localAuthBypassEnabled to true, since we don't need to test authentication here
FieldUtils.writeField(Settings.getInstance(), "localAuthBypassEnabled", true, true); FieldUtils.writeField(Settings.getInstance(), "localAuthBypassEnabled", true, true);
assertNotNull(this.adminResource.summary("testApiKey")); assertNotNull(this.adminResource.summary());
} }
@Test @Test