fixup: updateAuthProvider

Author: AlexTugarev

components/gitpod-protocol/src/gitpod-service.ts

@@ -104,7 +104,7 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     /** @deprecated used for public-api compatibility only */
     deleteAuthProvider(id: string): Promise<void>;
     /** @deprecated used for public-api compatibility only */
-    updateAuthProvider(id: string, update: AuthProviderEntry.UpdateEntry): Promise<AuthProviderEntry>;
+    updateAuthProvider(id: string, update: AuthProviderEntry.UpdateOAuth2Config): Promise<AuthProviderEntry>;
 
     // Query/retrieve workspaces
     getWorkspaces(options: GitpodServer.GetWorkspacesOptions): Promise<WorkspaceInfo[]>;

components/gitpod-protocol/src/protocol.ts

@@ -1588,6 +1588,7 @@ export namespace AuthProviderEntry {
         clientSecret: string;
         organizationId: string;
     };
+    export type UpdateOAuth2Config = Pick<OAuth2Config, "clientId" | "clientSecret">;
     export function redact(entry: AuthProviderEntry): AuthProviderEntry {
         return {
             ...entry,

components/server/src/workspace/gitpod-server-impl.ts

@@ -3154,7 +3154,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     async updateAuthProvider(
         ctx: TraceContextWithSpan,
         id: string,
-        entry: AuthProviderEntry.UpdateEntry,
+        update: AuthProviderEntry.UpdateOAuth2Config,
     ): Promise<AuthProviderEntry> {
         traceAPIParams(ctx, { id });
 
@@ -3167,10 +3167,22 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
         if (authProvider.organizationId) {
             return this.updateOrgAuthProvider(ctx, {
-                entry: { ...entry, organizationId: authProvider.organizationId },
+                entry: {
+                    organizationId: authProvider.organizationId,
+                    id: authProvider.id,
+                    clientId: update.clientId,
+                    clientSecret: update.clientSecret,
+                },
             });
         } else {
-            return this.updateOwnAuthProvider(ctx, { entry });
+            return this.updateOwnAuthProvider(ctx, {
+                entry: {
+                    id: authProvider.id,
+                    clientId: update.clientId,
+                    clientSecret: update.clientSecret,
+                    ownerId: user.id,
+                },
+            });
         }
     }