From b328f9a1b06e2bc7994a82d4a7f90712a19c9b88 Mon Sep 17 00:00:00 2001
From: Stijn Taelemans <stijn@digita.ai>
Date: Fri, 18 Jun 2021 11:08:20 +0200
Subject: [PATCH] fix: Add solid_oidc_supported to openid config

* fix: added solid_oidc_supported to openid config

* test: fixed coverage

* chore: moved solid_oidc_supported to config discovery
---
 src/identity/configuration/KeyConfigurationFactory.ts  |  3 +++
 test/integration/Identity.test.ts                      | 10 ++++++++++
 .../configuration/KeyConfigurationFactory.test.ts      |  3 +++
 3 files changed, 16 insertions(+)

diff --git a/src/identity/configuration/KeyConfigurationFactory.ts b/src/identity/configuration/KeyConfigurationFactory.ts
index 8da6475ca..d25814574 100644
--- a/src/identity/configuration/KeyConfigurationFactory.ts
+++ b/src/identity/configuration/KeyConfigurationFactory.ts
@@ -128,6 +128,9 @@ export class KeyConfigurationFactory implements ConfigurationFactory {
         token: this.createRoute('token'),
         userinfo: this.createRoute('me'),
       },
+      discovery: {
+        solid_oidc_supported: 'https://solidproject.org/TR/solid-oidc',
+      },
     };
   }
 }
diff --git a/test/integration/Identity.test.ts b/test/integration/Identity.test.ts
index 6628978b2..8f805b344 100644
--- a/test/integration/Identity.test.ts
+++ b/test/integration/Identity.test.ts
@@ -334,4 +334,14 @@ describe('A Solid server with IDP', (): void => {
       expect(res.status).toBe(205);
     });
   });
+
+  describe('openid-configuration', (): void => {
+    it('should contain solid_oidc_supported key.', async(): Promise<void> => {
+      const res = await fetch(`${baseUrl}.well-known/openid-configuration`);
+      const jsonBody = await res.json();
+
+      expect(res.status).toBe(200);
+      expect(jsonBody.solid_oidc_supported).toEqual('https://solidproject.org/TR/solid-oidc');
+    });
+  });
 });
diff --git a/test/unit/identity/configuration/KeyConfigurationFactory.test.ts b/test/unit/identity/configuration/KeyConfigurationFactory.test.ts
index 24222e79d..ec5590ca6 100644
--- a/test/unit/identity/configuration/KeyConfigurationFactory.test.ts
+++ b/test/unit/identity/configuration/KeyConfigurationFactory.test.ts
@@ -43,6 +43,9 @@ function getExpected(adapter: any, cookieKeys: any, jwks: any): any {
       token: '/foo/idp/token',
       userinfo: '/foo/idp/me',
     },
+    discovery: {
+      solid_oidc_supported: 'https://solidproject.org/TR/solid-oidc',
+    },
   };
 }