revisium 2.3.0 → 2.5.0-alpha.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/.github/workflows/build.yml +11 -30
- package/.github/workflows/ci.yml +0 -6
- package/.github/workflows/npm-publish.yml +13 -78
- package/.github/workflows/release-train.yml +90 -0
- package/AGENTS.md +98 -0
- package/README.md +31 -13
- package/dist/e2e/utils/cli-runner.d.ts +2 -0
- package/dist/e2e/utils/cli-runner.js +14 -7
- package/dist/e2e/utils/cli-runner.js.map +1 -1
- package/dist/e2e/utils/matrix-fixtures.d.ts +26 -0
- package/dist/e2e/utils/matrix-fixtures.js +109 -0
- package/dist/e2e/utils/matrix-fixtures.js.map +1 -0
- package/dist/e2e/utils/matrix-workspace.d.ts +25 -0
- package/dist/e2e/utils/matrix-workspace.js +61 -0
- package/dist/e2e/utils/matrix-workspace.js.map +1 -0
- package/dist/e2e/utils/standalone-api.d.ts +53 -0
- package/dist/e2e/utils/standalone-api.js +146 -0
- package/dist/e2e/utils/standalone-api.js.map +1 -0
- package/dist/e2e/utils/standalone-runner.d.ts +23 -0
- package/dist/e2e/utils/standalone-runner.js +182 -0
- package/dist/e2e/utils/standalone-runner.js.map +1 -0
- package/dist/package.json +6 -3
- package/dist/src/app.module.js +51 -0
- package/dist/src/app.module.js.map +1 -1
- package/dist/src/commands/auth/auth-command.utils.d.ts +8 -0
- package/dist/src/commands/auth/auth-command.utils.js +28 -0
- package/dist/src/commands/auth/auth-command.utils.js.map +1 -0
- package/dist/src/commands/auth/auth-login.command.d.ts +29 -0
- package/dist/src/commands/auth/auth-login.command.js +155 -0
- package/dist/src/commands/auth/auth-login.command.js.map +1 -0
- package/dist/src/commands/auth/auth-logout.command.d.ts +19 -0
- package/dist/src/commands/auth/auth-logout.command.js +86 -0
- package/dist/src/commands/auth/auth-logout.command.js.map +1 -0
- package/dist/src/commands/auth/auth-status.command.d.ts +19 -0
- package/dist/src/commands/auth/auth-status.command.js +101 -0
- package/dist/src/commands/auth/auth-status.command.js.map +1 -0
- package/dist/src/commands/auth/auth.command.d.ts +5 -0
- package/dist/src/commands/auth/auth.command.js +35 -0
- package/dist/src/commands/auth/auth.command.js.map +1 -0
- package/dist/src/commands/base-sync.command.d.ts +2 -2
- package/dist/src/commands/base-sync.command.js +1 -2
- package/dist/src/commands/base-sync.command.js.map +1 -1
- package/dist/src/commands/base.command.d.ts +2 -0
- package/dist/src/commands/base.command.js +13 -0
- package/dist/src/commands/base.command.js.map +1 -1
- package/dist/src/commands/context/context-create.command.d.ts +28 -0
- package/dist/src/commands/context/context-create.command.js +172 -0
- package/dist/src/commands/context/context-create.command.js.map +1 -0
- package/dist/src/commands/context/context-list.command.d.ts +9 -0
- package/dist/src/commands/context/context-list.command.js +46 -0
- package/dist/src/commands/context/context-list.command.js.map +1 -0
- package/dist/src/commands/context/context-remove.command.d.ts +9 -0
- package/dist/src/commands/context/context-remove.command.js +48 -0
- package/dist/src/commands/context/context-remove.command.js.map +1 -0
- package/dist/src/commands/context/context-show.command.d.ts +9 -0
- package/dist/src/commands/context/context-show.command.js +64 -0
- package/dist/src/commands/context/context-show.command.js.map +1 -0
- package/dist/src/commands/context/context-use.command.d.ts +9 -0
- package/dist/src/commands/context/context-use.command.js +45 -0
- package/dist/src/commands/context/context-use.command.js.map +1 -0
- package/dist/src/commands/context/context.command.d.ts +5 -0
- package/dist/src/commands/context/context.command.js +43 -0
- package/dist/src/commands/context/context.command.js.map +1 -0
- package/dist/src/commands/endpoint/endpoint-ensure.command.d.ts +18 -0
- package/dist/src/commands/endpoint/endpoint-ensure.command.js +90 -0
- package/dist/src/commands/endpoint/endpoint-ensure.command.js.map +1 -0
- package/dist/src/commands/endpoint/endpoint-list.command.d.ts +14 -0
- package/dist/src/commands/endpoint/endpoint-list.command.js +62 -0
- package/dist/src/commands/endpoint/endpoint-list.command.js.map +1 -0
- package/dist/src/commands/endpoint/endpoint.command.d.ts +5 -0
- package/dist/src/commands/endpoint/endpoint.command.js +34 -0
- package/dist/src/commands/endpoint/endpoint.command.js.map +1 -0
- package/dist/src/commands/example/example-bootstrap.command.d.ts +24 -0
- package/dist/src/commands/example/example-bootstrap.command.js +133 -0
- package/dist/src/commands/example/example-bootstrap.command.js.map +1 -0
- package/dist/src/commands/example/example.command.d.ts +5 -0
- package/dist/src/commands/example/example.command.js +33 -0
- package/dist/src/commands/example/example.command.js.map +1 -0
- package/dist/src/commands/instance/instance-add.command.d.ts +16 -0
- package/dist/src/commands/instance/instance-add.command.js +83 -0
- package/dist/src/commands/instance/instance-add.command.js.map +1 -0
- package/dist/src/commands/instance/instance-list.command.d.ts +9 -0
- package/dist/src/commands/instance/instance-list.command.js +45 -0
- package/dist/src/commands/instance/instance-list.command.js.map +1 -0
- package/dist/src/commands/instance/instance-remove.command.d.ts +9 -0
- package/dist/src/commands/instance/instance-remove.command.js +54 -0
- package/dist/src/commands/instance/instance-remove.command.js.map +1 -0
- package/dist/src/commands/instance/instance-show.command.d.ts +9 -0
- package/dist/src/commands/instance/instance-show.command.js +50 -0
- package/dist/src/commands/instance/instance-show.command.js.map +1 -0
- package/dist/src/commands/instance/instance.command.d.ts +5 -0
- package/dist/src/commands/instance/instance.command.js +41 -0
- package/dist/src/commands/instance/instance.command.js.map +1 -0
- package/dist/src/commands/migration/apply-migrations.command.js +1 -0
- package/dist/src/commands/migration/apply-migrations.command.js.map +1 -1
- package/dist/src/commands/project/project-ensure.command.d.ts +16 -0
- package/dist/src/commands/project/project-ensure.command.js +71 -0
- package/dist/src/commands/project/project-ensure.command.js.map +1 -0
- package/dist/src/commands/project/project.command.d.ts +5 -0
- package/dist/src/commands/project/project.command.js +33 -0
- package/dist/src/commands/project/project.command.js.map +1 -0
- package/dist/src/services/bootstrap/bootstrap.service.d.ts +112 -0
- package/dist/src/services/bootstrap/bootstrap.service.js +438 -0
- package/dist/src/services/bootstrap/bootstrap.service.js.map +1 -0
- package/dist/src/services/bootstrap/index.d.ts +1 -0
- package/dist/src/services/bootstrap/index.js +6 -0
- package/dist/src/services/bootstrap/index.js.map +1 -0
- package/dist/src/services/connection/api-client.d.ts +4 -0
- package/dist/src/services/connection/api-client.js +67 -5
- package/dist/src/services/connection/api-client.js.map +1 -1
- package/dist/src/services/connection/connection-factory.service.js +4 -3
- package/dist/src/services/connection/connection-factory.service.js.map +1 -1
- package/dist/src/services/connection/connection.service.d.ts +10 -2
- package/dist/src/services/connection/connection.service.js +49 -4
- package/dist/src/services/connection/connection.service.js.map +1 -1
- package/dist/src/services/credentials/credential-store.service.d.ts +19 -0
- package/dist/src/services/credentials/credential-store.service.js +112 -0
- package/dist/src/services/credentials/credential-store.service.js.map +1 -0
- package/dist/src/services/credentials/credential-target.service.d.ts +22 -0
- package/dist/src/services/credentials/credential-target.service.js +107 -0
- package/dist/src/services/credentials/credential-target.service.js.map +1 -0
- package/dist/src/services/credentials/index.d.ts +2 -0
- package/dist/src/services/credentials/index.js +8 -0
- package/dist/src/services/credentials/index.js.map +1 -0
- package/dist/src/services/index.d.ts +3 -0
- package/dist/src/services/index.js +3 -0
- package/dist/src/services/index.js.map +1 -1
- package/dist/src/services/url/auth-prompt.service.d.ts +3 -1
- package/dist/src/services/url/auth-prompt.service.js +3 -0
- package/dist/src/services/url/auth-prompt.service.js.map +1 -1
- package/dist/src/services/url/url-builder.service.js +3 -0
- package/dist/src/services/url/url-builder.service.js.map +1 -1
- package/dist/src/services/url/url-parser.service.d.ts +1 -1
- package/dist/src/services/url/url-parser.service.js +12 -6
- package/dist/src/services/url/url-parser.service.js.map +1 -1
- package/dist/src/services/workspace/index.d.ts +1 -0
- package/dist/src/services/workspace/index.js +11 -0
- package/dist/src/services/workspace/index.js.map +1 -0
- package/dist/src/services/workspace/workspace-config.service.d.ts +66 -0
- package/dist/src/services/workspace/workspace-config.service.js +313 -0
- package/dist/src/services/workspace/workspace-config.service.js.map +1 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/docs/authentication.md +69 -26
- package/docs/bootstrap-commands.md +105 -0
- package/docs/configuration.md +49 -22
- package/docs/url-format.md +27 -2
- package/docs/workspace-config.md +135 -0
- package/e2e/jest-matrix.json +14 -0
- package/e2e/matrix/M01-auth-commands.e2e-spec.ts +241 -0
- package/e2e/matrix/M02-instance-commands.e2e-spec.ts +213 -0
- package/e2e/matrix/M03-context-commands.e2e-spec.ts +279 -0
- package/e2e/matrix/M04-project-ensure.e2e-spec.ts +218 -0
- package/e2e/matrix/M05-endpoint-commands.e2e-spec.ts +172 -0
- package/e2e/matrix/M06-example-bootstrap.e2e-spec.ts +437 -0
- package/e2e/matrix/M07-migrate.e2e-spec.ts +229 -0
- package/e2e/matrix/M08-schema.e2e-spec.ts +163 -0
- package/e2e/matrix/M09-rows.e2e-spec.ts +185 -0
- package/e2e/matrix/M10-sync.e2e-spec.ts +224 -0
- package/e2e/matrix/M11-target-resolution.e2e-spec.ts +177 -0
- package/e2e/matrix/M12-error-paths.e2e-spec.ts +162 -0
- package/e2e/matrix/M13-no-auth-mode.e2e-spec.ts +119 -0
- package/e2e/matrix/M14-multi-instance-workspace.e2e-spec.ts +182 -0
- package/e2e/matrix/README.md +354 -0
- package/e2e/tests/01-auth.e2e-spec.ts +19 -0
- package/e2e/tests/07-workspace-config.e2e-spec.ts +492 -0
- package/e2e/tests/08-bootstrap.e2e-spec.ts +304 -0
- package/e2e/utils/cli-runner.ts +27 -8
- package/e2e/utils/matrix-fixtures.ts +141 -0
- package/e2e/utils/matrix-workspace.ts +106 -0
- package/e2e/utils/standalone-api.ts +314 -0
- package/e2e/utils/standalone-runner.ts +276 -0
- package/package.json +6 -3
- package/src/app.module.ts +54 -0
- package/src/commands/auth/__tests__/auth-command.utils.spec.ts +41 -0
- package/src/commands/auth/__tests__/auth-login.command.spec.ts +131 -0
- package/src/commands/auth/__tests__/auth-logout.command.spec.ts +85 -0
- package/src/commands/auth/__tests__/auth-status.command.spec.ts +106 -0
- package/src/commands/auth/__tests__/auth.command.spec.ts +18 -0
- package/src/commands/auth/auth-command.utils.ts +36 -0
- package/src/commands/auth/auth-login.command.ts +146 -0
- package/src/commands/auth/auth-logout.command.ts +71 -0
- package/src/commands/auth/auth-status.command.ts +89 -0
- package/src/commands/auth/auth.command.ts +20 -0
- package/src/commands/base-sync.command.ts +2 -3
- package/src/commands/base.command.ts +11 -0
- package/src/commands/context/context-create.command.ts +173 -0
- package/src/commands/context/context-list.command.ts +36 -0
- package/src/commands/context/context-remove.command.ts +35 -0
- package/src/commands/context/context-show.command.ts +59 -0
- package/src/commands/context/context-use.command.ts +31 -0
- package/src/commands/context/context.command.ts +28 -0
- package/src/commands/endpoint/__tests__/endpoint-ensure.command.spec.ts +129 -0
- package/src/commands/endpoint/__tests__/endpoint-list.command.spec.ts +59 -0
- package/src/commands/endpoint/__tests__/endpoint.command.spec.ts +14 -0
- package/src/commands/endpoint/endpoint-ensure.command.ts +74 -0
- package/src/commands/endpoint/endpoint-list.command.ts +48 -0
- package/src/commands/endpoint/endpoint.command.ts +19 -0
- package/src/commands/example/__tests__/example-bootstrap.command.spec.ts +145 -0
- package/src/commands/example/__tests__/example.command.spec.ts +14 -0
- package/src/commands/example/example-bootstrap.command.ts +122 -0
- package/src/commands/example/example.command.ts +18 -0
- package/src/commands/instance/instance-add.command.ts +72 -0
- package/src/commands/instance/instance-list.command.ts +31 -0
- package/src/commands/instance/instance-remove.command.ts +44 -0
- package/src/commands/instance/instance-show.command.ts +35 -0
- package/src/commands/instance/instance.command.ts +26 -0
- package/src/commands/migration/apply-migrations.command.ts +1 -0
- package/src/commands/project/__tests__/project-ensure.command.spec.ts +119 -0
- package/src/commands/project/__tests__/project.command.spec.ts +14 -0
- package/src/commands/project/project-ensure.command.ts +61 -0
- package/src/commands/project/project.command.ts +18 -0
- package/src/services/bootstrap/__tests__/bootstrap.service.spec.ts +798 -0
- package/src/services/bootstrap/bootstrap.service.ts +698 -0
- package/src/services/bootstrap/index.ts +12 -0
- package/src/services/connection/__tests__/api-client.spec.ts +262 -0
- package/src/services/connection/__tests__/connection-factory.service.spec.ts +2 -0
- package/src/services/connection/__tests__/connection.service.spec.ts +161 -0
- package/src/services/connection/api-client.ts +88 -5
- package/src/services/connection/connection-factory.service.ts +4 -3
- package/src/services/connection/connection.service.ts +74 -3
- package/src/services/credentials/__tests__/credential-store.service.spec.ts +128 -0
- package/src/services/credentials/__tests__/credential-target.service.spec.ts +126 -0
- package/src/services/credentials/credential-store.service.ts +145 -0
- package/src/services/credentials/credential-target.service.ts +145 -0
- package/src/services/credentials/index.ts +9 -0
- package/src/services/index.ts +3 -0
- package/src/services/url/__tests__/url-builder.service.spec.ts +17 -0
- package/src/services/url/__tests__/url-parser.service.spec.ts +162 -0
- package/src/services/url/auth-prompt.service.ts +6 -1
- package/src/services/url/url-builder.service.ts +4 -0
- package/src/services/url/url-parser.service.ts +21 -6
- package/src/services/workspace/__tests__/workspace-config.service.spec.ts +378 -0
- package/src/services/workspace/index.ts +14 -0
- package/src/services/workspace/workspace-config.service.ts +467 -0
- package/.github/workflows/bump-version.yml +0 -86
|
@@ -1,20 +1,28 @@
|
|
|
1
1
|
import { ConfigService } from '@nestjs/config';
|
|
2
2
|
import { RevisionScope } from '@revisium/client';
|
|
3
3
|
import { ConnectionFactoryService, ConnectionInfo } from './connection-factory.service';
|
|
4
|
-
import {
|
|
4
|
+
import { LoggerService } from '../common';
|
|
5
|
+
import { RevisiumUrlComplete, UrlBuilderService } from '../url';
|
|
6
|
+
import { WorkspaceConfigService } from '../workspace';
|
|
5
7
|
export { ConnectionInfo } from './connection-factory.service';
|
|
6
8
|
export interface ConnectionOptions {
|
|
7
9
|
url?: string;
|
|
10
|
+
context?: string;
|
|
8
11
|
createProject?: boolean;
|
|
9
12
|
}
|
|
10
13
|
export declare class ConnectionService {
|
|
11
14
|
private readonly configService;
|
|
12
15
|
private readonly urlBuilder;
|
|
13
16
|
private readonly connectionFactory;
|
|
17
|
+
private readonly workspaceConfig;
|
|
18
|
+
private readonly logger;
|
|
14
19
|
private _connection;
|
|
15
|
-
constructor(configService: ConfigService, urlBuilder: UrlBuilderService, connectionFactory: ConnectionFactoryService);
|
|
20
|
+
constructor(configService: ConfigService, urlBuilder: UrlBuilderService, connectionFactory: ConnectionFactoryService, workspaceConfig: WorkspaceConfigService, logger: LoggerService);
|
|
16
21
|
get connection(): ConnectionInfo;
|
|
17
22
|
get revisionScope(): RevisionScope;
|
|
18
23
|
connect(options?: ConnectionOptions): Promise<void>;
|
|
24
|
+
resolveTarget(options?: ConnectionOptions): Promise<RevisiumUrlComplete>;
|
|
25
|
+
private resolveUrl;
|
|
26
|
+
private logWorkspaceContext;
|
|
19
27
|
private getEnvConfig;
|
|
20
28
|
}
|
|
@@ -13,16 +13,22 @@ exports.ConnectionService = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const config_1 = require("@nestjs/config");
|
|
15
15
|
const connection_factory_service_1 = require("./connection-factory.service");
|
|
16
|
+
const common_2 = require("../common");
|
|
16
17
|
const url_1 = require("../url");
|
|
18
|
+
const workspace_1 = require("../workspace");
|
|
17
19
|
let ConnectionService = class ConnectionService {
|
|
18
20
|
configService;
|
|
19
21
|
urlBuilder;
|
|
20
22
|
connectionFactory;
|
|
23
|
+
workspaceConfig;
|
|
24
|
+
logger;
|
|
21
25
|
_connection;
|
|
22
|
-
constructor(configService, urlBuilder, connectionFactory) {
|
|
26
|
+
constructor(configService, urlBuilder, connectionFactory, workspaceConfig, logger) {
|
|
23
27
|
this.configService = configService;
|
|
24
28
|
this.urlBuilder = urlBuilder;
|
|
25
29
|
this.connectionFactory = connectionFactory;
|
|
30
|
+
this.workspaceConfig = workspaceConfig;
|
|
31
|
+
this.logger = logger;
|
|
26
32
|
}
|
|
27
33
|
get connection() {
|
|
28
34
|
if (!this._connection) {
|
|
@@ -34,12 +40,49 @@ let ConnectionService = class ConnectionService {
|
|
|
34
40
|
return this.connection.revisionScope;
|
|
35
41
|
}
|
|
36
42
|
async connect(options = {}) {
|
|
37
|
-
const
|
|
38
|
-
const url = await this.urlBuilder.parseAndComplete(options.url, 'api', env);
|
|
43
|
+
const url = await this.resolveTarget(options);
|
|
39
44
|
this._connection = await this.connectionFactory.createConnection(url, {
|
|
40
45
|
createProject: options.createProject,
|
|
41
46
|
});
|
|
42
47
|
}
|
|
48
|
+
async resolveTarget(options = {}) {
|
|
49
|
+
return this.resolveUrl(options, this.getEnvConfig());
|
|
50
|
+
}
|
|
51
|
+
async resolveUrl(options, env) {
|
|
52
|
+
if (options.url) {
|
|
53
|
+
return this.urlBuilder.parseAndComplete(options.url, 'api', env);
|
|
54
|
+
}
|
|
55
|
+
if (options.context) {
|
|
56
|
+
const workspace = await this.workspaceConfig.load();
|
|
57
|
+
if (!workspace) {
|
|
58
|
+
throw new Error(`No Revisium workspace config found for context "${options.context}". Run: revisium instance add <instance> --url <revisium-server-url>, then revisium context create ${options.context} --instance <instance> --org <org> --project <project>`);
|
|
59
|
+
}
|
|
60
|
+
const url = this.workspaceConfig.resolveConnection(workspace, options.context, env);
|
|
61
|
+
this.logWorkspaceContext(workspace, options.context);
|
|
62
|
+
return url;
|
|
63
|
+
}
|
|
64
|
+
if (env.url) {
|
|
65
|
+
return this.urlBuilder.parseAndComplete(undefined, 'api', env);
|
|
66
|
+
}
|
|
67
|
+
const workspace = await this.workspaceConfig.load();
|
|
68
|
+
if (workspace) {
|
|
69
|
+
const url = this.workspaceConfig.resolveConnection(workspace, undefined, env);
|
|
70
|
+
this.logWorkspaceContext(workspace);
|
|
71
|
+
return url;
|
|
72
|
+
}
|
|
73
|
+
return this.urlBuilder.parseAndComplete(undefined, 'api', env);
|
|
74
|
+
}
|
|
75
|
+
logWorkspaceContext(loaded, contextName) {
|
|
76
|
+
const selectedContext = contextName || loaded.config.currentContext;
|
|
77
|
+
if (!selectedContext) {
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
const context = loaded.config.contexts[selectedContext];
|
|
81
|
+
if (!context) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
this.logger.info(`Using context ${selectedContext} (instance: ${context.instance})`);
|
|
85
|
+
}
|
|
43
86
|
getEnvConfig() {
|
|
44
87
|
return {
|
|
45
88
|
url: this.configService.get('REVISIUM_URL'),
|
|
@@ -55,6 +98,8 @@ exports.ConnectionService = ConnectionService = __decorate([
|
|
|
55
98
|
(0, common_1.Injectable)(),
|
|
56
99
|
__metadata("design:paramtypes", [config_1.ConfigService,
|
|
57
100
|
url_1.UrlBuilderService,
|
|
58
|
-
connection_factory_service_1.ConnectionFactoryService
|
|
101
|
+
connection_factory_service_1.ConnectionFactoryService,
|
|
102
|
+
workspace_1.WorkspaceConfigService,
|
|
103
|
+
common_2.LoggerService])
|
|
59
104
|
], ConnectionService);
|
|
60
105
|
//# sourceMappingURL=connection.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.service.js","sourceRoot":"","sources":["../../../../src/services/connection/connection.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAE/C,6EAGsC;AACtC,
|
|
1
|
+
{"version":3,"file":"connection.service.js","sourceRoot":"","sources":["../../../../src/services/connection/connection.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAE/C,6EAGsC;AACtC,sCAA0C;AAC1C,gCAA8E;AAC9E,4CAA6E;AAWtE,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAIT;IACA;IACA;IACA;IACA;IAPX,WAAW,CAA6B;IAEhD,YACmB,aAA4B,EAC5B,UAA6B,EAC7B,iBAA2C,EAC3C,eAAuC,EACvC,MAAqB;QAJrB,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAmB;QAC7B,sBAAiB,GAAjB,iBAAiB,CAA0B;QAC3C,oBAAe,GAAf,eAAe,CAAwB;QACvC,WAAM,GAAN,MAAM,CAAe;IACrC,CAAC;IAEJ,IAAW,UAAU;QACnB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,UAA6B,EAAE;QAClD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAE9C,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,GAAG,EAAE;YACpE,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,UAA6B,EAAE;QAE/B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;IACvD,CAAC;IAEO,KAAK,CAAC,UAAU,CACtB,OAA0B,EAC1B,GAAiB;QAEjB,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QACnE,CAAC;QAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;YACpD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CACb,mDAAmD,OAAO,CAAC,OAAO,sGAAsG,OAAO,CAAC,OAAO,wDAAwD,CAChP,CAAC;YACJ,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAChD,SAAS,EACT,OAAO,CAAC,OAAO,EACf,GAAG,CACJ,CAAC;YACF,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACrD,OAAO,GAAG,CAAC;QACb,CAAC;QAED,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;QACpD,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAChD,SAAS,EACT,SAAS,EACT,GAAG,CACJ,CAAC;YACF,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YACpC,OAAO,GAAG,CAAC;QACb,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;IACjE,CAAC;IAEO,mBAAmB,CACzB,MAA6B,EAC7B,WAAoB;QAEpB,MAAM,eAAe,GAAG,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC;QACpE,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,iBAAiB,eAAe,eAAe,OAAO,CAAC,QAAQ,GAAG,CACnE,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAC;YACnD,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,gBAAgB,CAAC;YACvD,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,kBAAkB,CAAC;YAC1D,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,mBAAmB,CAAC;YAC7D,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,mBAAmB,CAAC;SAC9D,CAAC;IACJ,CAAC;CACF,CAAA;AA1GY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAKuB,sBAAa;QAChB,uBAAiB;QACV,qDAAwB;QAC1B,kCAAsB;QAC/B,sBAAa;GAR7B,iBAAiB,CA0G7B"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { AuthCredentials } from 'src/services/url';
|
|
2
|
+
export interface CredentialRef {
|
|
3
|
+
baseUrl: string;
|
|
4
|
+
credential: string;
|
|
5
|
+
}
|
|
6
|
+
export declare class CredentialStoreService {
|
|
7
|
+
private readonly serviceName;
|
|
8
|
+
saveApiKey(ref: CredentialRef, apiKey: string): void;
|
|
9
|
+
getCredential(ref: CredentialRef): AuthCredentials | undefined;
|
|
10
|
+
hasCredential(ref: CredentialRef): boolean;
|
|
11
|
+
deleteCredential(ref: CredentialRef): boolean;
|
|
12
|
+
getAccountName(ref: CredentialRef): string;
|
|
13
|
+
private writeCredential;
|
|
14
|
+
private readCredential;
|
|
15
|
+
private createEntry;
|
|
16
|
+
private parseStoredCredential;
|
|
17
|
+
private isMissingCredentialError;
|
|
18
|
+
private wrapStoreError;
|
|
19
|
+
}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.CredentialStoreService = void 0;
|
|
10
|
+
const common_1 = require("@nestjs/common");
|
|
11
|
+
const keyring_1 = require("@napi-rs/keyring");
|
|
12
|
+
const SERVICE_NAME = 'revisium-cli';
|
|
13
|
+
let CredentialStoreService = class CredentialStoreService {
|
|
14
|
+
serviceName = process.env.REVISIUM_CREDENTIAL_STORE_SERVICE || SERVICE_NAME;
|
|
15
|
+
saveApiKey(ref, apiKey) {
|
|
16
|
+
const trimmedApiKey = apiKey.trim();
|
|
17
|
+
if (!trimmedApiKey) {
|
|
18
|
+
throw new Error('API key cannot be empty');
|
|
19
|
+
}
|
|
20
|
+
this.writeCredential(ref, {
|
|
21
|
+
method: 'apikey',
|
|
22
|
+
apiKey: trimmedApiKey,
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
getCredential(ref) {
|
|
26
|
+
const raw = this.readCredential(ref);
|
|
27
|
+
if (!raw) {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
const stored = this.parseStoredCredential(raw, ref);
|
|
31
|
+
return { method: 'apikey', apikey: stored.apiKey };
|
|
32
|
+
}
|
|
33
|
+
hasCredential(ref) {
|
|
34
|
+
return this.readCredential(ref) !== undefined;
|
|
35
|
+
}
|
|
36
|
+
deleteCredential(ref) {
|
|
37
|
+
try {
|
|
38
|
+
return this.createEntry(ref).deleteCredential();
|
|
39
|
+
}
|
|
40
|
+
catch (error) {
|
|
41
|
+
if (this.isMissingCredentialError(error)) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
throw this.wrapStoreError('delete', ref, error);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
getAccountName(ref) {
|
|
48
|
+
return `instance:${ref.baseUrl}|credential:${ref.credential}`;
|
|
49
|
+
}
|
|
50
|
+
writeCredential(ref, credential) {
|
|
51
|
+
try {
|
|
52
|
+
this.createEntry(ref).setPassword(JSON.stringify(credential));
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
throw this.wrapStoreError('save', ref, error);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
readCredential(ref) {
|
|
59
|
+
try {
|
|
60
|
+
return this.createEntry(ref).getPassword() ?? undefined;
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
if (this.isMissingCredentialError(error)) {
|
|
64
|
+
return undefined;
|
|
65
|
+
}
|
|
66
|
+
throw this.wrapStoreError('read', ref, error);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
createEntry(ref) {
|
|
70
|
+
return new keyring_1.Entry(this.serviceName, this.getAccountName(ref));
|
|
71
|
+
}
|
|
72
|
+
parseStoredCredential(raw, ref) {
|
|
73
|
+
let parsed;
|
|
74
|
+
try {
|
|
75
|
+
parsed = JSON.parse(raw);
|
|
76
|
+
}
|
|
77
|
+
catch {
|
|
78
|
+
throw new Error(`Saved Revisium credential "${ref.credential}" for ${ref.baseUrl} is invalid. Run: revisium auth login --url revisium://${ref.baseUrl.replace(/^https?:\/\//, '')} --credential ${ref.credential} --api-key`);
|
|
79
|
+
}
|
|
80
|
+
if (typeof parsed !== 'object' ||
|
|
81
|
+
parsed === null ||
|
|
82
|
+
!('method' in parsed) ||
|
|
83
|
+
parsed.method !== 'apikey' ||
|
|
84
|
+
!('apiKey' in parsed) ||
|
|
85
|
+
typeof parsed.apiKey !== 'string' ||
|
|
86
|
+
parsed.apiKey.trim() === '') {
|
|
87
|
+
throw new Error(`Saved Revisium credential "${ref.credential}" for ${ref.baseUrl} has an unsupported format. Run: revisium auth login --url revisium://${ref.baseUrl.replace(/^https?:\/\//, '')} --credential ${ref.credential} --api-key`);
|
|
88
|
+
}
|
|
89
|
+
return {
|
|
90
|
+
method: 'apikey',
|
|
91
|
+
apiKey: parsed.apiKey.trim(),
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
isMissingCredentialError(error) {
|
|
95
|
+
if (!(error instanceof Error)) {
|
|
96
|
+
return false;
|
|
97
|
+
}
|
|
98
|
+
const keyringError = error;
|
|
99
|
+
return (keyringError.code === 'NoEntry' ||
|
|
100
|
+
error.name === 'NoEntry' ||
|
|
101
|
+
error.message.includes('NoEntry'));
|
|
102
|
+
}
|
|
103
|
+
wrapStoreError(action, ref, error) {
|
|
104
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
105
|
+
return new Error(`Could not ${action} Revisium credential "${ref.credential}" for ${ref.baseUrl}: ${message}`);
|
|
106
|
+
}
|
|
107
|
+
};
|
|
108
|
+
exports.CredentialStoreService = CredentialStoreService;
|
|
109
|
+
exports.CredentialStoreService = CredentialStoreService = __decorate([
|
|
110
|
+
(0, common_1.Injectable)()
|
|
111
|
+
], CredentialStoreService);
|
|
112
|
+
//# sourceMappingURL=credential-store.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credential-store.service.js","sourceRoot":"","sources":["../../../../src/services/credentials/credential-store.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { WorkspaceAuthMode, WorkspaceConfigService } from 'src/services/workspace';
|
|
2
|
+
export interface CredentialTargetOptions {
|
|
3
|
+
url?: string;
|
|
4
|
+
instance?: string;
|
|
5
|
+
credential?: string;
|
|
6
|
+
}
|
|
7
|
+
export interface CredentialTarget {
|
|
8
|
+
baseUrl: string;
|
|
9
|
+
credential: string;
|
|
10
|
+
instanceName?: string;
|
|
11
|
+
contextName?: string;
|
|
12
|
+
authMode?: WorkspaceAuthMode;
|
|
13
|
+
configPath?: string;
|
|
14
|
+
}
|
|
15
|
+
export declare class CredentialTargetService {
|
|
16
|
+
private readonly workspaceConfig;
|
|
17
|
+
constructor(workspaceConfig: WorkspaceConfigService);
|
|
18
|
+
resolveRequired(options: CredentialTargetOptions): Promise<CredentialTarget>;
|
|
19
|
+
resolveOrCurrentContext(options: CredentialTargetOptions): Promise<CredentialTarget>;
|
|
20
|
+
private resolve;
|
|
21
|
+
private resolveUrlTarget;
|
|
22
|
+
}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.CredentialTargetService = void 0;
|
|
13
|
+
const common_1 = require("@nestjs/common");
|
|
14
|
+
const workspace_1 = require("../workspace");
|
|
15
|
+
let CredentialTargetService = class CredentialTargetService {
|
|
16
|
+
workspaceConfig;
|
|
17
|
+
constructor(workspaceConfig) {
|
|
18
|
+
this.workspaceConfig = workspaceConfig;
|
|
19
|
+
}
|
|
20
|
+
async resolveRequired(options) {
|
|
21
|
+
if (!options.url && !options.instance) {
|
|
22
|
+
throw new Error('Pass --instance <name> or --url <revisium-url>');
|
|
23
|
+
}
|
|
24
|
+
return this.resolve(options, false);
|
|
25
|
+
}
|
|
26
|
+
async resolveOrCurrentContext(options) {
|
|
27
|
+
return this.resolve(options, true);
|
|
28
|
+
}
|
|
29
|
+
async resolve(options, allowCurrentContext) {
|
|
30
|
+
if (options.url && options.instance) {
|
|
31
|
+
throw new Error('Use only one target selector: --instance or --url');
|
|
32
|
+
}
|
|
33
|
+
if (options.url) {
|
|
34
|
+
return this.resolveUrlTarget(options);
|
|
35
|
+
}
|
|
36
|
+
const loaded = await this.workspaceConfig.load();
|
|
37
|
+
if (!loaded) {
|
|
38
|
+
throw new Error('No Revisium workspace config found. Pass --url <revisium-url> or run revisium instance add first.');
|
|
39
|
+
}
|
|
40
|
+
if (options.instance) {
|
|
41
|
+
const instance = loaded.config.instances[options.instance];
|
|
42
|
+
if (!instance) {
|
|
43
|
+
throw new Error(`Revisium instance "${options.instance}" was not found`);
|
|
44
|
+
}
|
|
45
|
+
return {
|
|
46
|
+
baseUrl: instance.baseUrl,
|
|
47
|
+
credential: options.credential || workspace_1.DEFAULT_CREDENTIAL,
|
|
48
|
+
instanceName: options.instance,
|
|
49
|
+
authMode: instance.authMode || 'stored',
|
|
50
|
+
configPath: loaded.path,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
if (!allowCurrentContext) {
|
|
54
|
+
throw new Error('Pass --instance <name> or --url <revisium-url>');
|
|
55
|
+
}
|
|
56
|
+
const contextName = loaded.config.currentContext;
|
|
57
|
+
if (!contextName) {
|
|
58
|
+
throw new Error(`No current Revisium context is configured in ${loaded.path}. Run: revisium context use <name>`);
|
|
59
|
+
}
|
|
60
|
+
const context = loaded.config.contexts[contextName];
|
|
61
|
+
if (!context) {
|
|
62
|
+
throw new Error(`Revisium context "${contextName}" was not found`);
|
|
63
|
+
}
|
|
64
|
+
const instance = loaded.config.instances[context.instance];
|
|
65
|
+
if (!instance) {
|
|
66
|
+
throw new Error(`Revisium instance "${context.instance}" for context "${contextName}" was not found`);
|
|
67
|
+
}
|
|
68
|
+
return {
|
|
69
|
+
baseUrl: instance.baseUrl,
|
|
70
|
+
credential: options.credential || context.credential || workspace_1.DEFAULT_CREDENTIAL,
|
|
71
|
+
instanceName: context.instance,
|
|
72
|
+
contextName,
|
|
73
|
+
authMode: instance.authMode || 'stored',
|
|
74
|
+
configPath: loaded.path,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
async resolveUrlTarget(options) {
|
|
78
|
+
if (!options.url) {
|
|
79
|
+
throw new Error('Pass --url <revisium-url>');
|
|
80
|
+
}
|
|
81
|
+
const baseUrl = this.workspaceConfig.normalizeBaseUrl(options.url);
|
|
82
|
+
const loaded = await this.workspaceConfig.load();
|
|
83
|
+
if (!loaded) {
|
|
84
|
+
return {
|
|
85
|
+
baseUrl,
|
|
86
|
+
credential: options.credential || workspace_1.DEFAULT_CREDENTIAL,
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
const instanceName = this.workspaceConfig.findInstanceNameByBaseUrl(loaded.config, baseUrl);
|
|
90
|
+
const instance = instanceName
|
|
91
|
+
? loaded.config.instances[instanceName]
|
|
92
|
+
: undefined;
|
|
93
|
+
return {
|
|
94
|
+
baseUrl,
|
|
95
|
+
credential: options.credential || workspace_1.DEFAULT_CREDENTIAL,
|
|
96
|
+
instanceName,
|
|
97
|
+
authMode: instance?.authMode || 'stored',
|
|
98
|
+
configPath: loaded.path,
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
};
|
|
102
|
+
exports.CredentialTargetService = CredentialTargetService;
|
|
103
|
+
exports.CredentialTargetService = CredentialTargetService = __decorate([
|
|
104
|
+
(0, common_1.Injectable)(),
|
|
105
|
+
__metadata("design:paramtypes", [workspace_1.WorkspaceConfigService])
|
|
106
|
+
], CredentialTargetService);
|
|
107
|
+
//# sourceMappingURL=credential-target.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credential-target.service.js","sourceRoot":"","sources":["../../../../src/services/credentials/credential-target.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CredentialTargetService = exports.CredentialStoreService = void 0;
|
|
4
|
+
var credential_store_service_1 = require("./credential-store.service");
|
|
5
|
+
Object.defineProperty(exports, "CredentialStoreService", { enumerable: true, get: function () { return credential_store_service_1.CredentialStoreService; } });
|
|
6
|
+
var credential_target_service_1 = require("./credential-target.service");
|
|
7
|
+
Object.defineProperty(exports, "CredentialTargetService", { enumerable: true, get: function () { return credential_target_service_1.CredentialTargetService; } });
|
|
8
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/credentials/index.ts"],"names":[],"mappings":";;;AAAA,uEAGoC;AADlC,kIAAA,sBAAsB,OAAA;AAExB,yEAIqC;AADnC,oIAAA,uBAAuB,OAAA"}
|
|
@@ -18,4 +18,7 @@ __exportStar(require("./connection"), exports);
|
|
|
18
18
|
__exportStar(require("./url"), exports);
|
|
19
19
|
__exportStar(require("./sync"), exports);
|
|
20
20
|
__exportStar(require("./common"), exports);
|
|
21
|
+
__exportStar(require("./workspace"), exports);
|
|
22
|
+
__exportStar(require("./credentials"), exports);
|
|
23
|
+
__exportStar(require("./bootstrap"), exports);
|
|
21
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,wCAAsB;AACtB,yCAAuB;AACvB,2CAAyB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,wCAAsB;AACtB,yCAAuB;AACvB,2CAAyB;AACzB,8CAA4B;AAC5B,gDAA8B;AAC9B,8CAA4B"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { InteractiveService } from '../common';
|
|
2
|
-
export type AuthMethod = 'token' | 'apikey' | 'password';
|
|
2
|
+
export type AuthMethod = 'none' | 'token' | 'apikey' | 'password';
|
|
3
3
|
export type AuthCredentials = {
|
|
4
|
+
method: 'none';
|
|
5
|
+
} | {
|
|
4
6
|
method: 'token';
|
|
5
7
|
token: string;
|
|
6
8
|
} | {
|
|
@@ -24,6 +24,9 @@ let AuthPromptService = class AuthPromptService {
|
|
|
24
24
|
{ name: 'API Key (for automated access)', value: 'apikey' },
|
|
25
25
|
{ name: 'Username & Password', value: 'password' },
|
|
26
26
|
]);
|
|
27
|
+
if (authMethod === 'none') {
|
|
28
|
+
return { method: 'none' };
|
|
29
|
+
}
|
|
27
30
|
if (authMethod === 'token') {
|
|
28
31
|
const token = await this.interactive.promptPassword(`[${label}] Paste token:`);
|
|
29
32
|
if (!token?.trim()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-prompt.service.js","sourceRoot":"","sources":["../../../../src/services/url/auth-prompt.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,sCAA+C;
|
|
1
|
+
{"version":3,"file":"auth-prompt.service.js","sourceRoot":"","sources":["../../../../src/services/url/auth-prompt.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,sCAA+C;AAWxC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACC;IAA7B,YAA6B,WAA+B;QAA/B,gBAAW,GAAX,WAAW,CAAoB;IAAG,CAAC;IAEhE,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,OAAe;QAEf,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAEnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CACpD,IAAI,KAAK,iCAAiC,EAC1C;YACE,EAAE,IAAI,EAAE,oBAAoB,YAAY,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE;YAC7D,EAAE,IAAI,EAAE,gCAAgC,EAAE,KAAK,EAAE,QAAQ,EAAE;YAC3D,EAAE,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,UAAU,EAAE;SACnD,CACF,CAAC;QAEF,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;YAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC5B,CAAC;QAED,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CACjD,IAAI,KAAK,gBAAgB,CAC1B,CAAC;YACF,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC3C,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAClD,CAAC;QAED,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAClD,IAAI,KAAK,kBAAkB,CAC5B,CAAC;YACF,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC7C,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QACrD,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAChD,IAAI,KAAK,mBAAmB,CAC7B,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CACpD,IAAI,KAAK,mBAAmB,CAC7B,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC;IACrE,CAAC;IAEO,eAAe,CAAC,OAAe;QACrC,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;YACzC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACtB,CAAC,CAAC,OAAO,CAAC;QACZ,OAAO,GAAG,aAAa,YAAY,CAAC;IACtC,CAAC;CACF,CAAA;AAjEY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAE+B,2BAAkB;GADjD,iBAAiB,CAiE7B"}
|
|
@@ -33,6 +33,9 @@ let UrlBuilderService = class UrlBuilderService {
|
|
|
33
33
|
: '';
|
|
34
34
|
const branchPart = url.branch ? `/${url.branch}${revisionSuffix}` : '';
|
|
35
35
|
const basePath = `revisium://${baseUrlWithoutProtocol}/${url.organization}/${url.project}${branchPart}`;
|
|
36
|
+
if (url.auth.method === 'none') {
|
|
37
|
+
return basePath;
|
|
38
|
+
}
|
|
36
39
|
if (url.auth.method === 'token') {
|
|
37
40
|
const tokenValue = maskSecrets ? '****' : url.auth.token;
|
|
38
41
|
return `${basePath}?token=${tokenValue}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-builder.service.js","sourceRoot":"","sources":["../../../../src/services/url/url-builder.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"url-builder.service.js","sourceRoot":"","sources":["../../../../src/services/url/url-builder.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,sCAA+C;AAC/C,6DAAqE;AACrE,+DAA2E;AAsB3E,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAC/B,MAAM,cAAc,GAAG,QAAQ,CAAC;AAChC,MAAM,gBAAgB,GAAG,OAAO,CAAC;AAG1B,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAET;IACA;IACA;IAHnB,YACmB,WAA+B,EAC/B,SAA2B,EAC3B,UAA6B;QAF7B,gBAAW,GAAX,WAAW,CAAoB;QAC/B,cAAS,GAAT,SAAS,CAAkB;QAC3B,eAAU,GAAV,UAAU,CAAmB;IAC7C,CAAC;IAEJ,mBAAmB,CAAC,GAAwB,EAAE,WAAW,GAAG,IAAI;QAC9D,MAAM,sBAAsB,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;QAEvE,MAAM,cAAc,GAClB,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,gBAAgB;YAC/C,CAAC,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE;YACpB,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAEvE,MAAM,QAAQ,GAAG,cAAc,sBAAsB,IAAI,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC;QAExG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC/B,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAChC,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;YACzD,OAAO,GAAG,QAAQ,UAAU,UAAU,EAAE,CAAC;QAC3C,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;YAC3D,OAAO,GAAG,QAAQ,WAAW,WAAW,EAAE,CAAC;QAC7C,CAAC;QAED,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC1D,OAAO,cAAc,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,QAAQ,IAAI,sBAAsB,IAAI,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC;IACjI,CAAC;IAED,KAAK,CAAC,KAAa;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,KAAyB,EACzB,KAAa,EACb,GAAkB;QAElB,IAAI,QAAQ,GAAG,KAAK,IAAI,GAAG,EAAE,GAAG,CAAC;QAEjC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE9C,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAEtC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;QAExE,MAAM,YAAY,GAChB,MAAM,CAAC,YAAY;YACnB,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,KAAK,uBAAuB,CAAC,CAAC,CAAC;QAExE,MAAM,OAAO,GACX,MAAM,CAAC,OAAO;YACd,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC,CAAC;QAEnE,MAAM,MAAM,GACV,MAAM,CAAC,MAAM;YACb,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAChC,IAAI,KAAK,iBAAiB,EAC1B,cAAc,CACf,CAAC,CAAC;QAEL,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,gBAAgB,CAAC;QAErD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAEjE,OAAO;YACL,OAAO;YACP,IAAI;YACJ,YAAY;YACZ,OAAO;YACP,MAAM;YACN,QAAQ;SACT,CAAC;IACJ,CAAC;IAEO,mBAAmB,CAAC,MAAmB,EAAE,GAAkB;QACjE,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvC,OAAO,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,MAAM,CAAC,KAAK,IAAI,GAAG,EAAE,KAAK,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,8CAA8C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;gBAClE,8DAA8D,CACjE,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,MAAmB,EACnB,GAA6B,EAC7B,KAAa,EACb,OAAe;QAEf,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,GAAG,EAAE,KAAK,CAAC;QACzC,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACpC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,GAAG,EAAE,MAAM,CAAC;QAC5C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QACtC,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvC,OAAO;gBACL,MAAM,EAAE,UAAU;gBAClB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,GAAG,EAAE,QAAQ,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,GAAG,EAAE,QAAQ,CAAC;QAElD,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAAC;YACzB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;QACpD,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,KAAa;QACxC,IAAI,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,IACE,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC;YAClC,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,EACnC,CAAC;YACD,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAErD,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YAC/C,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,YAAY,GAAG,CAAC,CAAC;YAC1D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAChD,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAErD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAC/C,aAAa,EACb,MAAM,CAAC,iBAAiB,CAAC,CAC1B,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAE7C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAC/C,aAAa,EACb,MAAM,CAAC,iBAAiB,CAAC,CAC1B,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;CACF,CAAA;AAlMY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAGqB,2BAAkB;QACpB,qCAAgB;QACf,uCAAiB;GAJrC,iBAAiB,CAkM7B"}
|
|
@@ -12,7 +12,7 @@ export interface RevisiumUrl {
|
|
|
12
12
|
export declare class UrlParserService {
|
|
13
13
|
parse(input: string): RevisiumUrl;
|
|
14
14
|
buildBaseUrl(protocol: string, host: string, port?: number): string;
|
|
15
|
-
buildBaseUrlFromHost(hostWithPort: string): string;
|
|
15
|
+
buildBaseUrlFromHost(hostWithPort: string, protocolOverride?: 'http' | 'https'): string;
|
|
16
16
|
isLocalhost(host: string): boolean;
|
|
17
17
|
validatePort(port: number, context: string): void;
|
|
18
18
|
private parseRevisiumUrl;
|
|
@@ -18,6 +18,12 @@ function validatePort(port, context) {
|
|
|
18
18
|
}
|
|
19
19
|
let UrlParserService = class UrlParserService {
|
|
20
20
|
parse(input) {
|
|
21
|
+
if (input.startsWith('revisium+http://')) {
|
|
22
|
+
return this.parseRevisiumUrl(input, 'http');
|
|
23
|
+
}
|
|
24
|
+
if (input.startsWith('revisium+https://')) {
|
|
25
|
+
return this.parseRevisiumUrl(input, 'https');
|
|
26
|
+
}
|
|
21
27
|
if (input.startsWith('revisium://')) {
|
|
22
28
|
return this.parseRevisiumUrl(input);
|
|
23
29
|
}
|
|
@@ -27,14 +33,14 @@ let UrlParserService = class UrlParserService {
|
|
|
27
33
|
const portSuffix = port ? `:${port}` : '';
|
|
28
34
|
return `${protocol}://${host}${portSuffix}`;
|
|
29
35
|
}
|
|
30
|
-
buildBaseUrlFromHost(hostWithPort) {
|
|
36
|
+
buildBaseUrlFromHost(hostWithPort, protocolOverride) {
|
|
31
37
|
const [host, portStr] = hostWithPort.split(':');
|
|
32
38
|
const port = portStr ? Number.parseInt(portStr, 10) : undefined;
|
|
33
39
|
if (port !== undefined) {
|
|
34
40
|
validatePort(port, `in "${hostWithPort}"`);
|
|
35
41
|
}
|
|
36
|
-
const
|
|
37
|
-
|
|
42
|
+
const protocol = protocolOverride ??
|
|
43
|
+
(LOCALHOST_HOSTS.has(host.toLowerCase()) ? 'http' : 'https');
|
|
38
44
|
if (port) {
|
|
39
45
|
return this.buildBaseUrl(protocol, host, port);
|
|
40
46
|
}
|
|
@@ -46,8 +52,8 @@ let UrlParserService = class UrlParserService {
|
|
|
46
52
|
validatePort(port, context) {
|
|
47
53
|
validatePort(port, context);
|
|
48
54
|
}
|
|
49
|
-
parseRevisiumUrl(url) {
|
|
50
|
-
const withoutProtocol = url.replace(
|
|
55
|
+
parseRevisiumUrl(url, forceProtocol) {
|
|
56
|
+
const withoutProtocol = url.replace(/^revisium(\+https?)?:\/\//, '');
|
|
51
57
|
const [mainPart, queryString] = withoutProtocol.split('?');
|
|
52
58
|
const queryParams = this.parseQueryParams(queryString);
|
|
53
59
|
let auth;
|
|
@@ -77,7 +83,7 @@ let UrlParserService = class UrlParserService {
|
|
|
77
83
|
}
|
|
78
84
|
const pathParts = hostAndPath.split('/');
|
|
79
85
|
const hostWithPort = pathParts[0];
|
|
80
|
-
const baseUrl = this.buildBaseUrlFromHost(hostWithPort);
|
|
86
|
+
const baseUrl = this.buildBaseUrlFromHost(hostWithPort, forceProtocol);
|
|
81
87
|
const branchWithRevision = pathParts[3] || undefined;
|
|
82
88
|
let branch;
|
|
83
89
|
let revision;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-parser.service.js","sourceRoot":"","sources":["../../../../src/services/url/url-parser.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAc5C,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;AAC5D,MAAM,QAAQ,GAAG,CAAC,CAAC;AACnB,MAAM,QAAQ,GAAG,KAAK,CAAC;AAEvB,SAAS,YAAY,CAAC,IAAY,EAAE,OAAe;IACjD,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,QAAQ,IAAI,IAAI,GAAG,QAAQ,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CACb,gBAAgB,OAAO,8BAA8B,QAAQ,QAAQ,QAAQ,EAAE,CAChF,CAAC;IACJ,CAAC;AACH,CAAC;AAGM,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,KAAK,CAAC,KAAa;QACjB,IAAI,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,QAAgB,EAAE,IAAY,EAAE,IAAa;QACxD,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1C,OAAO,GAAG,QAAQ,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;IAC9C,CAAC;IAED,oBAAoB,
|
|
1
|
+
{"version":3,"file":"url-parser.service.js","sourceRoot":"","sources":["../../../../src/services/url/url-parser.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { DEFAULT_BRANCH, DEFAULT_CREDENTIAL, DEFAULT_REVISION, LoadedWorkspaceContext, LoadedWorkspaceConfig, WORKSPACE_CONFIG_DIR, WORKSPACE_CONFIG_FILE, WorkspaceAuthMode, WorkspaceConfig, WorkspaceConfigService, WorkspaceContextConfig, WorkspaceInstanceConfig, } from './workspace-config.service';
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.WorkspaceConfigService = exports.WORKSPACE_CONFIG_FILE = exports.WORKSPACE_CONFIG_DIR = exports.DEFAULT_REVISION = exports.DEFAULT_CREDENTIAL = exports.DEFAULT_BRANCH = void 0;
|
|
4
|
+
var workspace_config_service_1 = require("./workspace-config.service");
|
|
5
|
+
Object.defineProperty(exports, "DEFAULT_BRANCH", { enumerable: true, get: function () { return workspace_config_service_1.DEFAULT_BRANCH; } });
|
|
6
|
+
Object.defineProperty(exports, "DEFAULT_CREDENTIAL", { enumerable: true, get: function () { return workspace_config_service_1.DEFAULT_CREDENTIAL; } });
|
|
7
|
+
Object.defineProperty(exports, "DEFAULT_REVISION", { enumerable: true, get: function () { return workspace_config_service_1.DEFAULT_REVISION; } });
|
|
8
|
+
Object.defineProperty(exports, "WORKSPACE_CONFIG_DIR", { enumerable: true, get: function () { return workspace_config_service_1.WORKSPACE_CONFIG_DIR; } });
|
|
9
|
+
Object.defineProperty(exports, "WORKSPACE_CONFIG_FILE", { enumerable: true, get: function () { return workspace_config_service_1.WORKSPACE_CONFIG_FILE; } });
|
|
10
|
+
Object.defineProperty(exports, "WorkspaceConfigService", { enumerable: true, get: function () { return workspace_config_service_1.WorkspaceConfigService; } });
|
|
11
|
+
//# sourceMappingURL=index.js.map
|