[db] userById fails on undefined

Author: svenefftinge

components/gitpod-db/src/typeorm/user-db-impl.ts

@@ -49,6 +49,7 @@ import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 import { DataCache } from "../data-cache";
 import { TransactionalDBImpl } from "./transactional-db-impl";
 import { TypeORM } from "./typeorm";
+import { ApplicationError, ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 
 // OAuth token expiry
 const tokenExpiryInFuture = new DateInterval("7d");
@@ -132,6 +133,9 @@ export class TypeORMUserDBImpl extends TransactionalDBImpl<UserDB> implements Us
     }
 
     public async findUserById(id: string): Promise<MaybeUser> {
+        if (!id) {
+            throw new ApplicationError(ErrorCodes.BAD_REQUEST, "Cannot find user without id");
+        }
         return this.cache.get(getUserCacheKey(id), async () => {
             const userRepo = await this.getUserRepo();
             const result = await userRepo.findOne(id);

components/gitpod-db/src/user-db.spec.db.ts

@@ -97,6 +97,31 @@ class UserDBSpec {
         expect(dbResult).to.deep.include(user);
     }
 
+    @test(timeout(10000))
+    public async findUserById() {
+        const user = await this.db.newUser();
+        user.identities.push(this.IDENTITY1);
+        await this.db.storeUser(user);
+
+        const foundUser = await this.db.findUserById(user.id);
+        expect(foundUser!.id).to.eq(user.id);
+    }
+
+    @test(timeout(10000))
+    public async findUserById_undefined() {
+        const user = await this.db.newUser();
+        user.identities.push(this.IDENTITY1);
+        await this.db.storeUser(user);
+
+        try {
+            await this.db.findUserById(undefined!);
+        } catch (error) {
+            // expected
+            return;
+        }
+        expect.fail("Should have failed");
+    }
+
     @test(timeout(10000))
     public async findUsersByEmail_multiple_users_identities() {
         let user1 = await this.db.newUser();