From 6d6adc8c028ad9e3d999552570799cc74d3f9a45 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 3 Jan 2023 00:59:07 -0700 Subject: [PATCH] Use identity server v2 api instead of v1 (#9818) See js-sdk change. --- ...{vector-im-identity-v1.json => vector-im-identity-v2.json} | 0 cypress/support/network.ts | 4 ++-- src/components/views/settings/SetIdServer.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename cypress/fixtures/{vector-im-identity-v1.json => vector-im-identity-v2.json} (100%) diff --git a/cypress/fixtures/vector-im-identity-v1.json b/cypress/fixtures/vector-im-identity-v2.json similarity index 100% rename from cypress/fixtures/vector-im-identity-v1.json rename to cypress/fixtures/vector-im-identity-v2.json diff --git a/cypress/support/network.ts b/cypress/support/network.ts index 93e5ca3c27..0cd38d9119 100644 --- a/cypress/support/network.ts +++ b/cypress/support/network.ts @@ -71,8 +71,8 @@ Cypress.Commands.add("goOnline", (): void => { Cypress.Commands.add("stubDefaultServer", (): void => { cy.log("Stubbing vector.im and matrix.org network calls"); // We intercept vector.im & matrix.org calls so that tests don't fail when it has issues - cy.intercept("GET", "https://vector.im/_matrix/identity/api/v1", { - fixture: "vector-im-identity-v1.json", + cy.intercept("GET", "https://vector.im/_matrix/identity/v2", { + fixture: "vector-im-identity-v2.json", }); cy.intercept("GET", "https://matrix.org/.well-known/matrix/client", { fixture: "matrix-org-client-well-known.json", diff --git a/src/components/views/settings/SetIdServer.tsx b/src/components/views/settings/SetIdServer.tsx index 737c4965ff..6c3a0bbc39 100644 --- a/src/components/views/settings/SetIdServer.tsx +++ b/src/components/views/settings/SetIdServer.tsx @@ -50,7 +50,7 @@ async function checkIdentityServerUrl(u) { // XXX: duplicated logic from js-sdk but it's quite tied up in the validation logic in the // js-sdk so probably as easy to duplicate it than to separate it out so we can reuse it try { - const response = await fetch(u + "/_matrix/identity/api/v1"); + const response = await fetch(u + "/_matrix/identity/v2"); if (response.ok) { return null; } else if (response.status < 200 || response.status >= 300) {