Skip to content

Commit 55ea796

Browse files
dartcafedartcafe
authored
Merge pull request #3922 from nextcloud/fix/api
fix ocs api routes
2 parents a5c9773 + 76c2584 commit 55ea796

7 files changed

Lines changed: 44 additions & 45 deletions

‎lib/Controller/CommentApiController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function __construct(
3535
#[CORS]
3636
#[NoAdminRequired]
3737
#[NoCSRFRequired]
38-
#[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/poll/{pollId}/comments', requirements: ['apiVersion' => '(v2)'])]
38+
#[ApiRoute(verb: 'GET', url: '/api/v1.0/poll/{pollId}/comments', requirements: ['apiVersion' => '(v2)'])]
3939
public function list(int $pollId): DataResponse {
4040
return $this->response(fn () => ['comments' => $this->commentService->list($pollId)]);
4141
}
@@ -48,7 +48,7 @@ public function list(int $pollId): DataResponse {
4848
#[CORS]
4949
#[NoAdminRequired]
5050
#[NoCSRFRequired]
51-
#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/poll/{pollId}/comment', requirements: ['apiVersion' => '(v2)'])]
51+
#[ApiRoute(verb: 'POST', url: '/api/v1.0/poll/{pollId}/comment', requirements: ['apiVersion' => '(v2)'])]
5252
public function add(int $pollId, string $comment): DataResponse {
5353
return $this->response(fn () => ['comment' => $this->commentService->add($comment, $pollId)]);
5454
}
@@ -60,7 +60,7 @@ public function add(int $pollId, string $comment): DataResponse {
6060
#[CORS]
6161
#[NoAdminRequired]
6262
#[NoCSRFRequired]
63-
#[ApiRoute(verb: 'DELETE', url: '/api/{apiVersion}/comment/{commentId}', requirements: ['apiVersion' => '(v2)'])]
63+
#[ApiRoute(verb: 'DELETE', url: '/api/v1.0/comment/{commentId}', requirements: ['apiVersion' => '(v2)'])]
6464
public function delete(int $commentId): DataResponse {
6565
return $this->response(fn () => ['comment' => $this->commentService->delete($commentId)]);
6666
}
@@ -72,7 +72,7 @@ public function delete(int $commentId): DataResponse {
7272
#[CORS]
7373
#[NoAdminRequired]
7474
#[NoCSRFRequired]
75-
#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/comment/{commentId}/restore', requirements: ['apiVersion' => '(v2)'])]
75+
#[ApiRoute(verb: 'POST', url: '/api/v1.0/comment/{commentId}/restore', requirements: ['apiVersion' => '(v2)'])]
7676
public function restore(int $commentId): DataResponse {
7777
return $this->response(fn () => ['comment' => $this->commentService->restore($commentId)]);
7878
}

‎lib/Controller/OptionApiController.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function __construct(
3535
#[CORS]
3636
#[NoAdminRequired]
3737
#[NoCSRFRequired]
38-
#[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/poll/{pollId}/options', requirements: ['apiVersion' => '(v2)'])]
38+
#[ApiRoute(verb: 'GET', url: '/api/v1.0/poll/{pollId}/options', requirements: ['apiVersion' => '(v2)'])]
3939
public function list(int $pollId): DataResponse {
4040
return $this->response(fn () => ['options' => $this->optionService->list($pollId)]);
4141
}
@@ -50,7 +50,7 @@ public function list(int $pollId): DataResponse {
5050
#[CORS]
5151
#[NoAdminRequired]
5252
#[NoCSRFRequired]
53-
#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/poll/{pollId}/option', requirements: ['apiVersion' => '(v2)'])]
53+
#[ApiRoute(verb: 'POST', url: '/api/v1.0/poll/{pollId}/option', requirements: ['apiVersion' => '(v2)'])]
5454
public function add(int $pollId, int $timestamp = 0, string $pollOptionText = '', int $duration = 0): DataResponse {
5555
return $this->responseCreate(fn () => ['option' => $this->optionService->add($pollId, $timestamp, $pollOptionText, $duration)]);
5656
}
@@ -64,7 +64,7 @@ public function add(int $pollId, int $timestamp = 0, string $pollOptionText = ''
6464
#[CORS]
6565
#[NoAdminRequired]
6666
#[NoCSRFRequired]
67-
#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/poll/{pollId}/options', requirements: ['apiVersion' => '(v2)'])]
67+
#[ApiRoute(verb: 'POST', url: '/api/v1.0/poll/{pollId}/options', requirements: ['apiVersion' => '(v2)'])]
6868
public function addBulk(int $pollId, string $text = ''): DataResponse {
6969
return $this->responseCreate(fn () => ['options' => $this->optionService->addBulk($pollId, $text)]);
7070
}
@@ -79,7 +79,7 @@ public function addBulk(int $pollId, string $text = ''): DataResponse {
7979
#[CORS]
8080
#[NoAdminRequired]
8181
#[NoCSRFRequired]
82-
#[ApiRoute(verb: 'PUT', url: '/api/{apiVersion}/option/{optionId}', requirements: ['apiVersion' => '(v2)'])]
82+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/option/{optionId}', requirements: ['apiVersion' => '(v2)'])]
8383
public function update(int $optionId, int $timestamp = 0, string $text = '', int $duration = 0): DataResponse {
8484
return $this->response(fn () => ['option' => $this->optionService->update($optionId, $timestamp, $text, $duration)]);
8585
}
@@ -91,7 +91,7 @@ public function update(int $optionId, int $timestamp = 0, string $text = '', int
9191
#[CORS]
9292
#[NoAdminRequired]
9393
#[NoCSRFRequired]
94-
#[ApiRoute(verb: 'DELETE', url: '/api/{apiVersion}/option/{optionId}', requirements: ['apiVersion' => '(v2)'])]
94+
#[ApiRoute(verb: 'DELETE', url: '/api/v1.0/option/{optionId}', requirements: ['apiVersion' => '(v2)'])]
9595
public function delete(int $optionId): DataResponse {
9696
return $this->response(fn () => ['option' => $this->optionService->delete($optionId)]);
9797
}
@@ -103,7 +103,7 @@ public function delete(int $optionId): DataResponse {
103103
#[CORS]
104104
#[NoAdminRequired]
105105
#[NoCSRFRequired]
106-
#[ApiRoute(verb: 'PUT', url: '/api/{apiVersion}/option/{optionId}/restore', requirements: ['apiVersion' => '(v2)'])]
106+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/option/{optionId}/restore', requirements: ['apiVersion' => '(v2)'])]
107107
public function restore(int $optionId): DataResponse {
108108
return $this->response(fn () => ['option' => $this->optionService->delete($optionId, true)]);
109109
}
@@ -115,7 +115,7 @@ public function restore(int $optionId): DataResponse {
115115
#[CORS]
116116
#[NoAdminRequired]
117117
#[NoCSRFRequired]
118-
#[ApiRoute(verb: 'PUT', url: '/api/{apiVersion}/option/{optionId}/confirm', requirements: ['apiVersion' => '(v2)'])]
118+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/option/{optionId}/confirm', requirements: ['apiVersion' => '(v2)'])]
119119
public function confirm(int $optionId): DataResponse {
120120
return $this->response(fn () => ['option' => $this->optionService->confirm($optionId)]);
121121
}
@@ -128,7 +128,7 @@ public function confirm(int $optionId): DataResponse {
128128
#[CORS]
129129
#[NoAdminRequired]
130130
#[NoCSRFRequired]
131-
#[ApiRoute(verb: 'PUT', url: '/api/{apiVersion}/option/{optionId}/order/{order}', requirements: ['apiVersion' => '(v2)'])]
131+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/option/{optionId}/order/{order}', requirements: ['apiVersion' => '(v2)'])]
132132
public function setOrder(int $optionId, int $order): DataResponse {
133133
return $this->response(fn () => ['option' => $this->optionService->setOrder($optionId, $order)]);
134134
}

‎lib/Controller/PollApiController.php‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace OCA\Polls\Controller;
1010

11-
use OCA\Polls\ResponseDefinitions as ResponseDefinitions;
1211
use OCA\Polls\Service\CommentService;
1312
use OCA\Polls\Service\OptionService;
1413
use OCA\Polls\Service\PollService;
@@ -24,7 +23,7 @@
2423

2524
/**
2625
* @psalm-api
27-
* @psalm-import-type PollsPoll from ResponseDefinitions
26+
* @psalm-import-type PollsPoll from \OCA\Polls\ResponseDefinitions
2827
* */
2928
class PollApiController extends BaseApiV2Controller {
3029
public function __construct(
@@ -46,7 +45,7 @@ public function __construct(
4645
#[CORS]
4746
#[NoAdminRequired]
4847
#[NoCSRFRequired]
49-
#[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/polls', requirements: ['apiVersion' => '(v2)'])]
48+
#[ApiRoute(verb: 'GET', url: '/api/v1.0/polls', requirements: ['apiVersion' => '(v2)'])]
5049
public function list(): DataResponse {
5150
return $this->response(fn () => ['polls' => $this->pollService->list()]);
5251
}
@@ -58,7 +57,7 @@ public function list(): DataResponse {
5857
#[CORS]
5958
#[NoAdminRequired]
6059
#[NoCSRFRequired]
61-
#[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/poll/{pollId}', requirements: ['apiVersion' => '(v2)'])]
60+
#[ApiRoute(verb: 'GET', url: '/api/v1.0/poll/{pollId}', requirements: ['apiVersion' => '(v2)'])]
6261
public function get(int $pollId): DataResponse {
6362
return $this->response(fn () => [
6463
'poll' => $this->pollService->get($pollId),
@@ -78,7 +77,7 @@ public function get(int $pollId): DataResponse {
7877
#[CORS]
7978
#[NoAdminRequired]
8079
#[NoCSRFRequired]
81-
#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/poll', requirements: ['apiVersion' => '(v2)'])]
80+
#[ApiRoute(verb: 'POST', url: '/api/v1.0/poll', requirements: ['apiVersion' => '(v2)'])]
8281
public function add(string $type, string $title): DataResponse {
8382
return $this->responseCreate(fn () => ['poll' => $this->pollService->add($type, $title)]);
8483
}
@@ -91,7 +90,7 @@ public function add(string $type, string $title): DataResponse {
9190
#[CORS]
9291
#[NoAdminRequired]
9392
#[NoCSRFRequired]
94-
#[ApiRoute(verb: 'PUT', url: '/api/{apiVersion}/poll/{pollId}', requirements: ['apiVersion' => '(v2)'])]
93+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/poll/{pollId}', requirements: ['apiVersion' => '(v2)'])]
9594
public function update(int $pollId, array $pollConfiguration): DataResponse {
9695
return $this->response(fn () => ['poll' => $this->pollService->update($pollId, $pollConfiguration)]);
9796
}
@@ -103,7 +102,7 @@ public function update(int $pollId, array $pollConfiguration): DataResponse {
103102
#[CORS]
104103
#[NoAdminRequired]
105104
#[NoCSRFRequired]
106-
#[ApiRoute(verb: 'PUT', url: '/api/{apiVersion}/poll/{pollId}/archive/toggle', requirements: ['apiVersion' => '(v2)'])]
105+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/poll/{pollId}/archive/toggle', requirements: ['apiVersion' => '(v2)'])]
107106
public function toggleArchive(int $pollId): DataResponse {
108107
return $this->response(fn () => ['poll' => $this->pollService->toggleArchive($pollId)]);
109108
}
@@ -115,7 +114,7 @@ public function toggleArchive(int $pollId): DataResponse {
115114
#[CORS]
116115
#[NoAdminRequired]
117116
#[NoCSRFRequired]
118-
#[ApiRoute(verb: 'PUT', url: '/api/{apiVersion}/poll/{pollId}/close', requirements: ['apiVersion' => '(v2)'])]
117+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/poll/{pollId}/close', requirements: ['apiVersion' => '(v2)'])]
119118
public function close(int $pollId): DataResponse {
120119
return $this->response(fn () => ['poll' => $this->pollService->close($pollId)]);
121120
}
@@ -127,7 +126,7 @@ public function close(int $pollId): DataResponse {
127126
#[CORS]
128127
#[NoAdminRequired]
129128
#[NoCSRFRequired]
130-
#[ApiRoute(verb: 'PUT', url: '/api/{apiVersion}/poll/{pollId}/reopen', requirements: ['apiVersion' => '(v2)'])]
129+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/poll/{pollId}/reopen', requirements: ['apiVersion' => '(v2)'])]
131130
public function reopen(int $pollId): DataResponse {
132131
return $this->response(fn () => ['poll' => $this->pollService->reopen($pollId)]);
133132
}
@@ -139,7 +138,7 @@ public function reopen(int $pollId): DataResponse {
139138
#[CORS]
140139
#[NoAdminRequired]
141140
#[NoCSRFRequired]
142-
#[ApiRoute(verb: 'DELETE', url: '/api/{apiVersion}/poll/{pollId}', requirements: ['apiVersion' => '(v2)'])]
141+
#[ApiRoute(verb: 'DELETE', url: '/api/v1.0/poll/{pollId}', requirements: ['apiVersion' => '(v2)'])]
143142
public function delete(int $pollId): DataResponse {
144143
return $this->response(fn () => ['poll' => $this->pollService->delete($pollId)]);
145144
}
@@ -151,7 +150,7 @@ public function delete(int $pollId): DataResponse {
151150
#[CORS]
152151
#[NoAdminRequired]
153152
#[NoCSRFRequired]
154-
#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/poll/{pollId}/clone', requirements: ['apiVersion' => '(v2)'])]
153+
#[ApiRoute(verb: 'POST', url: '/api/v1.0/poll/{pollId}/clone', requirements: ['apiVersion' => '(v2)'])]
155154
public function clone(int $pollId): DataResponse {
156155
return $this->responseCreate(fn () => ['poll' => $this->pollService->clone($pollId)]);
157156
}
@@ -163,19 +162,19 @@ public function clone(int $pollId): DataResponse {
163162
*/
164163
#[CORS]
165164
#[NoCSRFRequired]
166-
#[ApiRoute(verb: 'PUT', url: '/api/{apiVersion}/poll/transfer/{sourceUser}/{targetUser}', requirements: ['apiVersion' => '(v2)'])]
165+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/poll/transfer/{sourceUser}/{targetUser}', requirements: ['apiVersion' => '(v2)'])]
167166
public function transferPolls(string $sourceUser, string $targetUser): DataResponse {
168167
return $this->response(fn () => ['transferred' => $this->pollService->transferPolls($sourceUser, $targetUser)]);
169168
}
170169

171170
/**
172-
* Transfer singe poll to another user (change owner of poll)
171+
* Transfer single poll to another user (change owner of poll)
173172
* @param int $pollId Poll to transfer
174173
* @param string $targetUser User to transfer the poll to
175174
*/
176175
#[CORS]
177176
#[NoCSRFRequired]
178-
#[ApiRoute(verb: 'PUT', url: '/api/{apiVersion}/poll/{pollId}/transfer/{targetUser}', requirements: ['apiVersion' => '(v2)'])]
177+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/poll/{pollId}/transfer/{targetUser}', requirements: ['apiVersion' => '(v2)'])]
179178
public function transferPoll(int $pollId, string $targetUser): DataResponse {
180179
return $this->response(fn () => ['transferred' => $this->pollService->transferPoll($pollId, $targetUser)]);
181180
}
@@ -187,7 +186,7 @@ public function transferPoll(int $pollId, string $targetUser): DataResponse {
187186
#[CORS]
188187
#[NoAdminRequired]
189188
#[NoCSRFRequired]
190-
#[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/poll/{pollId}/addresses', requirements: ['apiVersion' => '(v2)'])]
189+
#[ApiRoute(verb: 'GET', url: '/api/v1.0/poll/{pollId}/addresses', requirements: ['apiVersion' => '(v2)'])]
191190
public function getParticipantsEmailAddresses(int $pollId): DataResponse {
192191
return $this->response(fn () => ['addresses' => $this->pollService->getParticipantsEmailAddresses($pollId)]);
193192
}
@@ -198,7 +197,7 @@ public function getParticipantsEmailAddresses(int $pollId): DataResponse {
198197
#[CORS]
199198
#[NoAdminRequired]
200199
#[NoCSRFRequired]
201-
#[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/poll/enum', requirements: ['apiVersion' => '(v2)'])]
200+
#[ApiRoute(verb: 'GET', url: '/api/v1.0/enum', requirements: ['apiVersion' => '(v2)'])]
202201
public function enum(): DataResponse {
203202
return $this->response(fn () => ['enum' => $this->pollService->getValidEnum()]);
204203
}

‎lib/Controller/ShareApiController.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(
3737
#[CORS]
3838
#[NoAdminRequired]
3939
#[NoCSRFRequired]
40-
#[ApiRoute(verb: 'GET', url: '/api/{appVersion}/poll/{pollId}/shares', requirements: ['apiVersion' => '(v2)'])]
40+
#[ApiRoute(verb: 'GET', url: '/api/v1.0/poll/{pollId}/shares', requirements: ['apiVersion' => '(v2)'])]
4141
public function list(int $pollId): DataResponse {
4242
return $this->response(fn () => ['shares' => $this->shareService->list($pollId)]);
4343
}
@@ -48,7 +48,7 @@ public function list(int $pollId): DataResponse {
4848
#[CORS]
4949
#[NoAdminRequired]
5050
#[NoCSRFRequired]
51-
#[ApiRoute(verb: 'GET', url: '/api/{appVersion}/share/{token}', requirements: ['apiVersion' => '(v2)'])]
51+
#[ApiRoute(verb: 'GET', url: '/api/v1.0/share/{token}', requirements: ['apiVersion' => '(v2)'])]
5252
public function get(string $token): DataResponse {
5353
return $this->response(fn () => ['share' => $this->shareService->get($token)]);
5454
}
@@ -64,7 +64,7 @@ public function get(string $token): DataResponse {
6464
#[CORS]
6565
#[NoAdminRequired]
6666
#[NoCSRFRequired]
67-
#[ApiRoute(verb: 'POST', url: '/api/{appVersion}/poll/{pollId}/share/{type}', requirements: ['apiVersion' => '(v2)'])]
67+
#[ApiRoute(verb: 'POST', url: '/api/v1.0/poll/{pollId}/share/{type}', requirements: ['apiVersion' => '(v2)'])]
6868
public function add(int $pollId, string $type, string $userId = '', string $displayName = '', string $emailAddress = ''): DataResponse {
6969
return $this->responseCreate(fn () => ['share' => $this->shareService->add($pollId, $type, $userId, $displayName, $emailAddress)]);
7070
}
@@ -76,7 +76,7 @@ public function add(int $pollId, string $type, string $userId = '', string $disp
7676
#[CORS]
7777
#[NoAdminRequired]
7878
#[NoCSRFRequired]
79-
#[ApiRoute(verb: 'DELETE', url: '/api/{appVersion}/share/{token}', requirements: ['apiVersion' => '(v2)'])]
79+
#[ApiRoute(verb: 'DELETE', url: '/api/v1.0/share/{token}', requirements: ['apiVersion' => '(v2)'])]
8080
public function delete(string $token): DataResponse {
8181
return $this->response(fn () => ['share' => $this->shareService->deleteByToken($token)]);
8282
}
@@ -88,7 +88,7 @@ public function delete(string $token): DataResponse {
8888
#[CORS]
8989
#[NoAdminRequired]
9090
#[NoCSRFRequired]
91-
#[ApiRoute(verb: 'PUT', url: '/api/{appVersion}/share/{token}/restore', requirements: ['apiVersion' => '(v2)'])]
91+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/share/{token}/restore', requirements: ['apiVersion' => '(v2)'])]
9292
public function restore(string $token): DataResponse {
9393
return $this->response(fn () => ['share' => $this->shareService->deleteByToken($token, restore: true)]);
9494
}
@@ -100,7 +100,7 @@ public function restore(string $token): DataResponse {
100100
#[CORS]
101101
#[NoAdminRequired]
102102
#[NoCSRFRequired]
103-
#[ApiRoute(verb: 'PUT', url: '/api/{appVersion}/share/{token}/lock', requirements: ['apiVersion' => '(v2)'])]
103+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/share/{token}/lock', requirements: ['apiVersion' => '(v2)'])]
104104
public function lock(string $token): DataResponse {
105105
return $this->response(fn () => ['share' => $this->shareService->lockByToken($token)]);
106106
}
@@ -112,7 +112,7 @@ public function lock(string $token): DataResponse {
112112
#[CORS]
113113
#[NoAdminRequired]
114114
#[NoCSRFRequired]
115-
#[ApiRoute(verb: 'PUT', url: '/api/{appVersion}/share/{token}/unlock', requirements: ['apiVersion' => '(v2)'])]
115+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/share/{token}/unlock', requirements: ['apiVersion' => '(v2)'])]
116116
public function unlock(string $token): DataResponse {
117117
return $this->response(fn () => ['share' => $this->shareService->lockByToken($token, unlock: true)]);
118118
}
@@ -125,7 +125,7 @@ public function unlock(string $token): DataResponse {
125125
#[CORS]
126126
#[NoAdminRequired]
127127
#[NoCSRFRequired]
128-
#[ApiRoute(verb: 'POST', url: '/api/{appVersion}/share/{token}/invite', requirements: ['apiVersion' => '(v2)'])]
128+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/share/{token}/invite', requirements: ['apiVersion' => '(v2)'])]
129129
public function sendInvitation(string $token): DataResponse {
130130
$share = $this->shareService->get($token);
131131
return $this->response(fn () => [

‎lib/Controller/SubscriptionApiController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function __construct(
3535
#[CORS]
3636
#[NoAdminRequired]
3737
#[NoCSRFRequired]
38-
#[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/poll/{pollId}/subscription', requirements: ['apiVersion' => '(v2)'])]
38+
#[ApiRoute(verb: 'GET', url: '/api/v1.0/poll/{pollId}/subscription', requirements: ['apiVersion' => '(v2)'])]
3939
public function get(int $pollId): DataResponse {
4040
return $this->response(fn () => [
4141
'pollId' => $pollId,
@@ -50,7 +50,7 @@ public function get(int $pollId): DataResponse {
5050
#[CORS]
5151
#[NoAdminRequired]
5252
#[NoCSRFRequired]
53-
#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/poll/{pollId}/subscription', requirements: ['apiVersion' => '(v2)'])]
53+
#[ApiRoute(verb: 'PUT', url: '/api/v1.0/poll/{pollId}/subscription', requirements: ['apiVersion' => '(v2)'])]
5454
public function subscribe(int $pollId): DataResponse {
5555
return $this->response(fn () => [
5656
'pollId' => $pollId,
@@ -65,7 +65,7 @@ public function subscribe(int $pollId): DataResponse {
6565
#[CORS]
6666
#[NoAdminRequired]
6767
#[NoCSRFRequired]
68-
#[ApiRoute(verb: 'DELETE', url: '/api/{apiVersion}/poll/{pollId}/subscription', requirements: ['apiVersion' => '(v2)'])]
68+
#[ApiRoute(verb: 'DELETE', url: '/api/v1.0/poll/{pollId}/subscription', requirements: ['apiVersion' => '(v2)'])]
6969
public function unsubscribe(int $pollId): DataResponse {
7070
return $this->response(fn () => [
7171
'pollId' => $pollId,

‎lib/Controller/UserApiController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function __construct(
3838
#[CORS]
3939
#[NoAdminRequired]
4040
#[NoCSRFRequired]
41-
#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/preferences', requirements: ['apiVersion' => '(v2)'])]
41+
#[ApiRoute(verb: 'POST', url: '/api/v1.0/preferences', requirements: ['apiVersion' => '(v2)'])]
4242
public function writePreferences(array $preferences): DataResponse {
4343
return $this->response(fn () => $this->preferencesService->write($preferences));
4444
}
@@ -48,7 +48,7 @@ public function writePreferences(array $preferences): DataResponse {
4848
#[CORS]
4949
#[NoAdminRequired]
5050
#[NoCSRFRequired]
51-
#[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/session', requirements: ['apiVersion' => '(v2)'])]
51+
#[ApiRoute(verb: 'GET', url: '/api/v1.0/session', requirements: ['apiVersion' => '(v2)'])]
5252
public function getSession(): DataResponse {
5353
return $this->response(fn () => [
5454
'token' => $this->request->getParam('token'),

0 commit comments

Comments
 (0)