make getClientId work with user owned templates

Author: alexnuttall

lambdas/backend-api/src/__tests__/templates/infra/template-repository.test.ts

@@ -1599,6 +1599,22 @@ describe('templateRepository', () => {
       expect(owner).toEqual('template-owner');
     });
 
+    it('gets clientId when template is user-owned', async () => {
+      const { templateRepository, mocks } = setup();
+
+      mocks.ddbDocClient.on(QueryCommand).resolves({
+        Items: [
+          {
+            owner: 'user-owner',
+          },
+        ],
+      });
+
+      const owner = await templateRepository.getClientId('template-id');
+
+      expect(owner).toEqual('user-owner');
+    });
+
     it('errors when owner cannot be found', async () => {
       const { templateRepository, mocks } = setup();
 

lambdas/backend-api/src/templates/infra/template-repository.ts

@@ -770,7 +770,9 @@ export class TemplateRepository {
   }
 
   private stripClientPrefix(owner: string) {
-    return owner.slice(this.clientOwnerPrefix.length);
+    return owner.startsWith(this.clientOwnerPrefix)
+      ? owner.slice(this.clientOwnerPrefix.length)
+      : owner;
   }
 
   private clientOwnerKey(clientId: string) {