💄

gitpod-io · Nov 22, 2023 · 6f0aa70 · 6f0aa70
1 parent f2cc974
commit 6f0aa70
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/components/dashboard/src/data/setup.tsx b/components/dashboard/src/data/setup.tsx
@@ -30,7 +30,7 @@ import * as SSHClasses from "@gitpod/public-api/lib/gitpod/v1/ssh_pb";
 // This is used to version the cache
 // If data we cache changes in a non-backwards compatible way, increment this version
 // That will bust any previous cache versions a client may have stored
-const CACHE_VERSION = "7";
+const CACHE_VERSION = "8";
 
 export function noPersistence(queryKey: QueryKey): QueryKey {
     return [...queryKey, "no-persistence"];

diff --git a/components/dashboard/src/service/json-rpc-ssh-client.ts b/components/dashboard/src/service/json-rpc-ssh-client.ts
@@ -46,7 +46,7 @@ export class JsonRpcSSHClient implements PromiseClient<typeof SSHService> {
             throw new ApplicationError(ErrorCodes.BAD_REQUEST, "sshKeyId is required");
         }
 
-        await getGitpodService().server.deleteSSHPublicKey(eq.sshKeyId);
+        await getGitpodService().server.deleteSSHPublicKey(req.sshKeyId);
 
         const response = new DeleteSSHPublicKeyResponse();
         return response;

diff --git a/components/server/src/api/ssh-service-api.ts b/components/server/src/api/ssh-service-api.ts
@@ -38,6 +38,13 @@ export class SSHServiceAPI implements ServiceImpl<typeof SSHServiceInterface> {
     }
 
     async createSSHPublicKey(req: CreateSSHPublicKeyRequest, _: HandlerContext): Promise<CreateSSHPublicKeyResponse> {
+        if (!req.name) {
+            throw new ApplicationError(ErrorCodes.BAD_REQUEST, "name is required");
+        }
+        if (!req.key) {
+            throw new ApplicationError(ErrorCodes.BAD_REQUEST, "key is required");
+        }
+
         const response = new CreateSSHPublicKeyResponse();
 
         const result = await this.sshKeyService.addSSHPublicKey(ctxUserId(), ctxUserId(), {