fix(backend): restore user OAuth token injection in workspace terminals (CRW-11193) (#1606)

* fix(backend): add polling fallback in PostStartInjector

If the Kubernetes Watch fails to start, fall back to polling the
DevWorkspace via GET every 10 s for up to 300 s. Inject on Running;
stop without injection on Failed, Failing, Stopped, Stopping, or
Terminating. While polling is active the workspace key remains in
activeWatches to prevent duplicate start attempts.

Fixes: CRW-11193

Assisted-by: Claude Sonnet 4.6
Signed-off-by: Oleksii Orel <oorel@redhat.com>

* refactor(backend): reuse watchInNamespace in PostStartInjector

Replace the standalone k8s.Watch in PostStartInjector with
devworkspaceApi.watchInNamespace() — the same code path used by the
WebSocket SUBSCRIBE DEV_WORKSPACE channel. Benefits:

- No separate watch infrastructure; reuses existing DevWorkspace service
- User OAuth token for both watch and polling (passed via devworkspaceApi)
- stopWatching() called after injection (clean unsubscribe)
- Shared injectCredentials() helper removes duplication between
  watch-path and polling-fallback

Fixes: CRW-11193

Assisted-by: Claude Sonnet 4.6
Signed-off-by: Oleksii Orel <oorel@redhat.com>

* test(common): cover DevWorkspaceStatus re-export getter to fix 100% function coverage (CRW-11193)

The export { DevWorkspaceStatus } from './dto/api' in src/index.ts compiles
to an Object.defineProperty getter that Istanbul counts as a function. The
existing test never accessed DevWorkspaceStatus via the package index, leaving
that getter uncovered and dropping function coverage to 96% (24/25), which
failed the 100% threshold enforced by jest config.

Assisted-by: Claude Sonnet 4.6
Signed-off-by: Oleksii Orel <oorel@redhat.com>

---------

Signed-off-by: Oleksii Orel <oorel@redhat.com>

Author: olexii4

packages/common/src/__tests__/index.spec.ts

@@ -10,11 +10,16 @@
  *   Red Hat, Inc. - initial API and implementation
  */
 
-import common from '../';
+import common, { DevWorkspaceStatus } from '../';
 
 describe('Common', () => {
   it('should export all shared code', () => {
     expect(common).toBeDefined();
     expect(common.helpers).toBeDefined();
   });
+
+  it('should export DevWorkspaceStatus', () => {
+    expect(DevWorkspaceStatus).toBeDefined();
+    expect(DevWorkspaceStatus.RUNNING).toBe('Running');
+  });
 });

packages/common/src/dto/api/index.ts

@@ -222,6 +222,16 @@ export type IEditors = Array<V230Devfile>;
 export type IEventList = CoreV1EventList;
 export type IPodList = V1PodList;
 
+export enum DevWorkspaceStatus {
+  FAILED = 'Failed',
+  FAILING = 'Failing',
+  STARTING = 'Starting',
+  TERMINATING = 'Terminating',
+  RUNNING = 'Running',
+  STOPPED = 'Stopped',
+  STOPPING = 'Stopping',
+}
+
 export interface IDevWorkspaceList {
   apiVersion?: string;
   kind?: string;

packages/common/src/index.ts

@@ -17,6 +17,7 @@ export * from './dto/cluster-info';
 export * from './dto/cluster-config';
 export * from './types';
 export * from './constants';
+export { DevWorkspaceStatus } from './dto/api';
 
 export { helpers, api };
 

packages/dashboard-backend/src/routes/api/__tests__/devworkspaces.spec.ts

@@ -80,9 +80,9 @@ describe('DevWorkspaces Routes', () => {
 
     const { PostStartInjector } = jest.requireMock('@/services/PostStartInjector');
     expect(PostStartInjector.watchAndInject).toHaveBeenCalledWith(
-      expect.any(Object),
       namespace,
       workspaceName,
+      expect.objectContaining({ watchInNamespace: expect.any(Function) }),
       expect.objectContaining({ injectKubeConfig: expect.any(Function) }),
       expect.objectContaining({ podmanLogin: expect.any(Function) }),
     );
@@ -132,9 +132,9 @@ describe('DevWorkspaces Routes', () => {
 
     const { PostStartInjector } = jest.requireMock('@/services/PostStartInjector');
     expect(PostStartInjector.watchAndInject).toHaveBeenCalledWith(
-      expect.any(Object),
       namespace,
       workspaceName,
+      expect.objectContaining({ watchInNamespace: expect.any(Function) }),
       expect.objectContaining({ injectKubeConfig: expect.any(Function) }),
       expect.objectContaining({ podmanLogin: expect.any(Function) }),
     );

packages/dashboard-backend/src/routes/api/devworkspaces.ts

@@ -21,7 +21,7 @@ import {
   namespacedWorkspaceSchema,
 } from '@/constants/schemas';
 import { restParams } from '@/models';
-import { getDevWorkspaceClient, getKubeConfig } from '@/routes/api/helpers/getDevWorkspaceClient';
+import { getDevWorkspaceClient } from '@/routes/api/helpers/getDevWorkspaceClient';
 import { getToken } from '@/routes/api/helpers/getToken';
 import { getSchema } from '@/services/helpers';
 import { PostStartInjector } from '@/services/PostStartInjector';
@@ -68,11 +68,14 @@ export function registerDevworkspacesRoutes(instance: FastifyInstance) {
         // PATCH /spec/started=true (restart), missing first-time creation.
         const workspaceName = devWorkspace.metadata?.name;
         if (devworkspace.spec?.started === true && workspaceName) {
-          const kc = getKubeConfig(token);
+          // Pass a fresh devworkspaceApi instance (DevWorkspaceClient.devworkspaceApi is a
+          // getter — each access returns a new DevWorkspaceApiService). PostStartInjector
+          // calls stopWatching() on this instance when done; passing the same instance that
+          // the route already used for .create() would cancel the route's own watch.
           PostStartInjector.watchAndInject(
-            kc,
             namespace,
             workspaceName,
+            dwClient.devworkspaceApi,
             dwClient.kubeConfigApi,
             dwClient.podmanApi,
           );
@@ -111,11 +114,11 @@ export function registerDevworkspacesRoutes(instance: FastifyInstance) {
 
         const isStarting = patch.some(p => p.path === '/spec/started' && p.value === true);
         if (isStarting) {
-          const kc = getKubeConfig(token);
+          // See comment above — pass a fresh devworkspaceApi instance.
           PostStartInjector.watchAndInject(
-            kc,
             namespace,
             workspaceName,
+            dwClient.devworkspaceApi,
             dwClient.kubeConfigApi,
             dwClient.podmanApi,
           );

packages/dashboard-backend/src/routes/api/helpers/__mocks__/getDevWorkspaceClient.ts

@@ -240,6 +240,8 @@ export const getDevWorkspaceClient = jest.fn(
         listInNamespace: _namespace => Promise.resolve(stubDevWorkspacesList),
         patch: (_namespace, _name, _patches) =>
           Promise.resolve({ devWorkspace: stubDevWorkspace, headers: stubHeaders }),
+        watchInNamespace: (_listener, _params) => Promise.resolve(),
+        stopWatching: () => undefined,
       } as IDevWorkspaceApi,
       dockerConfigApi: {
         read: _namespace => Promise.resolve(stubDockerConfig),