@codingame/monaco-vscode-authentication-service-override 17.2.0 → 18.0.0

package/index.js

@@ -8,13 +8,16 @@ import { AuthenticationUsageService } from './vscode/src/vs/workbench/services/a
 import { AuthenticationExtensionsService } from './vscode/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.js';
 import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
 import { IAuthenticationUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
+import { IDynamicAuthenticationProviderStorageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service';
+import { DynamicAuthenticationProviderStorageService } from './vscode/src/vs/workbench/services/authentication/browser/dynamicAuthenticationProviderStorageService.js';
 
 function getServiceOverride() {
     return {
         [IAuthenticationService.toString()]: new SyncDescriptor(AuthenticationService, [], true),
         [IAuthenticationAccessService.toString()]: new SyncDescriptor(AuthenticationAccessService, [], true),
         [IAuthenticationExtensionsService.toString()]: new SyncDescriptor(AuthenticationExtensionsService, [], true),
-        [IAuthenticationUsageService.toString()]: new SyncDescriptor(AuthenticationUsageService, [], true)
+        [IAuthenticationUsageService.toString()]: new SyncDescriptor(AuthenticationUsageService, [], true),
+        [IDynamicAuthenticationProviderStorageService.toString()]: new SyncDescriptor(DynamicAuthenticationProviderStorageService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-authentication-service-override",
-  "version": "17.2.0",
+  "version": "18.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - authentication service-override",
   "keywords": [],
@@ -15,9 +15,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "17.2.0",
-    "@codingame/monaco-vscode-api": "17.2.0",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "17.2.0"
+    "@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "18.0.0",
+    "@codingame/monaco-vscode-api": "18.0.0",
+    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "18.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/services/authentication/browser/authenticationExtensionsService.js

@@ -10,7 +10,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/noti
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { NumberBadge } from '@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common/vscode/vs/workbench/services/activity/common/activity';
+import { NumberBadge } from '@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common/vscode/vs/workbench/services/activity/common/activity';
 import { IActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/activity/common/activity.service';
 import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
 import { IAuthenticationUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationUsageService.service';
@@ -112,7 +112,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             numberOfRequests += ( Object.keys(accessRequest)).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(12036, "Sign in requested"))));
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(12304, "Sign in requested"))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({ badge });
         }
     }
@@ -179,7 +179,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
         const { result } = await this.dialogService.prompt({
             type: Severity.Info,
             message: ( localize(
-                12037,
+                12305,
                 "The extension '{0}' wants to access the {1} account '{2}'.",
                 extensionName,
                 provider.label,
@@ -187,11 +187,11 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             )),
             buttons: [
                 {
-                    label: ( localize(12038, "&&Allow")),
+                    label: ( localize(12306, "&&Allow")),
                     run: () => SessionPromptChoice.Allow
                 },
                 {
-                    label: ( localize(12039, "&&Deny")),
+                    label: ( localize(12307, "&&Deny")),
                     run: () => SessionPromptChoice.Deny
                 }
             ],
@@ -227,16 +227,16 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
                 items.push({ label: account.label, account });
             }
         });
-        items.push({ label: ( localize(12040, "Sign in to another account")) });
+        items.push({ label: ( localize(12308, "Sign in to another account")) });
         quickPick.items = items;
         quickPick.title = ( localize(
-            12041,
+            12309,
             "The extension '{0}' wants to access a {1} account",
             extensionName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            12042,
+            12310,
             "Select an account for '{0}' to use or Esc to cancel",
             extensionName
         ));
