diff options
| author | Joas Schilling <coding@schilljs.com> | 2024-03-07 16:51:44 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2024-03-07 17:00:57 +0100 |
| commit | e27dd6d659fcaa0b00401cbf94bc66b06bc0e014 (patch) | |
| tree | 437d908a2e37b7cf4c31d4ca3329a4cda918d16a /lib | |
| parent | 54ac8304a8aaf209ccd9292dc7d34d578a188023 (diff) | |
fix(federation): Don't expose the accessToken anymore to the frontend/clients
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Model/Attendee.php | 1 | ||||
| -rw-r--r-- | lib/Model/Invitation.php | 3 | ||||
| -rw-r--r-- | lib/ResponseDefinitions.php | 1 | ||||
| -rw-r--r-- | lib/Service/RoomFormatter.php | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/lib/Model/Attendee.php b/lib/Model/Attendee.php index 8d7ed0578..dc2fd2dc6 100644 --- a/lib/Model/Attendee.php +++ b/lib/Model/Attendee.php @@ -216,7 +216,6 @@ class Attendee extends Entity { 'last_mention_direct' => $this->getLastMentionDirect(), 'read_privacy' => $this->getReadPrivacy(), 'permissions' => $this->getPermissions(), - 'access_token' => $this->getAccessToken(), 'remote_id' => $this->getRemoteId(), 'invited_cloud_id' => $this->getInvitedCloudId(), 'phone_number' => $this->getPhoneNumber(), diff --git a/lib/Model/Invitation.php b/lib/Model/Invitation.php index f558800b7..f0c7377db 100644 --- a/lib/Model/Invitation.php +++ b/lib/Model/Invitation.php @@ -79,7 +79,7 @@ class Invitation extends Entity implements \JsonSerializable { } /** - * @return array{accessToken: string, id: int, localRoomId: int, localCloudId: string, remoteAttendeeId: int, remoteServerUrl: string, remoteToken: string, state: int, userId: string, inviterCloudId: string, inviterDisplayName: string} + * @return array{id: int, localRoomId: int, localCloudId: string, remoteAttendeeId: int, remoteServerUrl: string, remoteToken: string, state: int, userId: string, inviterCloudId: string, inviterDisplayName: string} */ public function jsonSerialize(): array { return [ @@ -88,7 +88,6 @@ class Invitation extends Entity implements \JsonSerializable { 'state' => $this->getState(), 'localRoomId' => $this->getLocalRoomId(), 'localCloudId' => $this->getLocalCloudId(), - 'accessToken' => $this->getAccessToken(), 'remoteServerUrl' => $this->getRemoteServerUrl(), 'remoteToken' => $this->getRemoteToken(), 'remoteAttendeeId' => $this->getRemoteAttendeeId(), diff --git a/lib/ResponseDefinitions.php b/lib/ResponseDefinitions.php index 522466350..1ddcbaccc 100644 --- a/lib/ResponseDefinitions.php +++ b/lib/ResponseDefinitions.php @@ -114,7 +114,6 @@ namespace OCA\Talk; * } * * @psalm-type TalkFederationInvite = array{ - * accessToken: string, * id: int, * state: int, * localCloudId: string, diff --git a/lib/Service/RoomFormatter.php b/lib/Service/RoomFormatter.php index 9f2455433..a14ce1957 100644 --- a/lib/Service/RoomFormatter.php +++ b/lib/Service/RoomFormatter.php @@ -348,7 +348,6 @@ class RoomFormatter { if ($room->getRemoteServer() && $room->getRemoteToken()) { $roomData['remoteServer'] = $room->getRemoteServer(); $roomData['remoteToken'] = $room->getRemoteToken(); - $roomData['remoteAccessToken'] = $attendee->getAccessToken(); } // FIXME This should not be done, but currently all the clients use it to get the avatar of the user … |