We don't need to support disabled accounts for the signed PK API
This commit is contained in:
parent
ef767728ac
commit
bc0c6be4c5
|
@ -164,8 +164,7 @@ public class KeysController {
|
||||||
@PUT
|
@PUT
|
||||||
@Path("/signed")
|
@Path("/signed")
|
||||||
@Consumes(MediaType.APPLICATION_JSON)
|
@Consumes(MediaType.APPLICATION_JSON)
|
||||||
public void setSignedKey(@Auth DisabledPermittedAccount disabledPermittedAccount, @Valid SignedPreKey signedPreKey) {
|
public void setSignedKey(@Auth Account account, @Valid SignedPreKey signedPreKey) {
|
||||||
Account account = disabledPermittedAccount.getAccount();
|
|
||||||
Device device = account.getAuthenticatedDevice().get();
|
Device device = account.getAuthenticatedDevice().get();
|
||||||
boolean wasAccountEnabled = account.isEnabled();
|
boolean wasAccountEnabled = account.isEnabled();
|
||||||
|
|
||||||
|
|
|
@ -191,10 +191,7 @@ public class KeyControllerTest {
|
||||||
.header("Authorization", AuthHelper.getAuthHeader(AuthHelper.DISABLED_NUMBER, AuthHelper.DISABLED_PASSWORD))
|
.header("Authorization", AuthHelper.getAuthHeader(AuthHelper.DISABLED_NUMBER, AuthHelper.DISABLED_PASSWORD))
|
||||||
.put(Entity.entity(test, MediaType.APPLICATION_JSON_TYPE));
|
.put(Entity.entity(test, MediaType.APPLICATION_JSON_TYPE));
|
||||||
|
|
||||||
assertThat(response.getStatus()).isEqualTo(204);
|
assertThat(response.getStatus()).isEqualTo(401);
|
||||||
|
|
||||||
verify(AuthHelper.DISABLED_DEVICE).setSignedPreKey(eq(test));
|
|
||||||
verify(accounts).update(eq(AuthHelper.DISABLED_ACCOUNT));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue