From 34627f498f32e2e187f260f8ac7a61a94053490d Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Wed, 3 Aug 2022 17:18:30 +0100
Subject: [PATCH] Use unstable OIDC scope names

---
 src/domain/login/StartOIDCLoginViewModel.js | 2 +-
 src/matrix/net/OidcApi.ts                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/domain/login/StartOIDCLoginViewModel.js b/src/domain/login/StartOIDCLoginViewModel.js
index 07cae075..b6a171fa 100644
--- a/src/domain/login/StartOIDCLoginViewModel.js
+++ b/src/domain/login/StartOIDCLoginViewModel.js
@@ -59,7 +59,7 @@ export class StartOIDCLoginViewModel extends ViewModel {
     async startOIDCLogin() {
         const deviceScope = this._api.generateDeviceScope();
         const p = this._api.generateParams({
-            scope: `openid urn:matrix:api:* ${deviceScope}`,
+            scope: `openid urn:matrix:org.matrix.msc2967.client:api:* ${deviceScope}`,
             redirectUri: this.urlCreator.createOIDCRedirectURL(),
         });
         const clientId = await this._api.clientId();
diff --git a/src/matrix/net/OidcApi.ts b/src/matrix/net/OidcApi.ts
index 103aae82..cb57c4ab 100644
--- a/src/matrix/net/OidcApi.ts
+++ b/src/matrix/net/OidcApi.ts
@@ -233,7 +233,7 @@ export class OidcApi {
 
     generateDeviceScope(): String {
         const deviceId = randomString(10);
-        return `urn:matrix:device:${deviceId}`;
+        return `urn:matrix:org.matrix.msc2967.client:device:${deviceId}`;
     }
 
     generateParams({ scope, redirectUri }: { scope: string, redirectUri: string }): AuthorizationParams {