Handle error at removing Device Auth token

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
che-incubator · Oct 25, 2023 · e74d10e · e74d10e
1 parent 6e2d799
commit e74d10e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/code/extensions/che-api/src/impl/github-service-impl.ts b/code/extensions/che-api/src/impl/github-service-impl.ts
@@ -109,7 +109,7 @@ export class GithubServiceImpl implements GithubService {
     const deviceAuthSecrets = await this.k8sService.getSecret(DEVICE_AUTHENTICATION_LABEL_SELECTOR);
     if (deviceAuthSecrets.length < 1) {
       this.logger.warn('Github Service: device-authentication secret not found');
-      return;
+      throw new Error('device-authentication secret not found');
     }
 
     for (const secret of deviceAuthSecrets) {

diff --git a/code/extensions/che-github-authentication/src/device-authentication.ts b/code/extensions/che-github-authentication/src/device-authentication.ts
@@ -64,7 +64,15 @@ export class DeviceAuthentication {
   }
 
   async removeDeviceAuthToken(): Promise<void> {
-    return this.githubService.removeDeviceAuthToken();
+    try {
+      await this.githubService.removeDeviceAuthToken();
+      const message = 'The token was deleted successfully. Some operations may require Github Sign Out => Sign In to use another token.'
+      vscode.window.showInformationMessage(message);
+    } catch (error) {
+      const message = `Can not remove Device Authentication token: ${error.message}`;
+      vscode.window.showErrorMessage(message);
+    }
+
   }
 
   private async onTokenGenerated(scopes: string): Promise<void> {