Skip to content

Commit f876f1a

Browse files
author
tchapi
committed
chore
1 parent 4ae505c commit f876f1a

5 files changed

Lines changed: 14 additions & 4 deletions

File tree

docs/api/v1/calendars/shares.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,15 @@ Gets a list of all users with whom a specific user calendar is shared.
3535
"data": [
3636
{
3737
"username": "adoe",
38+
"user_id": 5,
3839
"principal_id": 9,
3940
"displayname": "Aiden Doe",
4041
"email": "adoe@example.org",
4142
"write_access": false
4243
},
4344
{
4445
"username": "jdoe",
46+
"user_id": 4,
4547
"principal_id": 3,
4648
"displayname": "John Doe",
4749
"email": "jdoe@example.org",
@@ -101,4 +103,4 @@ or
101103
"message": "Invalid Calendar ID/Username",
102104
"timestamp": "2026-01-23T15:01:33+01:00"
103105
}
104-
```
106+
```

docs/api/v1/users/all.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ Gets a list of all available users.
1919
"status": "success",
2020
"data": [
2121
{
22+
"user_id": 1,
2223
"principal_id": 3,
2324
"uri": "principals/jdoe",
2425
"username": "jdoe"
2526
}
26-
],
27+
],
2728
"timestamp": "2026-01-23T15:01:33+01:00"
2829
}
2930
```

docs/api/v1/users/details.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Gets details about a specific user account.
3030
{
3131
"status": "success",
3232
"data": {
33+
"user_id": 1,
3334
"principal_id": 3,
3435
"uri": "principals/jdoe",
3536
"username": "jdoe",
@@ -75,4 +76,4 @@ or
7576
"status": "error",
7677
"message": "User Not Found",
7778
"timestamp": "2026-01-23T15:01:33+01:00"
78-
}
79+
}

src/Controller/Api/ApiController.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,12 @@ public function getUserCalendarsShares(Request $request, int $userId, int $calen
569569
foreach ($instances as $instance) {
570570
$principalId = $doctrine->getRepository(Principal::class)->findOneByUri($instance[0]['principalUri']);
571571

572+
$instanceUsername = mb_substr($instance[0]['principalUri'], strlen(Principal::PREFIX));
573+
$instanceUserId = $doctrine->getRepository(User::class)->findOneByUsername($instanceUsername)->getId();
574+
572575
$calendars[] = [
573-
'username' => mb_substr($instance[0]['principalUri'], strlen(Principal::PREFIX)),
576+
'username' => $instanceUsername,
577+
'user_id' => $instanceUserId,
574578
'principal_id' => $principalId?->getId() ?? null,
575579
'displayname' => $instance['displayName'],
576580
'email' => $instance['email'],

tests/Functional/ApiControllerTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,8 @@ public function testShareUserCalendar(): void
442442
$this->assertEquals('success', $data['status']);
443443
$this->assertArrayHasKey('data', $data);
444444
$this->assertStringContainsString($shareeUsername, $data['data'][0]['username']);
445+
$this->assertArrayHasKey('user_id', $data['data'][0]);
446+
$this->assertIsNumeric($data['data'][0]['user_id']);
445447
$this->assertFalse($data['data'][0]['write_access']);
446448
}
447449

0 commit comments

Comments
 (0)