@theia/ai-copilot 1.73.0-next.3 → 1.73.0-next.39
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/node/copilot-auth-service-impl.d.ts +2 -1
- package/lib/node/copilot-auth-service-impl.d.ts.map +1 -1
- package/lib/node/copilot-auth-service-impl.js +12 -7
- package/lib/node/copilot-auth-service-impl.js.map +1 -1
- package/lib/node/copilot-auth-service-impl.spec.js +4 -0
- package/lib/node/copilot-auth-service-impl.spec.js.map +1 -1
- package/package.json +6 -6
- package/src/node/copilot-auth-service-impl.spec.ts +5 -0
- package/src/node/copilot-auth-service-impl.ts +12 -9
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Emitter, Event } from '@theia/core';
|
|
1
|
+
import { Emitter, Event, ILogger } from '@theia/core';
|
|
2
2
|
import { KeyStoreService } from '@theia/core/lib/common/key-store';
|
|
3
3
|
import { CopilotAuthService, CopilotAuthServiceClient, CopilotAuthState, DeviceCodeResponse } from '../common/copilot-auth-service';
|
|
4
4
|
import { CopilotOAuthConfig } from '../common/copilot-oauth-config';
|
|
@@ -8,6 +8,7 @@ import { CopilotOAuthConfig } from '../common/copilot-oauth-config';
|
|
|
8
8
|
*/
|
|
9
9
|
export declare class CopilotAuthServiceImpl implements CopilotAuthService {
|
|
10
10
|
protected readonly keyStoreService: KeyStoreService;
|
|
11
|
+
protected readonly logger: ILogger;
|
|
11
12
|
protected readonly oauthConfig: CopilotOAuthConfig;
|
|
12
13
|
protected client: CopilotAuthServiceClient | undefined;
|
|
13
14
|
protected cachedState: CopilotAuthState | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-auth-service-impl.d.ts","sourceRoot":"","sources":["../../src/node/copilot-auth-service-impl.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"copilot-auth-service-impl.d.ts","sourceRoot":"","sources":["../../src/node/copilot-auth-service-impl.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EACH,kBAAkB,EAClB,wBAAwB,EACxB,gBAAgB,EAChB,kBAAkB,EACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAiBpE;;;GAGG;AACH,qBACa,sBAAuB,YAAW,kBAAkB;IAG7D,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IAEnD,SAAS,CAAC,MAAM,EAAE,wBAAwB,GAAG,SAAS,CAAC;IACvD,SAAS,CAAC,WAAW,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAEpD,SAAS,CAAC,QAAQ,CAAC,yBAAyB,4BAAmC;IAC/E,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAwC;IAE5F,SAAS,CAAC,MAAM,EAAE,wBAAwB,GAAG,SAAS,GAAG,IAAI;IAI7D,SAAS,CAAC,iBAAiB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE;IAgBhG,kBAAkB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAyBvE,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;cAsFlF,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAwBrG,YAAY,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA+BzC,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAa7C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAW9B,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAMxD,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAG7C"}
|
|
@@ -96,7 +96,7 @@ let CopilotAuthServiceImpl = class CopilotAuthServiceImpl {
|
|
|
96
96
|
})
|
|
97
97
|
});
|
|
98
98
|
if (!response.ok) {
|
|
99
|
-
|
|
99
|
+
this.logger.error(`Token request failed: ${response.status}`);
|
|
100
100
|
continue;
|
|
101
101
|
}
|
|
102
102
|
const data = await response.json();
|
|
@@ -129,11 +129,11 @@ let CopilotAuthServiceImpl = class CopilotAuthServiceImpl {
|
|
|
129
129
|
continue;
|
|
130
130
|
}
|
|
131
131
|
if (data.error === 'expired_token' || data.error === 'access_denied') {
|
|
132
|
-
|
|
132
|
+
this.logger.error(`Authorization failed: ${data.error} - ${data.error_description}`);
|
|
133
133
|
return false;
|
|
134
134
|
}
|
|
135
135
|
if (data.error) {
|
|
136
|
-
|
|
136
|
+
this.logger.error(`Unexpected error: ${data.error} - ${data.error_description}`);
|
|
137
137
|
return false;
|
|
138
138
|
}
|
|
139
139
|
}
|
|
@@ -157,7 +157,7 @@ let CopilotAuthServiceImpl = class CopilotAuthServiceImpl {
|
|
|
157
157
|
}
|
|
158
158
|
}
|
|
159
159
|
catch (error) {
|
|
160
|
-
|
|
160
|
+
this.logger.warn('Failed to fetch GitHub user info:', error);
|
|
161
161
|
}
|
|
162
162
|
return undefined;
|
|
163
163
|
}
|
|
@@ -185,7 +185,7 @@ let CopilotAuthServiceImpl = class CopilotAuthServiceImpl {
|
|
|
185
185
|
}
|
|
186
186
|
}
|
|
187
187
|
catch (error) {
|
|
188
|
-
|
|
188
|
+
this.logger.warn('Failed to retrieve Copilot credentials:', error);
|
|
189
189
|
}
|
|
190
190
|
this.cachedState = { isAuthenticated: false };
|
|
191
191
|
return this.cachedState;
|
|
@@ -199,7 +199,7 @@ let CopilotAuthServiceImpl = class CopilotAuthServiceImpl {
|
|
|
199
199
|
}
|
|
200
200
|
}
|
|
201
201
|
catch (error) {
|
|
202
|
-
|
|
202
|
+
this.logger.warn('Failed to retrieve Copilot access token:', error);
|
|
203
203
|
}
|
|
204
204
|
return undefined;
|
|
205
205
|
}
|
|
@@ -208,7 +208,7 @@ let CopilotAuthServiceImpl = class CopilotAuthServiceImpl {
|
|
|
208
208
|
await this.keyStoreService.deletePassword(this.oauthConfig.keystoreService, this.oauthConfig.keystoreAccount);
|
|
209
209
|
}
|
|
210
210
|
catch (error) {
|
|
211
|
-
|
|
211
|
+
this.logger.warn('Failed to delete Copilot credentials:', error);
|
|
212
212
|
}
|
|
213
213
|
const newState = { isAuthenticated: false };
|
|
214
214
|
this.updateAuthState(newState);
|
|
@@ -227,6 +227,11 @@ tslib_1.__decorate([
|
|
|
227
227
|
(0, inversify_1.inject)(key_store_1.KeyStoreService),
|
|
228
228
|
tslib_1.__metadata("design:type", Object)
|
|
229
229
|
], CopilotAuthServiceImpl.prototype, "keyStoreService", void 0);
|
|
230
|
+
tslib_1.__decorate([
|
|
231
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
232
|
+
(0, inversify_1.named)('ai-copilot:CopilotAuthServiceImpl'),
|
|
233
|
+
tslib_1.__metadata("design:type", Object)
|
|
234
|
+
], CopilotAuthServiceImpl.prototype, "logger", void 0);
|
|
230
235
|
tslib_1.__decorate([
|
|
231
236
|
(0, inversify_1.inject)(copilot_oauth_config_1.CopilotOAuthConfig),
|
|
232
237
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-auth-service-impl.js","sourceRoot":"","sources":["../../src/node/copilot-auth-service-impl.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"copilot-auth-service-impl.js","sourceRoot":"","sources":["../../src/node/copilot-auth-service-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,8 @@ const inversify_1 = require("@theia/core/shared/inversify");
|
|
|
21
21
|
const key_store_1 = require("@theia/core/lib/common/key-store");
|
|
22
22
|
const copilot_oauth_config_1 = require("../common/copilot-oauth-config");
|
|
23
23
|
const copilot_auth_service_impl_1 = require("./copilot-auth-service-impl");
|
|
24
|
+
const logger_1 = require("@theia/core/lib/common/logger");
|
|
25
|
+
const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
|
|
24
26
|
describe('CopilotAuthServiceImpl', () => {
|
|
25
27
|
let authService;
|
|
26
28
|
let keyStoreService;
|
|
@@ -39,6 +41,7 @@ describe('CopilotAuthServiceImpl', () => {
|
|
|
39
41
|
container.bind(key_store_1.KeyStoreService).toConstantValue(keyStoreService);
|
|
40
42
|
container.bind(copilot_oauth_config_1.CopilotOAuthConfig).toConstantValue(copilot_oauth_config_1.DEFAULT_COPILOT_OAUTH_CONFIG);
|
|
41
43
|
container.bind(copilot_auth_service_impl_1.CopilotAuthServiceImpl).toSelf().inSingletonScope();
|
|
44
|
+
container.bind(logger_1.ILogger).to(mock_logger_1.MockLogger).inSingletonScope();
|
|
42
45
|
authService = container.get(copilot_auth_service_impl_1.CopilotAuthServiceImpl);
|
|
43
46
|
});
|
|
44
47
|
afterEach(() => {
|
|
@@ -159,6 +162,7 @@ describe('CopilotAuthServiceImpl with custom CopilotOAuthConfig', () => {
|
|
|
159
162
|
let deletePasswordStub;
|
|
160
163
|
beforeEach(() => {
|
|
161
164
|
const container = new inversify_1.Container();
|
|
165
|
+
container.bind(logger_1.ILogger).to(mock_logger_1.MockLogger).inSingletonScope();
|
|
162
166
|
getPasswordStub = sinon.stub().resolves(undefined);
|
|
163
167
|
deletePasswordStub = sinon.stub().resolves(true);
|
|
164
168
|
const keyStoreService = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-auth-service-impl.spec.js","sourceRoot":"","sources":["../../src/node/copilot-auth-service-impl.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,+BAA8B;AAC9B,+BAA+B;AAC/B,4DAAyD;AACzD,gEAAmE;AACnE,yEAAkG;AAClG,2EAAqE;AAErE,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAEpC,IAAI,WAAmC,CAAC;IACxC,IAAI,eAAgC,CAAC;IACrC,IAAI,eAAgC,CAAC;IAErC,UAAU,CAAC,GAAG,EAAE;QACZ,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;QAElC,eAAe,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAC/B,eAAe,GAAG;YACd,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAoC;YACtE,WAAW,EAAE,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAmC;YAClF,cAAc,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAsC;YAChF,YAAY,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAoC;YACjF,eAAe,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAuC;YAChF,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAA4B;SAC7D,CAAC;QAEF,SAAS,CAAC,IAAI,CAAC,2BAAe,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QACjE,SAAS,CAAC,IAAI,CAAC,yCAAkB,CAAC,CAAC,eAAe,CAAC,mDAA4B,CAAC,CAAC;QACjF,SAAS,CAAC,IAAI,CAAC,kDAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"copilot-auth-service-impl.spec.js","sourceRoot":"","sources":["../../src/node/copilot-auth-service-impl.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/ai-copilot",
|
|
3
|
-
"version": "1.73.0-next.
|
|
3
|
+
"version": "1.73.0-next.39+b8afaa0a7",
|
|
4
4
|
"description": "Theia - GitHub Copilot Integration",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/ai-core": "1.73.0-next.
|
|
7
|
-
"@theia/ai-openai": "1.73.0-next.
|
|
8
|
-
"@theia/core": "1.73.0-next.
|
|
9
|
-
"openai": "^6.
|
|
6
|
+
"@theia/ai-core": "1.73.0-next.39+b8afaa0a7",
|
|
7
|
+
"@theia/ai-openai": "1.73.0-next.39+b8afaa0a7",
|
|
8
|
+
"@theia/core": "1.73.0-next.39+b8afaa0a7",
|
|
9
|
+
"openai": "^6.39.1",
|
|
10
10
|
"tslib": "^2.8.1"
|
|
11
11
|
},
|
|
12
12
|
"publishConfig": {
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
"nyc": {
|
|
49
49
|
"extends": "../../configs/nyc.json"
|
|
50
50
|
},
|
|
51
|
-
"gitHead": "
|
|
51
|
+
"gitHead": "b8afaa0a7ec19427b14ca23df2da2a81bddedbfc"
|
|
52
52
|
}
|
|
@@ -20,6 +20,8 @@ import { Container } from '@theia/core/shared/inversify';
|
|
|
20
20
|
import { KeyStoreService } from '@theia/core/lib/common/key-store';
|
|
21
21
|
import { CopilotOAuthConfig, DEFAULT_COPILOT_OAUTH_CONFIG } from '../common/copilot-oauth-config';
|
|
22
22
|
import { CopilotAuthServiceImpl } from './copilot-auth-service-impl';
|
|
23
|
+
import { ILogger } from '@theia/core/lib/common/logger';
|
|
24
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
23
25
|
|
|
24
26
|
describe('CopilotAuthServiceImpl', () => {
|
|
25
27
|
|
|
@@ -43,6 +45,7 @@ describe('CopilotAuthServiceImpl', () => {
|
|
|
43
45
|
container.bind(KeyStoreService).toConstantValue(keyStoreService);
|
|
44
46
|
container.bind(CopilotOAuthConfig).toConstantValue(DEFAULT_COPILOT_OAUTH_CONFIG);
|
|
45
47
|
container.bind(CopilotAuthServiceImpl).toSelf().inSingletonScope();
|
|
48
|
+
container.bind(ILogger).to(MockLogger).inSingletonScope();
|
|
46
49
|
|
|
47
50
|
authService = container.get(CopilotAuthServiceImpl);
|
|
48
51
|
});
|
|
@@ -202,6 +205,8 @@ describe('CopilotAuthServiceImpl with custom CopilotOAuthConfig', () => {
|
|
|
202
205
|
beforeEach(() => {
|
|
203
206
|
const container = new Container();
|
|
204
207
|
|
|
208
|
+
container.bind(ILogger).to(MockLogger).inSingletonScope();
|
|
209
|
+
|
|
205
210
|
getPasswordStub = sinon.stub().resolves(undefined);
|
|
206
211
|
deletePasswordStub = sinon.stub().resolves(true);
|
|
207
212
|
const keyStoreService: KeyStoreService = {
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
-
import { Emitter, Event } from '@theia/core';
|
|
17
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
18
|
+
import { Emitter, Event, ILogger } from '@theia/core';
|
|
19
19
|
import { KeyStoreService } from '@theia/core/lib/common/key-store';
|
|
20
20
|
import {
|
|
21
21
|
CopilotAuthService,
|
|
@@ -50,6 +50,9 @@ export class CopilotAuthServiceImpl implements CopilotAuthService {
|
|
|
50
50
|
@inject(KeyStoreService)
|
|
51
51
|
protected readonly keyStoreService: KeyStoreService;
|
|
52
52
|
|
|
53
|
+
@inject(ILogger) @named('ai-copilot:CopilotAuthServiceImpl')
|
|
54
|
+
protected readonly logger: ILogger;
|
|
55
|
+
|
|
53
56
|
@inject(CopilotOAuthConfig)
|
|
54
57
|
protected readonly oauthConfig: CopilotOAuthConfig;
|
|
55
58
|
|
|
@@ -127,7 +130,7 @@ export class CopilotAuthServiceImpl implements CopilotAuthService {
|
|
|
127
130
|
});
|
|
128
131
|
|
|
129
132
|
if (!response.ok) {
|
|
130
|
-
|
|
133
|
+
this.logger.error(`Token request failed: ${response.status}`);
|
|
131
134
|
continue;
|
|
132
135
|
}
|
|
133
136
|
|
|
@@ -177,12 +180,12 @@ export class CopilotAuthServiceImpl implements CopilotAuthService {
|
|
|
177
180
|
}
|
|
178
181
|
|
|
179
182
|
if (data.error === 'expired_token' || data.error === 'access_denied') {
|
|
180
|
-
|
|
183
|
+
this.logger.error(`Authorization failed: ${data.error} - ${data.error_description}`);
|
|
181
184
|
return false;
|
|
182
185
|
}
|
|
183
186
|
|
|
184
187
|
if (data.error) {
|
|
185
|
-
|
|
188
|
+
this.logger.error(`Unexpected error: ${data.error} - ${data.error_description}`);
|
|
186
189
|
return false;
|
|
187
190
|
}
|
|
188
191
|
}
|
|
@@ -209,7 +212,7 @@ export class CopilotAuthServiceImpl implements CopilotAuthService {
|
|
|
209
212
|
return userData.login;
|
|
210
213
|
}
|
|
211
214
|
} catch (error) {
|
|
212
|
-
|
|
215
|
+
this.logger.warn('Failed to fetch GitHub user info:', error);
|
|
213
216
|
}
|
|
214
217
|
return undefined;
|
|
215
218
|
}
|
|
@@ -238,7 +241,7 @@ export class CopilotAuthServiceImpl implements CopilotAuthService {
|
|
|
238
241
|
return this.cachedState;
|
|
239
242
|
}
|
|
240
243
|
} catch (error) {
|
|
241
|
-
|
|
244
|
+
this.logger.warn('Failed to retrieve Copilot credentials:', error);
|
|
242
245
|
}
|
|
243
246
|
|
|
244
247
|
this.cachedState = { isAuthenticated: false };
|
|
@@ -253,7 +256,7 @@ export class CopilotAuthServiceImpl implements CopilotAuthService {
|
|
|
253
256
|
return credentials.accessToken;
|
|
254
257
|
}
|
|
255
258
|
} catch (error) {
|
|
256
|
-
|
|
259
|
+
this.logger.warn('Failed to retrieve Copilot access token:', error);
|
|
257
260
|
}
|
|
258
261
|
return undefined;
|
|
259
262
|
}
|
|
@@ -262,7 +265,7 @@ export class CopilotAuthServiceImpl implements CopilotAuthService {
|
|
|
262
265
|
try {
|
|
263
266
|
await this.keyStoreService.deletePassword(this.oauthConfig.keystoreService, this.oauthConfig.keystoreAccount);
|
|
264
267
|
} catch (error) {
|
|
265
|
-
|
|
268
|
+
this.logger.warn('Failed to delete Copilot credentials:', error);
|
|
266
269
|
}
|
|
267
270
|
|
|
268
271
|
const newState: CopilotAuthState = { isAuthenticated: false };
|