From 34a94c9a583dbbbd2ec156ac3769c114dedb4415 Mon Sep 17 00:00:00 2001
From: Jesko Steinberg <jesko.steinberg@sda.se>
Date: Mon, 12 Oct 2020 15:06:27 +0200
Subject: [PATCH] feat: make default scopes of Auth APIs configurable

---
 .../apis/implementations/auth/auth0/Auth0Auth.ts |  4 +++-
 .../implementations/auth/gitlab/GitlabAuth.ts    |  4 +++-
 .../implementations/auth/google/GoogleAuth.ts    | 16 +++++++++-------
 .../auth/microsoft/MicrosoftAuth.ts              | 16 +++++++++-------
 .../apis/implementations/auth/okta/OktaAuth.ts   |  4 +++-
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/packages/core-api/src/apis/implementations/auth/auth0/Auth0Auth.ts b/packages/core-api/src/apis/implementations/auth/auth0/Auth0Auth.ts
index 40e537169c..793d9f90d3 100644
--- a/packages/core-api/src/apis/implementations/auth/auth0/Auth0Auth.ts
+++ b/packages/core-api/src/apis/implementations/auth/auth0/Auth0Auth.ts
@@ -27,6 +27,7 @@ type CreateOptions = {
   discoveryApi: DiscoveryApi;
   oauthRequestApi: OAuthRequestApi;
 
+  defaultScopes?: string[];
   environment?: string;
   provider?: AuthProvider & { id: string };
 };
@@ -43,13 +44,14 @@ class Auth0Auth {
     environment = 'development',
     provider = DEFAULT_PROVIDER,
     oauthRequestApi,
+    defaultScopes = ['openid', `email`, `profile`],
   }: CreateOptions): typeof auth0AuthApiRef.T {
     return OAuth2.create({
       discoveryApi,
       oauthRequestApi,
       provider,
       environment,
-      defaultScopes: ['openid', `email`, `profile`],
+      defaultScopes,
     });
   }
 }
diff --git a/packages/core-api/src/apis/implementations/auth/gitlab/GitlabAuth.ts b/packages/core-api/src/apis/implementations/auth/gitlab/GitlabAuth.ts
index 9e2acd4537..b6a2757143 100644
--- a/packages/core-api/src/apis/implementations/auth/gitlab/GitlabAuth.ts
+++ b/packages/core-api/src/apis/implementations/auth/gitlab/GitlabAuth.ts
@@ -27,6 +27,7 @@ type CreateOptions = {
   discoveryApi: DiscoveryApi;
   oauthRequestApi: OAuthRequestApi;
 
+  defaultScopes?: string[];
   environment?: string;
   provider?: AuthProvider & { id: string };
 };
@@ -43,13 +44,14 @@ class GitlabAuth {
     environment = 'development',
     provider = DEFAULT_PROVIDER,
     oauthRequestApi,
+    defaultScopes = ['read_user'],
   }: CreateOptions): typeof gitlabAuthApiRef.T {
     return OAuth2.create({
       discoveryApi,
       oauthRequestApi,
       provider,
       environment,
-      defaultScopes: ['read_user'],
+      defaultScopes,
     });
   }
 }
diff --git a/packages/core-api/src/apis/implementations/auth/google/GoogleAuth.ts b/packages/core-api/src/apis/implementations/auth/google/GoogleAuth.ts
index 7e84226508..2d2ff3ede7 100644
--- a/packages/core-api/src/apis/implementations/auth/google/GoogleAuth.ts
+++ b/packages/core-api/src/apis/implementations/auth/google/GoogleAuth.ts
@@ -27,6 +27,7 @@ type CreateOptions = {
   discoveryApi: DiscoveryApi;
   oauthRequestApi: OAuthRequestApi;
 
+  defaultScopes?: string[];
   environment?: string;
   provider?: AuthProvider & { id: string };
 };
@@ -37,25 +38,26 @@ const DEFAULT_PROVIDER = {
   icon: GoogleIcon,
 };
 
+const SCOPE_PREFIX = 'https://www.googleapis.com/auth/';
+
 class GoogleAuth {
   static create({
     discoveryApi,
     oauthRequestApi,
     environment = 'development',
     provider = DEFAULT_PROVIDER,
+    defaultScopes = [
+      'openid',
+      `${SCOPE_PREFIX}userinfo.email`,
+      `${SCOPE_PREFIX}userinfo.profile`,
+    ],
   }: CreateOptions): typeof googleAuthApiRef.T {
-    const SCOPE_PREFIX = 'https://www.googleapis.com/auth/';
-
     return OAuth2.create({
       discoveryApi,
       oauthRequestApi,
       provider,
       environment,
-      defaultScopes: [
-        'openid',
-        `${SCOPE_PREFIX}userinfo.email`,
-        `${SCOPE_PREFIX}userinfo.profile`,
-      ],
+      defaultScopes,
       scopeTransform(scopes: string[]) {
         return scopes.map(scope => {
           if (scope === 'openid') {
diff --git a/packages/core-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts b/packages/core-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts
index 241ac7b802..db9180b31c 100644
--- a/packages/core-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts
+++ b/packages/core-api/src/apis/implementations/auth/microsoft/MicrosoftAuth.ts
@@ -28,6 +28,7 @@ type CreateOptions = {
   discoveryApi: DiscoveryApi;
   oauthRequestApi: OAuthRequestApi;
 
+  defaultScopes?: string[];
   environment?: string;
   provider?: AuthProvider & { id: string };
 };
@@ -44,19 +45,20 @@ class MicrosoftAuth {
     provider = DEFAULT_PROVIDER,
     oauthRequestApi,
     discoveryApi,
+    defaultScopes = [
+      'openid',
+      'offline_access',
+      'profile',
+      'email',
+      'User.Read',
+    ],
   }: CreateOptions): typeof microsoftAuthApiRef.T {
     return OAuth2.create({
       discoveryApi,
       oauthRequestApi,
       provider,
       environment,
-      defaultScopes: [
-        'openid',
-        'offline_access',
-        'profile',
-        'email',
-        'User.Read',
-      ],
+      defaultScopes,
     });
   }
 }
diff --git a/packages/core-api/src/apis/implementations/auth/okta/OktaAuth.ts b/packages/core-api/src/apis/implementations/auth/okta/OktaAuth.ts
index 7e9ff77678..7382d24d62 100644
--- a/packages/core-api/src/apis/implementations/auth/okta/OktaAuth.ts
+++ b/packages/core-api/src/apis/implementations/auth/okta/OktaAuth.ts
@@ -27,6 +27,7 @@ type CreateOptions = {
   discoveryApi: DiscoveryApi;
   oauthRequestApi: OAuthRequestApi;
 
+  defaultScopes?: string[];
   environment?: string;
   provider?: AuthProvider & { id: string };
 };
@@ -55,13 +56,14 @@ class OktaAuth {
     environment = 'development',
     provider = DEFAULT_PROVIDER,
     oauthRequestApi,
+    defaultScopes = ['openid', 'email', 'profile', 'offline_access'],
   }: CreateOptions): typeof oktaAuthApiRef.T {
     return OAuth2.create({
       discoveryApi,
       oauthRequestApi,
       provider,
       environment,
-      defaultScopes: ['openid', 'email', 'profile', 'offline_access'],
+      defaultScopes,
       scopeTransform(scopes) {
         return scopes.map(scope => {
           if (OKTA_OIDC_SCOPES.has(scope)) {