From 979140a711b0fb604459b4e01bbb88a545a9fa13 Mon Sep 17 00:00:00 2001
From: Alex Tugarev <alex@gitpod.io>
Date: Thu, 16 Nov 2023 14:00:57 +0000
Subject: [PATCH] fixup allow to change the `clientId` only

---
 .../dashboard/src/service/json-rpc-authprovider-client.ts | 6 +++---
 components/server/src/auth/auth-provider-service.ts       | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/dashboard/src/service/json-rpc-authprovider-client.ts b/components/dashboard/src/service/json-rpc-authprovider-client.ts
index b5c6f36f11030d..e8576ca04019ab 100644
--- a/components/dashboard/src/service/json-rpc-authprovider-client.ts
+++ b/components/dashboard/src/service/json-rpc-authprovider-client.ts
@@ -113,9 +113,9 @@ export class JsonRpcAuthProviderClient implements PromiseClient<typeof AuthProvi
         if (!request.authProviderId) {
             throw new ConnectError("authProviderId is required", Code.InvalidArgument);
         }
-        const clientId = request?.clientId;
-        const clientSecret = request?.clientSecret;
-        if (!clientId || !clientSecret) {
+        const clientId = request?.clientId || "";
+        const clientSecret = request?.clientSecret || "";
+        if (!clientId && !clientSecret) {
             throw new ConnectError("clientId or clientSecret are required", Code.InvalidArgument);
         }
 
diff --git a/components/server/src/auth/auth-provider-service.ts b/components/server/src/auth/auth-provider-service.ts
index e75a977a92d2fa..b3d39583cb581b 100644
--- a/components/server/src/auth/auth-provider-service.ts
+++ b/components/server/src/auth/auth-provider-service.ts
@@ -227,9 +227,11 @@ export class AuthProviderService {
         if (!existing) {
             throw new ApplicationError(ErrorCodes.NOT_FOUND, "Provider resource not found.");
         }
-        const changed =
-            entry.clientId !== existing.oauth.clientId ||
-            (entry.clientSecret && entry.clientSecret !== existing.oauth.clientSecret);
+
+        // Explicitly check if any update needs to be performed
+        const changedId = entry.clientId && entry.clientId !== existing.oauth.clientId;
+        const changedSecret = entry.clientSecret && entry.clientSecret !== existing.oauth.clientSecret;
+        const changed = changedId || changedSecret;
 
         if (!changed) {
             return existing;