feat(lightspeed): Fix API reports, SonarQube warnings

Assisted-by: Claude Opus 4.6

Generated-by: Cursor
Signed-off-by: Maysun J Faisal <maysunaneek@gmail.com>
Made-with: Cursor

Author: maysunfaisal

workspaces/lightspeed/plugins/lightspeed-backend/__fixtures__/lcsHandlers.ts

@@ -244,19 +244,19 @@ export const lcsHandlers: HttpHandler[] = [
       servers: [
         {
           name: 'static-mcp',
-          url: 'http://mock-mcp-server:9999',
+          url: 'https://mock-mcp-server:9999',
           provider_id: 'model-context-protocol',
           source: 'config',
         },
         {
           name: 'no-token-server',
-          url: 'http://mock-mcp-server:9999',
+          url: 'https://mock-mcp-server:9999',
           provider_id: 'model-context-protocol',
           source: 'config',
         },
         {
           name: 'lcs-only-server',
-          url: 'http://mock-mcp-server:9999',
+          url: 'https://mock-mcp-server:9999',
           provider_id: 'model-context-protocol',
           source: 'api',
         },

workspaces/lightspeed/plugins/lightspeed-backend/__fixtures__/mcpHandlers.ts

@@ -16,7 +16,7 @@
 
 import { http, HttpResponse, type HttpHandler } from 'msw';
 
-export const MOCK_MCP_ADDR = 'http://mock-mcp-server:9999';
+export const MOCK_MCP_ADDR = 'https://mock-mcp-server:9999';
 export const MOCK_MCP_VALID_TOKEN = 'valid-mcp-token';
 
 const MOCK_TOOLS = [

workspaces/lightspeed/plugins/lightspeed-backend/report.api.md

@@ -6,6 +6,7 @@
 
 import { BackendFeature } from '@backstage/backend-plugin-api';
 import type { Config } from '@backstage/config';
+import type { DatabaseService } from '@backstage/backend-plugin-api';
 import express from 'express';
 import type { HttpAuthService } from '@backstage/backend-plugin-api';
 import type { LoggerService } from '@backstage/backend-plugin-api';
@@ -19,10 +20,52 @@ export function createRouter(options: RouterOptions): Promise<express.Router>;
 const lightspeedPlugin: BackendFeature;
 export default lightspeedPlugin;
 
+// @public
+export interface McpServerResponse {
+    // (undocumented)
+    enabled: boolean;
+    // (undocumented)
+    hasToken: boolean;
+    // (undocumented)
+    hasUserToken: boolean;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    status: McpServerStatus;
+    // (undocumented)
+    toolCount: number;
+    // (undocumented)
+    url?: string;
+}
+
+// @public (undocumented)
+export type McpServerStatus = 'connected' | 'error' | 'unknown';
+
+// @public (undocumented)
+export interface McpToolInfo {
+    // (undocumented)
+    description: string;
+    // (undocumented)
+    name: string;
+}
+
+// @public (undocumented)
+export interface McpValidationResult {
+    // (undocumented)
+    error?: string;
+    // (undocumented)
+    toolCount: number;
+    // (undocumented)
+    tools: McpToolInfo[];
+    // (undocumented)
+    valid: boolean;
+}
+
 // @public
 export type RouterOptions = {
     logger: LoggerService;
     config: Config;
+    database: DatabaseService;
     httpAuth: HttpAuthService;
     userInfo: UserInfoService;
     permissions: PermissionsService;

workspaces/lightspeed/plugins/lightspeed-backend/src/service/mcp-server-types.ts

@@ -27,23 +27,36 @@ export interface McpUserSettingsRow {
   updated_at: string;
 }
 
+/**
+ * @public
+ */
 export type McpServerStatus = 'connected' | 'error' | 'unknown';
 
-/** Public-facing response for an MCP server with user settings merged. */
+/**
+ * Public-facing response for an MCP server with user settings merged.
+ * @public
+ */
 export interface McpServerResponse {
   name: string;
   url?: string;
   enabled: boolean;
   status: McpServerStatus;
   toolCount: number;
   hasToken: boolean;
+  hasUserToken: boolean;
 }
 
+/**
+ * @public
+ */
 export interface McpToolInfo {
   name: string;
   description: string;
 }
 
+/**
+ * @public
+ */
 export interface McpValidationResult {
   valid: boolean;
   toolCount: number;

workspaces/lightspeed/plugins/lightspeed-backend/src/service/mcp-server.test.ts

@@ -162,6 +162,7 @@ describe('MCP server management endpoints', () => {
         status: 'unknown',
         toolCount: 0,
         hasToken: true,
+        hasUserToken: false,
       });
     });
 
@@ -178,11 +179,35 @@ describe('MCP server management endpoints', () => {
         (s: any) => s.name === 'no-token-server',
       );
       expect(noTokenServer.hasToken).toBe(false);
+      expect(noTokenServer.hasUserToken).toBe(false);
 
       const withTokenServer = response.body.servers.find(
         (s: any) => s.name === 'static-mcp',
       );
       expect(withTokenServer.hasToken).toBe(true);
+      expect(withTokenServer.hasUserToken).toBe(false);
+    });
+
+    it('distinguishes admin token from user token via hasUserToken', async () => {
+      const backendServer = await startBackendServer(MCP_CONFIG);
+
+      // Before user sets a token: admin token exists, no user token
+      let response = await request(backendServer).get(
+        '/api/lightspeed/mcp-servers',
+      );
+      expect(response.body.servers[0].hasToken).toBe(true);
+      expect(response.body.servers[0].hasUserToken).toBe(false);
+
+      // After user sets a personal token: both should be true
+      await request(backendServer)
+        .patch('/api/lightspeed/mcp-servers/static-mcp')
+        .send({ token: 'my-personal-token' });
+
+      response = await request(backendServer).get(
+        '/api/lightspeed/mcp-servers',
+      );
+      expect(response.body.servers[0].hasToken).toBe(true);
+      expect(response.body.servers[0].hasUserToken).toBe(true);
     });
 
     it('reflects user settings after PATCH', async () => {
@@ -251,6 +276,7 @@ describe('MCP server management endpoints', () => {
       expect(patchRes.status).toBe(200);
       expect(patchRes.body.server.status).toBe('connected');
       expect(patchRes.body.server.hasToken).toBe(true);
+      expect(patchRes.body.server.hasUserToken).toBe(true);
       expect(patchRes.body.validation).toBeDefined();
       expect(patchRes.body.validation.valid).toBe(true);
       expect(patchRes.body.validation.toolCount).toBe(3);
@@ -292,6 +318,7 @@ describe('MCP server management endpoints', () => {
       expect(clearRes.status).toBe(200);
       expect(clearRes.body.server.status).toBe('unknown');
       expect(clearRes.body.server.toolCount).toBe(0);
+      expect(clearRes.body.server.hasUserToken).toBe(false);
     });
 
     it('returns 400 when no fields provided', async () => {
@@ -356,7 +383,7 @@ describe('MCP server management endpoints', () => {
       const backendServer = await startBackendServer(MCP_CONFIG);
       const response = await request(backendServer)
         .post('/api/lightspeed/mcp-servers/validate')
-        .send({ url: 'http://internal-service:1234', token: 'some-token' });
+        .send({ url: 'https://internal-service:1234', token: 'some-token' });
 
       expect(response.status).toBe(400);
       expect(response.body.error).toContain('URL not recognized');

workspaces/lightspeed/plugins/lightspeed-backend/src/service/router.ts

@@ -195,6 +195,7 @@ export async function createRouter(
           status: setting?.status ?? 'unknown',
           toolCount: setting?.tool_count ?? 0,
           hasToken: !!(setting?.token || server.token),
+          hasUserToken: !!setting?.token,
         };
       });
 
@@ -371,6 +372,7 @@ export async function createRouter(
           status: setting.status,
           toolCount: setting.tool_count,
           hasToken: !!(setting.token || server.token),
+          hasUserToken: !!setting.token,
         },
       };
       if (validation) result.validation = validation;

workspaces/lightspeed/plugins/lightspeed-common/report.api.md

@@ -18,6 +18,12 @@ export const lightspeedChatReadPermission: BasicPermission;
 // @public
 export const lightspeedChatUpdatePermission: BasicPermission;
 
+// @public
+export const lightspeedMcpManagePermission: BasicPermission;
+
+// @public
+export const lightspeedMcpReadPermission: BasicPermission;
+
 // @public
 export const lightspeedNotebooksUsePermission: BasicPermission;