@@ -308,7 +308,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '3_accessRequests',
             command: {
                 id: `${providerId}${extensionId}Access`,
-                title: ( localize(12043, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
+                title: ( localize(12311, "Grant access to {0} for {1}... (1)", provider.label, extensionName))
             }
         }));
         const accessCommand = CommandsRegistry.registerCommand({
@@ -352,7 +352,7 @@ let AuthenticationExtensionsService = class AuthenticationExtensionsService exte
             group: '2_signInRequests',
             command: {
                 id: commandId,
-                title: ( localize(12044, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
+                title: ( localize(12312, "Sign in with {0} to use {1} (1)", provider.label, extensionName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({

package/vscode/src/vs/workbench/services/authentication/browser/dynamicAuthenticationProviderStorageService.d.ts

@@ -0,0 +1,31 @@
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { DynamicAuthenticationProviderInfo, DynamicAuthenticationProviderTokensChangeEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage";
+import { IDynamicAuthenticationProviderStorageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service";
+import { ISecretStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service";
+import { IAuthorizationTokenResponse } from "@codingame/monaco-vscode-api/vscode/vs/base/common/oauth";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+export declare class DynamicAuthenticationProviderStorageService extends Disposable implements IDynamicAuthenticationProviderStorageService {
+    private readonly storageService;
+    private readonly secretStorageService;
+    private readonly logService;
+    readonly _serviceBrand: undefined;
+    private static readonly PROVIDERS_STORAGE_KEY;
+    private readonly _onDidChangeTokens;
+    readonly onDidChangeTokens: Event<DynamicAuthenticationProviderTokensChangeEvent>;
+    constructor(storageService: IStorageService, secretStorageService: ISecretStorageService, logService: ILogService);
+    getClientId(providerId: string): string | undefined;
+    storeClientId(providerId: string, authorizationServer: string, clientId: string, label?: string): void;
+    private _trackProvider;
+    private _getStoredProviders;
+    private _storeProviders;
+    getInteractedProviders(): ReadonlyArray<DynamicAuthenticationProviderInfo>;
+    removeDynamicProvider(providerId: string): Promise<void>;
+    getSessionsForDynamicAuthProvider(authProviderId: string, clientId: string): Promise<(IAuthorizationTokenResponse & {
+        created_at: number;
+    })[] | undefined>;
+    setSessionsForDynamicAuthProvider(authProviderId: string, clientId: string, sessions: (IAuthorizationTokenResponse & {
+        created_at: number;
+    })[]): Promise<void>;
+}

package/vscode/src/vs/workbench/services/authentication/browser/dynamicAuthenticationProviderStorageService.js

@@ -0,0 +1,136 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ISecretStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/secrets/common/secrets.service';
+import { isAuthorizationTokenResponse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/oauth';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Queue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+
+var DynamicAuthenticationProviderStorageService_1;
+let DynamicAuthenticationProviderStorageService = class DynamicAuthenticationProviderStorageService extends Disposable {
+    static { DynamicAuthenticationProviderStorageService_1 = this; }
+    static { this.PROVIDERS_STORAGE_KEY = 'dynamicAuthProviders'; }
+    constructor(storageService, secretStorageService, logService) {
+        super();
+        this.storageService = storageService;
+        this.secretStorageService = secretStorageService;
+        this.logService = logService;
+        this._onDidChangeTokens = this._register(( new Emitter()));
+        this.onDidChangeTokens = this._onDidChangeTokens.event;
+        const queue = ( new Queue());
+        this._register(this.secretStorageService.onDidChangeSecret(async (key) => {
+            let payload;
+            try {
+                payload = JSON.parse(key);
+            }
+            catch (error) {
+            }
+            if (payload?.isDynamicAuthProvider) {
+                void queue.queue(async () => {
+                    const tokens = await this.getSessionsForDynamicAuthProvider(payload.authProviderId, payload.clientId);
+                    this._onDidChangeTokens.fire({
+                        authProviderId: payload.authProviderId,
+                        clientId: payload.clientId,
+                        tokens
+                    });
+                });
+            }
+        }));
+    }
+    getClientId(providerId) {
+        const providers = this._getStoredProviders();
+        const provider = providers.find(p => p.providerId === providerId);
+        return provider?.clientId;
+    }
+    storeClientId(providerId, authorizationServer, clientId, label) {
+        this._trackProvider(providerId, authorizationServer, clientId, label);
+    }
+    _trackProvider(providerId, authorizationServer, clientId, label) {
+        const providers = this._getStoredProviders();
+        const existingProviderIndex = providers.findIndex(p => p.providerId === providerId);
+        if (existingProviderIndex === -1) {
+            const newProvider = {
+                providerId,
+                label: label || providerId,
+                authorizationServer,
+                clientId
+            };
+            providers.push(newProvider);
+            this._storeProviders(providers);
+        }
+        else {
+            const existingProvider = providers[existingProviderIndex];
+            const updatedProvider = {
+                providerId,
+                label: label || existingProvider.label,
+                authorizationServer,
+                clientId
+            };
+            providers[existingProviderIndex] = updatedProvider;
+            this._storeProviders(providers);
+        }
+    }
+    _getStoredProviders() {
+        const stored = this.storageService.get(DynamicAuthenticationProviderStorageService_1.PROVIDERS_STORAGE_KEY, StorageScope.APPLICATION, '[]');
+        try {
+            const providerInfos = JSON.parse(stored);
+            for (const providerInfo of providerInfos) {
+                if (!providerInfo.authorizationServer) {
+                    providerInfo.authorizationServer = providerInfo.issuer;
+                }
+            }
+            return providerInfos;
+        }
+        catch {
+            return [];
+        }
+    }
+    _storeProviders(providers) {
+        this.storageService.store(DynamicAuthenticationProviderStorageService_1.PROVIDERS_STORAGE_KEY, JSON.stringify(providers), StorageScope.APPLICATION, StorageTarget.MACHINE);
+    }
+    getInteractedProviders() {
+        return this._getStoredProviders();
+    }
+    async removeDynamicProvider(providerId) {
+        const providers = this._getStoredProviders();
+        const providerInfo = providers.find(p => p.providerId === providerId);
+        const filteredProviders = providers.filter(p => p.providerId !== providerId);
+        this._storeProviders(filteredProviders);
+        if (providerInfo) {
+            const secretKey = JSON.stringify({ isDynamicAuthProvider: true, authProviderId: providerId, clientId: providerInfo.clientId });
+            await this.secretStorageService.delete(secretKey);
+        }
+    }
+    async getSessionsForDynamicAuthProvider(authProviderId, clientId) {
+        const key = JSON.stringify({ isDynamicAuthProvider: true, authProviderId, clientId });
+        const value = await this.secretStorageService.get(key);
+        if (value) {
+            const parsed = JSON.parse(value);
+            if (!Array.isArray(parsed) || !parsed.every((t) => typeof t.created_at === 'number' && isAuthorizationTokenResponse(t))) {
+                this.logService.error(`Invalid session data for ${authProviderId} (${clientId}) in secret storage:`, parsed);
+                await this.secretStorageService.delete(key);
+                return undefined;
+            }
+            return parsed;
+        }
+        return undefined;
+    }
+    async setSessionsForDynamicAuthProvider(authProviderId, clientId, sessions) {
+        const key = JSON.stringify({ isDynamicAuthProvider: true, authProviderId, clientId });
+        const value = JSON.stringify(sessions);
+        await this.secretStorageService.set(key, value);
+        this.logService.trace(`Set session data for ${authProviderId} (${clientId}) in secret storage:`, sessions);
+    }
+};
+DynamicAuthenticationProviderStorageService = DynamicAuthenticationProviderStorageService_1 = ( __decorate([
+    ( __param(0, IStorageService)),
+    ( __param(1, ISecretStorageService)),
+    ( __param(2, ILogService))
+], DynamicAuthenticationProviderStorageService));
+
+export { DynamicAuthenticationProviderStorageService };