From 0b2126737fe7285099ce6fa044dc1c38df5fac86 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Mon, 31 Oct 2022 13:15:14 +0100
Subject: [PATCH] fix: oauth screens

---
 src/lib/stores/oauth-providers.ts                           | 1 +
 .../project-[project]/authentication/_appleOAuth.svelte     | 2 +-
 .../project-[project]/authentication/_auth0OAuth.svelte     | 2 +-
 .../project-[project]/authentication/_mainOAuth.svelte      | 6 ++++--
 .../project-[project]/authentication/_microsoftOAuth.svelte | 2 +-
 .../project-[project]/authentication/_oktaOAuth.svelte      | 2 +-
 .../project-[project]/authentication/settings/+page.svelte  | 5 ++---
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts
index 64b254b00..e897255ed 100644
--- a/src/lib/stores/oauth-providers.ts
+++ b/src/lib/stores/oauth-providers.ts
@@ -26,6 +26,7 @@ const setProviders = (project: Models.Project): Provider[] => {
 
             switch (n.name.toLowerCase()) {
                 case 'amazon':
+                    console.log(n);
                     docs = 'https://developer.amazon.com/apps-and-games/services-and-apis';
                     break;
                 case 'apple':
diff --git a/src/routes/console/project-[project]/authentication/_appleOAuth.svelte b/src/routes/console/project-[project]/authentication/_appleOAuth.svelte
index 9cb8457b3..fbe3e7270 100644
--- a/src/routes/console/project-[project]/authentication/_appleOAuth.svelte
+++ b/src/routes/console/project-[project]/authentication/_appleOAuth.svelte
@@ -10,7 +10,7 @@
     export let provider: Provider;
 
     let appId: string = null;
-    let enabled = false;
+    let enabled: boolean = null;
     let keyID: string = null;
     let teamID: string = null;
     let p8: string = null;
diff --git a/src/routes/console/project-[project]/authentication/_auth0OAuth.svelte b/src/routes/console/project-[project]/authentication/_auth0OAuth.svelte
index 5951ee4b4..249ae42d9 100644
--- a/src/routes/console/project-[project]/authentication/_auth0OAuth.svelte
+++ b/src/routes/console/project-[project]/authentication/_auth0OAuth.svelte
@@ -10,7 +10,7 @@
     export let provider: Provider;
 
     let appId: string = null;
-    let enabled = false;
+    let enabled: boolean = null;
     let clientSecret: string = null;
     let auth0Domain: string = null;
     let error: string;
diff --git a/src/routes/console/project-[project]/authentication/_mainOAuth.svelte b/src/routes/console/project-[project]/authentication/_mainOAuth.svelte
index aac505801..3d61c173b 100644
--- a/src/routes/console/project-[project]/authentication/_mainOAuth.svelte
+++ b/src/routes/console/project-[project]/authentication/_mainOAuth.svelte
@@ -6,12 +6,14 @@
     import type { Provider } from '$lib/stores/oauth-providers';
     import { addNotification } from '$lib/stores/notifications';
     import { onMount } from 'svelte';
+    import { invalidate } from '$app/navigation';
+    import { Dependencies } from '$lib/constants';
 
     export let provider: Provider;
 
     const projectId = $page.params.project;
 
-    let enabled = false;
+    let enabled: boolean = null;
     let appId: string = null;
     let secret: string = null;
 
@@ -24,7 +26,6 @@
     let error: string;
 
     const update = async () => {
-        console.log(provider);
         try {
             await sdkForConsole.projects.updateOAuth2(
                 projectId,
@@ -42,6 +43,7 @@
                     provider.enabled ? 'enabled' : 'disabled'
                 }`
             });
+            invalidate(Dependencies.PROJECT);
         } catch ({ message }) {
             error = message;
         }
diff --git a/src/routes/console/project-[project]/authentication/_microsoftOAuth.svelte b/src/routes/console/project-[project]/authentication/_microsoftOAuth.svelte
index 9bbe76a12..daf6000c2 100644
--- a/src/routes/console/project-[project]/authentication/_microsoftOAuth.svelte
+++ b/src/routes/console/project-[project]/authentication/_microsoftOAuth.svelte
@@ -10,7 +10,7 @@
     export let provider: Provider;
 
     let appId: string = null;
-    let enabled = false;
+    let enabled: boolean = null;
     let clientSecret: string = null;
     let tenantID: string = null;
     let error: string;
diff --git a/src/routes/console/project-[project]/authentication/_oktaOAuth.svelte b/src/routes/console/project-[project]/authentication/_oktaOAuth.svelte
index 1b9c66f89..69b1e095b 100644
--- a/src/routes/console/project-[project]/authentication/_oktaOAuth.svelte
+++ b/src/routes/console/project-[project]/authentication/_oktaOAuth.svelte
@@ -10,7 +10,7 @@
     export let provider: Provider;
 
     let appId: string = null;
-    let enabled = false;
+    let enabled: boolean = null;
     let clientSecret: string = null;
     let oktaDomain: string = null;
     let authorizationServerId: string = null;
diff --git a/src/routes/console/project-[project]/authentication/settings/+page.svelte b/src/routes/console/project-[project]/authentication/settings/+page.svelte
index d209725f2..ef4010fd9 100644
--- a/src/routes/console/project-[project]/authentication/settings/+page.svelte
+++ b/src/routes/console/project-[project]/authentication/settings/+page.svelte
@@ -11,15 +11,14 @@
     import { event } from '$lib/actions/analytics';
     import type { Provider } from '$lib/stores/oauth-providers';
     import { app } from '$lib/stores/app';
-    import { onMount } from 'svelte';
     import { page } from '$app/stores';
 
     const projectId = $page.params.project;
 
-    onMount(async () => {
+    $: {
         authMethods.load($project);
         OAuthProviders.load($project);
-    });
+    }
 
     const authUpdate = async (box: AuthMethod) => {
         try {