@opensumi/ide-core-browser 3.6.2 → 3.6.3-next-1734429911.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/authentication/authentication.service.d.ts +4 -4
- package/lib/authentication/authentication.service.d.ts.map +1 -1
- package/lib/authentication/authentication.service.js +6 -6
- package/lib/authentication/authentication.service.js.map +1 -1
- package/lib/layout/layout.interface.d.ts +3 -2
- package/lib/layout/layout.interface.d.ts.map +1 -1
- package/lib/layout/layout.interface.js.map +1 -1
- package/package.json +5 -5
- package/src/authentication/authentication.service.ts +23 -6
- package/src/layout/layout.interface.ts +3 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AllowedExtension, AuthenticationProviderInformation, AuthenticationSession, AuthenticationSessionsChangeEvent, CommandRegistry, Disposable, Event, IAccountUsage, IAuthenticationProvider, IAuthenticationService, IEventBus, ILogger, IStorage, StorageProvider } from '@opensumi/ide-core-common';
|
|
1
|
+
import { AllowedExtension, AuthenticationProviderInformation, AuthenticationProviderSessionOptions, AuthenticationSession, AuthenticationSessionAccountInformation, AuthenticationSessionsChangeEvent, CommandRegistry, Disposable, Event, IAccountUsage, IAuthenticationProvider, IAuthenticationService, IEventBus, ILogger, IStorage, StorageProvider } from '@opensumi/ide-core-common';
|
|
2
2
|
import { IMenuRegistry } from '../menu/next';
|
|
3
3
|
export declare class AuthenticationService extends Disposable implements IAuthenticationService {
|
|
4
4
|
protected readonly logger: ILogger;
|
|
@@ -32,15 +32,15 @@ export declare class AuthenticationService extends Disposable implements IAuthen
|
|
|
32
32
|
updatedAllowedExtension(providerId: string, accountName: string, extensionId: string, extensionName: string, isAllowed: boolean): Promise<void>;
|
|
33
33
|
isAccessAllowed(providerId: string, accountName: string, extensionId: string): Promise<boolean>;
|
|
34
34
|
private tryActivateProvider;
|
|
35
|
-
getSessions(providerId: string): Promise<ReadonlyArray<AuthenticationSession>>;
|
|
35
|
+
getSessions(providerId: string, scopes?: string[], activateImmediate?: boolean, user?: AuthenticationSessionAccountInformation): Promise<ReadonlyArray<AuthenticationSession>>;
|
|
36
36
|
isAuthenticationProviderRegistered(id: string): boolean;
|
|
37
37
|
getProviderIds(): string[];
|
|
38
38
|
unregisterAuthenticationProvider(id: string): void;
|
|
39
39
|
private updateAccountsMenuItem;
|
|
40
|
-
requestNewSession(providerId: string, scopes: string[], extensionId: string, extensionName: string): Promise<void>;
|
|
40
|
+
requestNewSession(providerId: string, scopes: string[], options: AuthenticationProviderSessionOptions, extensionId: string, extensionName: string): Promise<void>;
|
|
41
41
|
getLabel(providerId: string): string;
|
|
42
42
|
supportsMultipleAccounts(providerId: string): boolean;
|
|
43
|
-
login(providerId: string, scopes: string[]): Promise<AuthenticationSession>;
|
|
43
|
+
login(providerId: string, scopes: string[], options: AuthenticationProviderSessionOptions): Promise<AuthenticationSession>;
|
|
44
44
|
logout(providerId: string, sessionId: string): Promise<void>;
|
|
45
45
|
manageTrustedExtensionsForAccount(providerId: string, accountName: string): Promise<void>;
|
|
46
46
|
signOutOfAccount(providerId: string, accountName: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.service.d.ts","sourceRoot":"","sources":["../../src/authentication/authentication.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,iCAAiC,EACjC,qBAAqB,EACrB,iCAAiC,EACjC,eAAe,EACf,UAAU,EAGV,KAAK,EAEL,aAAa,EACb,uBAAuB,EACvB,sBAAsB,EAEtB,SAAS,EACT,OAAO,EACP,QAAQ,EAGR,eAAe,EAIhB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,aAAa,EAAU,MAAM,cAAc,CAAC;AAErD,qBACa,qBAAsB,SAAQ,UAAW,YAAW,sBAAsB;IAErF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,eAAe,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAGxC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAE7C,OAAO,CAAC,oCAAoC,CAE1C;IACF,SAAgB,mCAAmC,EAAE,KAAK,CAAC,iCAAiC,CAAC,CAC3C;IAElD,OAAO,CAAC,sCAAsC,CAE5C;IACF,QAAQ,CAAC,qCAAqC,EAAE,KAAK,CAAC,iCAAiC,CAAC,CACpC;IAEpD,OAAO,CAAC,oBAAoB,CAM1B;IACF,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,iCAAiC,CAAA;KAAE,CAAC,CAClF;IAElC,OAAO,CAAC,QAAQ,CAAW;IAE3B,OAAO,CAAC,wBAAwB,CAAoF;IAEpH,OAAO,CAAC,mBAAmB,CAAyC;IAEpE,OAAO,CAAC,mBAAmB,CAA0B;IAE/C,UAAU;IAoEhB,IAAI,OAAO,aAEV;IAED,8BAA8B,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,uBAAuB;IAOtE,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,iCAAiC;YAanE,wBAAwB;IAwBtC,OAAO,CAAC,aAAa;IAIf,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAe5D,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE;IAK3F,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAK/D,uBAAuB,CAC3B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,OAAO;IAYd,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;YAWpE,mBAAmB;IA+B3B,WAAW,
|
|
1
|
+
{"version":3,"file":"authentication.service.d.ts","sourceRoot":"","sources":["../../src/authentication/authentication.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -192,10 +192,10 @@ let AuthenticationService = class AuthenticationService extends ide_core_common_
|
|
|
192
192
|
});
|
|
193
193
|
return Promise.race([didRegister, didTimeout]);
|
|
194
194
|
}
|
|
195
|
-
async getSessions(providerId) {
|
|
195
|
+
async getSessions(providerId, scopes, activateImmediate, user) {
|
|
196
196
|
try {
|
|
197
197
|
const authProvider = this._authenticationProviders.get(providerId) || (await this.tryActivateProvider(providerId));
|
|
198
|
-
return await authProvider.getSessions();
|
|
198
|
+
return await authProvider.getSessions(scopes, user);
|
|
199
199
|
}
|
|
200
200
|
catch (_) {
|
|
201
201
|
throw new Error(`No authentication provider '${providerId}' is currently registered.`);
|
|
@@ -236,7 +236,7 @@ let AuthenticationService = class AuthenticationService extends ide_core_common_
|
|
|
236
236
|
});
|
|
237
237
|
}
|
|
238
238
|
}
|
|
239
|
-
async requestNewSession(providerId, scopes, extensionId, extensionName) {
|
|
239
|
+
async requestNewSession(providerId, scopes, options, extensionId, extensionName) {
|
|
240
240
|
let provider = this._authenticationProviders.get(providerId);
|
|
241
241
|
if (!provider) {
|
|
242
242
|
// Activate has already been called for the authentication provider, but it cannot block on registering itself
|
|
@@ -265,7 +265,7 @@ let AuthenticationService = class AuthenticationService extends ide_core_common_
|
|
|
265
265
|
label: (0, ide_core_common_1.formatLocalize)('authentication.signInRequests', extensionName),
|
|
266
266
|
}, {
|
|
267
267
|
execute: async () => {
|
|
268
|
-
const session = await this.login(providerId, scopes);
|
|
268
|
+
const session = await this.login(providerId, scopes, options);
|
|
269
269
|
const accountName = session.account.label;
|
|
270
270
|
// Add extension to allow list since user explicitly signed in on behalf of it
|
|
271
271
|
const allowList = await this.getAllowedExtensions(providerId, accountName);
|
|
@@ -317,10 +317,10 @@ let AuthenticationService = class AuthenticationService extends ide_core_common_
|
|
|
317
317
|
throw new Error(`No authentication provider '${providerId}' is currently registered.`);
|
|
318
318
|
}
|
|
319
319
|
}
|
|
320
|
-
async login(providerId, scopes) {
|
|
320
|
+
async login(providerId, scopes, options) {
|
|
321
321
|
try {
|
|
322
322
|
const authProvider = this._authenticationProviders.get(providerId) || (await this.tryActivateProvider(providerId));
|
|
323
|
-
return await authProvider.login(scopes);
|
|
323
|
+
return await authProvider.login(scopes, options);
|
|
324
324
|
}
|
|
325
325
|
catch (err) {
|
|
326
326
|
throw new Error(`No authentication provider '${providerId}' is currently registered, error messge: ${err.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../src/authentication/authentication.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../src/authentication/authentication.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { Layout } from '../components/layout/index';
|
|
|
3
3
|
import type { IContextMenu, IMenu } from '../menu/next';
|
|
4
4
|
import type { SlotLocation } from '../react-providers';
|
|
5
5
|
import type React from 'react';
|
|
6
|
+
import type { ViewBadge } from 'vscode';
|
|
6
7
|
export type Side = 'left' | 'right' | 'bottom';
|
|
7
8
|
export interface TabbarState {
|
|
8
9
|
containerId: string;
|
|
@@ -27,7 +28,7 @@ export interface View {
|
|
|
27
28
|
weight?: number;
|
|
28
29
|
priority?: number;
|
|
29
30
|
collapsed?: boolean;
|
|
30
|
-
badge?: string;
|
|
31
|
+
badge?: string | ViewBadge;
|
|
31
32
|
hidden?: boolean;
|
|
32
33
|
component?: React.ComponentType<any>;
|
|
33
34
|
noToolbar?: boolean;
|
|
@@ -48,7 +49,7 @@ export interface ExtViewContainerOptions {
|
|
|
48
49
|
size?: number;
|
|
49
50
|
activateKeyBinding?: string;
|
|
50
51
|
hidden?: boolean;
|
|
51
|
-
badge?: string;
|
|
52
|
+
badge?: string | ViewBadge;
|
|
52
53
|
component?: React.ComponentType<any>;
|
|
53
54
|
initialProps?: object;
|
|
54
55
|
titleComponent?: React.ComponentType<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout.interface.d.ts","sourceRoot":"","sources":["../../src/layout/layout.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"layout.interface.d.ts","sourceRoot":"","sources":["../../src/layout/layout.interface.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layout.interface.js","sourceRoot":"","sources":["../../src/layout/layout.interface.ts"],"names":[],"mappings":";;;AAAA,+DAAyE;
|
|
1
|
+
{"version":3,"file":"layout.interface.js","sourceRoot":"","sources":["../../src/layout/layout.interface.ts"],"names":[],"mappings":";;;AAAA,+DAAyE;AAkF5D,QAAA,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAkB7D,MAAa,aAAa;IACxB;;;OAGG;IACH,YAAmB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;CAClD;AAND,sCAMC;AACD,MAAa,WAAY,SAAQ,4BAAyB;IACxD,MAAM,CAAC,eAAe,CAAC,QAAsB;QAC3C,OAAO,UAAU,QAAQ,EAAE,CAAC;IAC9B,CAAC;CACF;AAJD,kCAIC;AAED,MAAa,aAAc,SAAQ,4BAAgB;CAAG;AAAtD,sCAAsD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-core-browser",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.3-next-1734429911.0",
|
|
4
4
|
"description": "@opensumi/ide-core-browser",
|
|
5
5
|
"files": [
|
|
6
6
|
"lib",
|
|
@@ -18,9 +18,9 @@
|
|
|
18
18
|
"build": "tsc --build ../../configs/ts/references/tsconfig.core-browser.json"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@opensumi/ide-components": "3.6.
|
|
22
|
-
"@opensumi/ide-connection": "3.6.
|
|
23
|
-
"@opensumi/ide-core-common": "3.6.
|
|
21
|
+
"@opensumi/ide-components": "3.6.3-next-1734429911.0",
|
|
22
|
+
"@opensumi/ide-connection": "3.6.3-next-1734429911.0",
|
|
23
|
+
"@opensumi/ide-core-common": "3.6.3-next-1734429911.0",
|
|
24
24
|
"@opensumi/vscode-debugprotocol": "1.49.0-beta.1",
|
|
25
25
|
"@vscode/codicons": "0.0.35",
|
|
26
26
|
"ajv": "^6.10.0",
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"react": "^18.2.0",
|
|
42
42
|
"react-dom": "^18.2.0"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "d903e0cd621c3844b92b6a262c463f1d0b43e6ec"
|
|
45
45
|
}
|
|
@@ -2,7 +2,9 @@ import { Autowired, Injectable } from '@opensumi/di';
|
|
|
2
2
|
import {
|
|
3
3
|
AllowedExtension,
|
|
4
4
|
AuthenticationProviderInformation,
|
|
5
|
+
AuthenticationProviderSessionOptions,
|
|
5
6
|
AuthenticationSession,
|
|
7
|
+
AuthenticationSessionAccountInformation,
|
|
6
8
|
AuthenticationSessionsChangeEvent,
|
|
7
9
|
CommandRegistry,
|
|
8
10
|
Disposable,
|
|
@@ -278,11 +280,16 @@ export class AuthenticationService extends Disposable implements IAuthentication
|
|
|
278
280
|
return Promise.race([didRegister, didTimeout]);
|
|
279
281
|
}
|
|
280
282
|
|
|
281
|
-
async getSessions(
|
|
283
|
+
async getSessions(
|
|
284
|
+
providerId: string,
|
|
285
|
+
scopes?: string[],
|
|
286
|
+
activateImmediate?: boolean,
|
|
287
|
+
user?: AuthenticationSessionAccountInformation,
|
|
288
|
+
): Promise<ReadonlyArray<AuthenticationSession>> {
|
|
282
289
|
try {
|
|
283
290
|
const authProvider =
|
|
284
291
|
this._authenticationProviders.get(providerId) || (await this.tryActivateProvider(providerId));
|
|
285
|
-
return await authProvider.getSessions();
|
|
292
|
+
return await authProvider.getSessions(scopes, user);
|
|
286
293
|
} catch (_) {
|
|
287
294
|
throw new Error(`No authentication provider '${providerId}' is currently registered.`);
|
|
288
295
|
}
|
|
@@ -327,7 +334,13 @@ export class AuthenticationService extends Disposable implements IAuthentication
|
|
|
327
334
|
}
|
|
328
335
|
}
|
|
329
336
|
|
|
330
|
-
async requestNewSession(
|
|
337
|
+
async requestNewSession(
|
|
338
|
+
providerId: string,
|
|
339
|
+
scopes: string[],
|
|
340
|
+
options: AuthenticationProviderSessionOptions,
|
|
341
|
+
extensionId: string,
|
|
342
|
+
extensionName: string,
|
|
343
|
+
) {
|
|
331
344
|
let provider = this._authenticationProviders.get(providerId);
|
|
332
345
|
if (!provider) {
|
|
333
346
|
// Activate has already been called for the authentication provider, but it cannot block on registering itself
|
|
@@ -362,7 +375,7 @@ export class AuthenticationService extends Disposable implements IAuthentication
|
|
|
362
375
|
},
|
|
363
376
|
{
|
|
364
377
|
execute: async () => {
|
|
365
|
-
const session = await this.login(providerId, scopes);
|
|
378
|
+
const session = await this.login(providerId, scopes, options);
|
|
366
379
|
const accountName = session.account.label;
|
|
367
380
|
// Add extension to allow list since user explicitly signed in on behalf of it
|
|
368
381
|
const allowList = await this.getAllowedExtensions(providerId, accountName);
|
|
@@ -416,11 +429,15 @@ export class AuthenticationService extends Disposable implements IAuthentication
|
|
|
416
429
|
throw new Error(`No authentication provider '${providerId}' is currently registered.`);
|
|
417
430
|
}
|
|
418
431
|
}
|
|
419
|
-
async login(
|
|
432
|
+
async login(
|
|
433
|
+
providerId: string,
|
|
434
|
+
scopes: string[],
|
|
435
|
+
options: AuthenticationProviderSessionOptions,
|
|
436
|
+
): Promise<AuthenticationSession> {
|
|
420
437
|
try {
|
|
421
438
|
const authProvider =
|
|
422
439
|
this._authenticationProviders.get(providerId) || (await this.tryActivateProvider(providerId));
|
|
423
|
-
return await authProvider.login(scopes);
|
|
440
|
+
return await authProvider.login(scopes, options);
|
|
424
441
|
} catch (err) {
|
|
425
442
|
throw new Error(
|
|
426
443
|
`No authentication provider '${providerId}' is currently registered, error messge: ${err.message}`,
|
|
@@ -5,6 +5,7 @@ import { Layout } from '../components/layout/index';
|
|
|
5
5
|
import type { IContextMenu, IMenu } from '../menu/next';
|
|
6
6
|
import type { SlotLocation } from '../react-providers';
|
|
7
7
|
import type React from 'react';
|
|
8
|
+
import type { ViewBadge } from 'vscode';
|
|
8
9
|
|
|
9
10
|
export type Side = 'left' | 'right' | 'bottom';
|
|
10
11
|
|
|
@@ -36,7 +37,7 @@ export interface View {
|
|
|
36
37
|
weight?: number;
|
|
37
38
|
priority?: number;
|
|
38
39
|
collapsed?: boolean;
|
|
39
|
-
badge?: string;
|
|
40
|
+
badge?: string | ViewBadge;
|
|
40
41
|
hidden?: boolean;
|
|
41
42
|
component?: React.ComponentType<any>;
|
|
42
43
|
// 使用该参数时, view 的 toolbar 默认不渲染
|
|
@@ -60,7 +61,7 @@ export interface ExtViewContainerOptions {
|
|
|
60
61
|
size?: number;
|
|
61
62
|
activateKeyBinding?: string;
|
|
62
63
|
hidden?: boolean;
|
|
63
|
-
badge?: string;
|
|
64
|
+
badge?: string | ViewBadge;
|
|
64
65
|
// 直接使用自定义的React组件，会失去一些对面板的控制能力
|
|
65
66
|
component?: React.ComponentType<any>;
|
|
66
67
|
// 使用自定义组件时可以传入，否则请作为View的一部分传入
|