fix: testrepoconnect v2 w admin route (#1001)

Co-authored-by: Ferruh <63190600+ferruhcihan@users.noreply.github.com>

Author: dennisvankekem

src/api.authz.test.ts

@@ -772,15 +772,30 @@ describe('API authz tests', () => {
         .expect('Content-Type', /json/)
     })
 
-    test('team member can test code repository url', async () => {
-      jest.spyOn(otomiStack, 'getTestRepoConnect').mockResolvedValue({})
+    test('team member can test own code repository url', async () => {
+      jest.spyOn(otomiStack, 'getTestRepoConnect').mockResolvedValue({ status: 'success' })
+
       await agent
-        .get(`/v1/testRepoConnect`)
-        .query({ url: data.repositoryUrl })
+        .get(`/v2/teams/${teamId}/coderepos/testRepoConnect`)
+        .query({
+          url: data.repositoryUrl,
+        })
         .set('Authorization', `Bearer ${teamMemberToken}`)
         .expect(200)
     })
 
+    test('team member cannot test other team code repository url', async () => {
+      jest.spyOn(otomiStack, 'getTestRepoConnect').mockResolvedValue({ status: 'success' })
+
+      await agent
+        .get(`/v2/teams/${otherTeamId}/coderepos/testRepoConnect`)
+        .query({
+          url: data.repositoryUrl,
+        })
+        .set('Authorization', `Bearer ${teamMemberToken}`)
+        .expect(403)
+    })
+
     test('team member can get own internal repository urls', async () => {
       jest.spyOn(otomiStack, 'getInternalRepoUrls').mockResolvedValue([])
 

src/api/v1/testRepoConnect.ts

@@ -0,0 +1,20 @@
+import Debug from 'debug'
+import { Response } from 'express'
+import { OpenApiRequestExt } from 'src/otomi-models'
+
+const debug = Debug('otomi:api:v2:testRepoConnect')
+
+/**
+ * GET /v2/teams/{teamId}/coderepos/testRepoConnect
+ * Test repository connection
+ */
+export const getTestRepoConnect = async (req: OpenApiRequestExt, res: Response): Promise<void> => {
+  debug('getTestRepoConnect', { params: req.params, query: req.query })
+
+  const { teamId } = req.params as { teamId: string }
+  const { url, secretName } = req.query as { url: string; secretName?: string }
+
+  const result = await req.otomi.getTestRepoConnect(url, teamId, secretName || '')
+
+  res.json(result)
+}

src/api/v2/teams/{teamId}/coderepos/testRepoConnect.ts

@@ -0,0 +1,20 @@
+import Debug from 'debug'
+import { Response } from 'express'
+import { OpenApiRequestExt } from 'src/otomi-models'
+
+const debug = Debug('otomi:api:v2:testRepoConnect')
+
+/**
+ * GET /v2/testRepoConnectPlatform
+ * Test repository connection as platform admin
+ */
+export const getTestRepoConnectPlatform = async (req: OpenApiRequestExt, res: Response): Promise<void> => {
+  debug('testRepoConnectPlatform', req.query)
+
+  const { url, secret } = req.query as {
+    url: string
+    secret?: string
+  }
+
+  res.json(await req.otomi.getTestRepoConnect(url, 'admin', secret || ''))
+}

src/api/v2/testRepoConnectPlatform.ts

@@ -2721,26 +2721,50 @@ paths:
         '404':
           $ref: '#/components/responses/NotFound'
 
-  /v1/testRepoConnect:
+  /v2/testRepoConnectPlatform:
     get:
-      operationId: testRepoConnect
-      x-eov-operation-handler: v1/testRepoConnect
-      description: Get test repo connect information from the git providers.
+      operationId: getTestRepoConnectPlatform
+      x-eov-operation-handler: v2/testRepoConnectPlatform
+      description: Test repository connection as platform admin
       x-aclSchema: TestRepoConnect
       parameters:
         - name: url
           in: query
-          description: URL of the repository
+          required: true
           schema:
             type: string
-        - name: teamId
+        - name: secret
           in: query
-          description: Id of the team
           schema:
             type: string
-        - name: secret
+      responses:
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '200':
+          description: The request is successful.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TestRepoConnect'
+
+  /v2/teams/{teamId}/coderepos/testRepoConnect:
+    parameters:
+      - $ref: '#/components/parameters/teamParams'
+    get:
+      operationId: getTestRepoConnect
+      x-eov-operation-handler: v2/teams/{teamId}/coderepos/testRepoConnect
+      description: Test repository connection
+      x-aclSchema: CodeRepo
+      parameters:
+        - name: url
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: secretName
           in: query
-          description: Name of the secret for private repositories
           schema:
             type: string
       responses:

src/openapi/api.yaml

@@ -1,8 +1,6 @@
 TestRepoConnect:
   x-acl:
     platformAdmin: [read-any]
-    teamAdmin: [read-any]
-    teamMember: [read-any]
   properties:
     url:
       $ref: 'definitions.yaml#/url'