test removing axios

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Author: RomanNikitenko

code/extensions/che-api/package-lock.json

@@ -31,23 +31,22 @@
   },
   "dependencies": {
     "@devfile/api": "^2.3.0-1738854228",
-    "axios": "^1.13.5",
+    "@eclipse-che/workspace-telemetry-client": "^0.0.1-1685523760",
     "@kubernetes/client-node": "^1.4.0",
     "fs-extra": "^11.2.0",
     "inversify": "^6.0.2",
     "js-yaml": "^4.1.0",
     "reflect-metadata": "^0.2.2",
-    "vscode-nls": "^5.0.0",
-    "@eclipse-che/workspace-telemetry-client": "^0.0.1-1685523760"
+    "vscode-nls": "^5.0.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.5.0",
     "@types/js-yaml": "^4.0.5",
     "@types/node": "22.x",
     "jest": "29.7.0",
-    "typescript": "^5.9.2",
     "ts-jest": "29.4.5",
+    "typescript": "^5.9.2",
     "webpack-node-externals": "^3.0.0"
   },
   "overrides": {

code/extensions/che-api/package.json

@@ -30,7 +30,6 @@ import { GithubService } from './api/github-service';
 import { GithubServiceImpl } from './impl/github-service-impl';
 import { TelemetryService } from './api/telemetry-service';
 import { K8sTelemetryServiceImpl } from './impl/k8s-telemetry-service-impl';
-import * as axios from 'axios';
 import { Logger } from './logger';
 
 
@@ -43,7 +42,6 @@ export async function activate(_extensionContext: vscode.ExtensionContext): Prom
     container.bind(K8SServiceImpl).toSelf().inSingletonScope();
     container.bind(K8SService).to(K8SServiceImpl).inSingletonScope();
     container.bind(K8sDevWorkspaceEnvVariables).toSelf().inSingletonScope();
-    container.bind(Symbol.for('AxiosInstance')).toConstantValue(axios);
     container.bind(GithubServiceImpl).toSelf().inSingletonScope();
     container.bind(GithubService).to(GithubServiceImpl).inSingletonScope();
     container.bind(TelemetryService).to(K8sTelemetryServiceImpl).inSingletonScope();

code/extensions/che-api/src/extension.ts

@@ -11,7 +11,6 @@
 /* eslint-disable header/header */
 
 import * as k8s from '@kubernetes/client-node';
-import { AxiosInstance } from 'axios';
 import * as fs from 'fs-extra';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
@@ -39,8 +38,7 @@ export class GithubServiceImpl implements GithubService {
 
   constructor(
     @inject(Logger) private logger: Logger,
-    @inject(K8SServiceImpl) private readonly k8sService: K8SServiceImpl,
-    @inject(Symbol.for('AxiosInstance')) private readonly axiosInstance: AxiosInstance
+    @inject(K8SServiceImpl) private readonly k8sService: K8SServiceImpl
   ) {
     this.initializeToken();
   }
@@ -58,18 +56,31 @@ export class GithubServiceImpl implements GithubService {
 
   async getUser(): Promise<GithubUser> {
     this.checkToken();
-    const result = await this.axiosInstance.get<GithubUser>('https://api.github.com/user', {
-      headers: { Authorization: `Bearer ${this.token}` },
-    });
-    return result.data;
+    const result = await this.fetchGithubUser(this.token!);
+    return result.user;
   }
 
   async getTokenScopes(token: string): Promise<string[]> {
     this.checkToken();
-    const result = await this.axiosInstance.get<GithubUser>('https://api.github.com/user', {
+    const result = await this.fetchGithubUser(token);
+    return result.scopes;
+  }
+
+  private async fetchGithubUser(token: string): Promise<{ user: GithubUser; scopes: string[] }> {
+    const response = await fetch('https://api.github.com/user', {
       headers: { Authorization: `Bearer ${token}` },
     });
-    return result.headers['x-oauth-scopes'].split(', ');
+    if (!response.ok) {
+      const message = await response.text();
+      throw new Error(`GitHub user request failed: ${response.status} ${response.statusText} - ${message}`);
+    }
+    const user = await response.json() as GithubUser;
+    const scopesHeader = response.headers.get('x-oauth-scopes') ?? '';
+    const scopes = scopesHeader
+      .split(', ')
+      .map(scope => scope.trim())
+      .filter(scope => scope.length > 0);
+    return { user, scopes };
   }
 
   async persistDeviceAuthToken(token: string): Promise<void> {

code/extensions/che-api/src/impl/github-service-impl.ts

@@ -12,7 +12,6 @@
 
 import * as k8s from '@kubernetes/client-node';
 import { inject, injectable } from 'inversify';
-import { AxiosInstance } from "axios";
 import { K8SServiceImpl } from './k8s-service-impl';
 import { K8sDevWorkspaceEnvVariables } from './k8s-devworkspace-env-variables';
 import { WorkspaceService } from '../api/workspace-service';
@@ -25,9 +24,6 @@ export class K8sWorkspaceServiceImpl implements WorkspaceService {
   @inject(K8sDevWorkspaceEnvVariables)
   private env!: K8sDevWorkspaceEnvVariables;
 
-  @inject(Symbol.for('AxiosInstance'))
-  private axiosInstance!: AxiosInstance;
-
   public async getNamespace(): Promise<string> {
     return this.env.getWorkspaceNamespace();
   }
@@ -54,7 +50,11 @@ export class K8sWorkspaceServiceImpl implements WorkspaceService {
     }
 
     const requestUrl = `http://127.0.0.1:${process.env.MACHINE_EXEC_PORT}/activity/tick`;
-    await this.axiosInstance.post(requestUrl);
+    const response = await fetch(requestUrl, { method: 'POST' });
+    if (!response.ok) {
+      const message = await response.text();
+      throw new Error(`Activity tick request failed: ${response.status} ${response.statusText} - ${message}`);
+    }
   }
 
   // stopping the workspace is changing the started state to false