Make the frontend parse the stable scope as well

Author: sandhose

frontend/src/utils/deviceIdFromScope.test.ts

@@ -10,12 +10,18 @@ import { describe, expect, it } from "vitest";
 import { getDeviceIdFromScope } from "./deviceIdFromScope";
 
 describe("getDeviceIdFromScope()", () => {
-  it("returns deviceid when device is part of scope", () => {
+  it("returns deviceid when device is part of scope (unstable)", () => {
     const scope =
       "openid urn:matrix:org.matrix.msc2967.client:api:* urn:matrix:org.matrix.msc2967.client:device:abcd1234";
     expect(getDeviceIdFromScope(scope)).toEqual("abcd1234");
   });
 
+  it("returns deviceid when device is part of scope (stable)", () => {
+    const scope =
+      "openid urn:matrix:client:api:* urn:matrix:client:device:abcd1234";
+    expect(getDeviceIdFromScope(scope)).toEqual("abcd1234");
+  });
+
   it("returns undefined when device not part of scope", () => {
     const scope = "openid some:other:scope ";
     expect(getDeviceIdFromScope(scope)).toBeUndefined();

frontend/src/utils/deviceIdFromScope.ts

@@ -5,7 +5,8 @@
  * Please see LICENSE in the repository root for full details.
  */
 
-const DEVICE_PREFIX = "urn:matrix:org.matrix.msc2967.client:device:";
+const UNSTABLE_DEVICE_PREFIX = "urn:matrix:org.matrix.msc2967.client:device:";
+const STABLE_DEVICE_PREFIX = "urn:matrix:client:device:";
 
 /**
  * Device scopes are suffixed with the deviceId
@@ -14,6 +15,7 @@ const DEVICE_PREFIX = "urn:matrix:org.matrix.msc2967.client:device:";
  * @returns deviceId, or undefined when not a device scope
  */
 export const getDeviceIdFromScope = (scope: string): string | undefined => {
-  const [, deviceId] = scope.split(DEVICE_PREFIX);
-  return deviceId;
+  const [, stableDeviceId] = scope.split(STABLE_DEVICE_PREFIX);
+  const [, unstableDeviceId] = scope.split(UNSTABLE_DEVICE_PREFIX);
+  return stableDeviceId || unstableDeviceId;
 };