MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

return user's own username link handle in /whoami response

This commit is contained in:
Jonathan Klabunde Tomer 2024-09-23 12:46:10 -07:00 committed by GitHub
parent befcdf55fe
commit 2d184b1ab6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
View File

@ -252,6 +252,7 @@ public class AccountController {
auth.getAccount().getNumber(), auth.getAccount().getNumber(),
auth.getAccount().getPhoneNumberIdentifier(), auth.getAccount().getPhoneNumberIdentifier(),
auth.getAccount().getUsernameHash().filter(h -> h.length > 0).orElse(null), auth.getAccount().getUsernameHash().filter(h -> h.length > 0).orElse(null),
auth.getAccount().getUsernameLinkHandle(),
auth.getAccount().isStorageSupported()); auth.getAccount().isStorageSupported());
} }

2
service/src/main/java/org/whispersystems/textsecuregcm/controllers/AccountControllerV2.java
View File

@ -150,6 +150,7 @@ public class AccountControllerV2 {
updatedAccount.getNumber(), updatedAccount.getNumber(),
updatedAccount.getPhoneNumberIdentifier(), updatedAccount.getPhoneNumberIdentifier(),
updatedAccount.getUsernameHash().orElse(null), updatedAccount.getUsernameHash().orElse(null),
updatedAccount.getUsernameLinkHandle(),
updatedAccount.isStorageSupported()); updatedAccount.isStorageSupported());
} catch (MismatchedDevicesException e) { } catch (MismatchedDevicesException e) {
throw new WebApplicationException(Response.status(409) throw new WebApplicationException(Response.status(409)
@ -208,6 +209,7 @@ public class AccountControllerV2 {
updatedAccount.getNumber(), updatedAccount.getNumber(),
updatedAccount.getPhoneNumberIdentifier(), updatedAccount.getPhoneNumberIdentifier(),
updatedAccount.getUsernameHash().orElse(null), updatedAccount.getUsernameHash().orElse(null),
updatedAccount.getUsernameLinkHandle(),
updatedAccount.isStorageSupported()); updatedAccount.isStorageSupported());
} catch (MismatchedDevicesException e) { } catch (MismatchedDevicesException e) {
throw new WebApplicationException(Response.status(409) throw new WebApplicationException(Response.status(409)

1
service/src/main/java/org/whispersystems/textsecuregcm/controllers/RegistrationController.java
View File

@ -170,6 +170,7 @@ public class RegistrationController {
account.getNumber(), account.getNumber(),
account.getPhoneNumberIdentifier(), account.getPhoneNumberIdentifier(),
account.getUsernameHash().orElse(null), account.getUsernameHash().orElse(null),
account.getUsernameLinkHandle(),
existingAccount.map(Account::isStorageSupported).orElse(false)); existingAccount.map(Account::isStorageSupported).orElse(false));
} }

3
service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountIdentityResponse.java
View File

@ -27,6 +27,9 @@ public record AccountIdentityResponse(
@JsonDeserialize(using = ByteArrayBase64UrlAdapter.Deserializing.class) @JsonDeserialize(using = ByteArrayBase64UrlAdapter.Deserializing.class)
@Nullable byte[] usernameHash, @Nullable byte[] usernameHash,
@Schema(description="this account's username link handle, if set")
@Nullable UUID usernameLinkHandle,
@Schema(description="whether any of this account's devices support storage") @Schema(description="whether any of this account's devices support storage")
boolean storageCapable) { boolean storageCapable) {
} }