@microsoft/managed-apps-cli 0.17.0 → 0.18.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/dist/Cli.d.ts.map +1 -1
- package/dist/Cli.js +10 -4
- package/dist/Cli.js.map +1 -1
- package/dist/CliSettings.d.ts +2 -0
- package/dist/CliSettings.d.ts.map +1 -1
- package/dist/CliSettings.js +32 -8
- package/dist/CliSettings.js.map +1 -1
- package/dist/Constants/HelpStrings.d.ts.map +1 -1
- package/dist/Constants/HelpStrings.js +6 -5
- package/dist/Constants/HelpStrings.js.map +1 -1
- package/dist/Constants.d.ts +1 -0
- package/dist/Constants.d.ts.map +1 -1
- package/dist/Constants.js +5 -1
- package/dist/Constants.js.map +1 -1
- package/dist/HttpClient/CliHttpClient.d.ts +2 -2
- package/dist/HttpClient/CliHttpClient.d.ts.map +1 -1
- package/dist/HttpClient/CliHttpClient.js +5 -67
- package/dist/HttpClient/CliHttpClient.js.map +1 -1
- package/dist/HttpClient/HttpForward.d.ts +9 -0
- package/dist/HttpClient/HttpForward.d.ts.map +1 -0
- package/dist/HttpClient/HttpForward.js +56 -0
- package/dist/HttpClient/HttpForward.js.map +1 -0
- package/dist/Logger/CliLogger.d.ts +2 -1
- package/dist/Logger/CliLogger.d.ts.map +1 -1
- package/dist/Logger/CliLogger.js +13 -6
- package/dist/Logger/CliLogger.js.map +1 -1
- package/dist/Logger/OneDSWriter.d.ts +8 -4
- package/dist/Logger/OneDSWriter.d.ts.map +1 -1
- package/dist/Logger/OneDSWriter.js +77 -6
- package/dist/Logger/OneDSWriter.js.map +1 -1
- package/dist/Types/Datasource.types.d.ts +1 -14
- package/dist/Types/Datasource.types.d.ts.map +1 -1
- package/dist/Utils/EnvironmentRoutingUtils.js +2 -2
- package/dist/Utils/EnvironmentRoutingUtils.js.map +1 -1
- package/dist/Verbs/AddConnectorFlows.d.ts +4 -4
- package/dist/Verbs/AddConnectorFlows.d.ts.map +1 -1
- package/dist/Verbs/AddConnectorFlows.js +10 -7
- package/dist/Verbs/AddConnectorFlows.js.map +1 -1
- package/dist/Verbs/AddFlow.d.ts.map +1 -1
- package/dist/Verbs/AddFlow.js +1 -7
- package/dist/Verbs/AddFlow.js.map +1 -1
- package/dist/Verbs/Dev.d.ts.map +1 -1
- package/dist/Verbs/Dev.js +8 -6
- package/dist/Verbs/Dev.js.map +1 -1
- package/dist/Verbs/ListMaafApps.d.ts +22 -10
- package/dist/Verbs/ListMaafApps.d.ts.map +1 -1
- package/dist/Verbs/ListMaafApps.js +72 -26
- package/dist/Verbs/ListMaafApps.js.map +1 -1
- package/dist/Verbs/RemoveFlow.d.ts.map +1 -1
- package/dist/Verbs/RemoveFlow.js +1 -7
- package/dist/Verbs/RemoveFlow.js.map +1 -1
- package/dist/Verbs/VerbConstants.d.ts +1 -1
- package/dist/Verbs/VerbConstants.js +1 -1
- package/dist/Verbs/VerbConstants.js.map +1 -1
- package/package.json +4 -4
package/dist/Logger/CliLogger.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
3
|
*/
|
|
4
|
+
import { randomUUID } from 'node:crypto';
|
|
4
5
|
import { getEnvironmentByName } from '@microsoft/managed-apps-actions';
|
|
5
6
|
import { cloudToRegionSafe } from '@microsoft/managed-apps-common/services';
|
|
6
|
-
import { randomUUID } from 'crypto';
|
|
7
7
|
import packageJson from '../../package.json' with { type: 'json' };
|
|
8
8
|
import { getCliEnvVarBool } from '../Utils/EnvVars.js';
|
|
9
9
|
import { ConsoleWriter } from './ConsoleWriter.js';
|
|
@@ -129,7 +129,7 @@ export class CliLogger {
|
|
|
129
129
|
this._telemetryWriters = telemetryWriters;
|
|
130
130
|
this._sessionId = sessionId;
|
|
131
131
|
}
|
|
132
|
-
static async create(cliSettings, httpClient, authenticationProvider) {
|
|
132
|
+
static async create(cliSettings, httpClient, authenticationProvider, httpForwardOptions) {
|
|
133
133
|
const environmentId = cliSettings.appConfig?.environmentId;
|
|
134
134
|
const region = cloudToRegionSafe(cliSettings.appConfig?.cloud);
|
|
135
135
|
const appId = cliSettings.appConfig?.appId;
|
|
@@ -148,10 +148,17 @@ export class CliLogger {
|
|
|
148
148
|
// Push the unauthenticated writer immediately. Defaults to the global 1DS endpoint
|
|
149
149
|
// and omits `geoLocation`; if/when auth succeeds, the upgrade swaps in the EU-aware
|
|
150
150
|
// writer below.
|
|
151
|
-
const unauth = new OneDSWriter(sessionId, region, 'global', environmentId, appId ?? '', undefined, packageJson.version, cliSettings.origin);
|
|
151
|
+
const unauth = new OneDSWriter(sessionId, region, 'global', environmentId, appId ?? '', undefined, packageJson.version, cliSettings.origin, httpForwardOptions);
|
|
152
152
|
instance._unauthWriter = unauth;
|
|
153
153
|
instance._telemetryWriters.push(unauth);
|
|
154
|
-
instance._upgradeConfig = {
|
|
154
|
+
instance._upgradeConfig = {
|
|
155
|
+
sessionId,
|
|
156
|
+
region,
|
|
157
|
+
environmentId,
|
|
158
|
+
appId,
|
|
159
|
+
cliSettings,
|
|
160
|
+
httpForwardOptions,
|
|
161
|
+
};
|
|
155
162
|
// Register the lazy upgrade: fires once when the verb makes its first successful
|
|
156
163
|
// authed HTTP call. By that point we know auth works, so the metadata fetch can't
|
|
157
164
|
// pop a browser.
|
|
@@ -207,14 +214,14 @@ export class CliLogger {
|
|
|
207
214
|
return;
|
|
208
215
|
}
|
|
209
216
|
this._upgradeFired = true;
|
|
210
|
-
const { sessionId, region, environmentId, appId, cliSettings } = this._upgradeConfig;
|
|
217
|
+
const { sessionId, region, environmentId, appId, cliSettings, httpForwardOptions } = this._upgradeConfig;
|
|
211
218
|
try {
|
|
212
219
|
const metadata = await getEnvironmentByName(environmentId);
|
|
213
220
|
let telemetryLocation = 'global';
|
|
214
221
|
if (metadata?.properties?.location && EUGeoRegions.has(metadata.properties.location)) {
|
|
215
222
|
telemetryLocation = 'eu';
|
|
216
223
|
}
|
|
217
|
-
const authed = new OneDSWriter(sessionId, region, telemetryLocation, environmentId, appId ?? '', metadata?.properties?.cluster?.geoShortName, packageJson.version, cliSettings.origin);
|
|
224
|
+
const authed = new OneDSWriter(sessionId, region, telemetryLocation, environmentId, appId ?? '', metadata?.properties?.cluster?.geoShortName, packageJson.version, cliSettings.origin, httpForwardOptions);
|
|
218
225
|
// Replace the unauth writer in place. Pre-upgrade events have already been
|
|
219
226
|
// dispatched to the unauth writer's channel; we don't re-send them.
|
|
220
227
|
const idx = this._telemetryWriters.indexOf(this._unauthWriter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliLogger.js","sourceRoot":"","sources":["../../src/Logger/CliLogger.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"CliLogger.js","sourceRoot":"","sources":["../../src/Logger/CliLogger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
|
-
*/
|
|
1
|
+
import type { IXHROverride } from '@microsoft/1ds-post-js';
|
|
4
2
|
import { type Region } from '@microsoft/managed-apps-common/services';
|
|
5
3
|
import { type TelemetryLocation } from '@microsoft/managed-apps-common/telemetry';
|
|
6
4
|
import type { ITelemetryWriter } from '../Types/LoggerTypes.types.js';
|
|
5
|
+
export interface OneDsHttpForwardOptions {
|
|
6
|
+
forwardUrl: string;
|
|
7
|
+
authToken?: string;
|
|
8
|
+
customForwardHeadersJson?: string;
|
|
9
|
+
}
|
|
10
|
+
export declare function createOneDsHttpForwardOverride(options: OneDsHttpForwardOptions): IXHROverride;
|
|
7
11
|
export declare class OneDSWriter implements ITelemetryWriter {
|
|
8
12
|
private _provider;
|
|
9
|
-
constructor(sessionId: string, region: Region, telemetryLocation: TelemetryLocation, environmentId: string, appId: string, geoLocation: string | undefined, cliVersion: string, cliSource: string);
|
|
13
|
+
constructor(sessionId: string, region: Region, telemetryLocation: TelemetryLocation, environmentId: string, appId: string, geoLocation: string | undefined, cliVersion: string, cliSource: string, httpForwardOptions?: OneDsHttpForwardOptions);
|
|
10
14
|
trackActivityEvent(operationName: string, eventData?: object): void;
|
|
11
15
|
trackErrorEvent(operationName: string, eventData?: object): void;
|
|
12
16
|
startScenario(scenarioName: string, startData?: object): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneDSWriter.d.ts","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OneDSWriter.d.ts","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAgB,YAAY,EAAsB,MAAM,wBAAwB,CAAC;AAC7F,OAAO,EAAE,KAAK,MAAM,EAA2B,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAIlD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAuED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,uBAAuB,GAAG,YAAY,CAM7F;AAED,qBAAa,WAAY,YAAW,gBAAgB;IAClD,OAAO,CAAC,SAAS,CAAyB;gBAGxC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,kBAAkB,CAAC,EAAE,uBAAuB;IA8DvC,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAOnE,eAAe,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAOhE,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;IAQ7D,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;IAQnE,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;IASnE,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAShE,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI;IAStF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAI7D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAqB;IAE1D,OAAO,CAAC,WAAW;CAyBpB"}
|
|
@@ -1,12 +1,78 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
3
|
*/
|
|
4
|
+
import { randomUUID } from 'node:crypto';
|
|
4
5
|
import { regionToClusterCategory } from '@microsoft/managed-apps-common/services';
|
|
5
6
|
import { OneDsTelemetryProvider, ScenarioResults, TelemetryEventNames, } from '@microsoft/managed-apps-common/telemetry';
|
|
7
|
+
import { MS_CLIENT_REQUESTID, MS_TARGET_URL, USER_AGENT } from '../Constants.js';
|
|
8
|
+
import { applyStaticForwardHeaders, parseForwardHeaders } from '../HttpClient/HttpForward.js';
|
|
6
9
|
import { getScrubbedCustomDimensions } from './Scrubber/ScrubCustomDimensions.js';
|
|
10
|
+
function appendUserAgent(headers) {
|
|
11
|
+
let existingUserAgent = '';
|
|
12
|
+
for (const name of Object.keys(headers)) {
|
|
13
|
+
if (name.toLowerCase() === 'user-agent') {
|
|
14
|
+
if (headers[name]) {
|
|
15
|
+
existingUserAgent = existingUserAgent
|
|
16
|
+
? `${existingUserAgent} ${headers[name]}`
|
|
17
|
+
: headers[name];
|
|
18
|
+
}
|
|
19
|
+
delete headers[name];
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
headers['User-Agent'] = existingUserAgent ? `${existingUserAgent} ${USER_AGENT}` : USER_AGENT;
|
|
23
|
+
}
|
|
24
|
+
function buildForwardedTelemetryHeaders(payloadHeaders, forwardHeaders) {
|
|
25
|
+
const headers = {};
|
|
26
|
+
applyStaticForwardHeaders(headers, forwardHeaders);
|
|
27
|
+
for (const [name, value] of Object.entries(payloadHeaders ?? {})) {
|
|
28
|
+
if (name.toLowerCase() !== 'user-agent') {
|
|
29
|
+
for (const existingName of Object.keys(headers)) {
|
|
30
|
+
if (existingName.toLowerCase() === name.toLowerCase()) {
|
|
31
|
+
delete headers[existingName];
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
headers[name] = value;
|
|
36
|
+
}
|
|
37
|
+
return headers;
|
|
38
|
+
}
|
|
39
|
+
async function sendForwardedTelemetry(payload, oncomplete, options, forwardHeaders) {
|
|
40
|
+
const headers = buildForwardedTelemetryHeaders(payload.headers, forwardHeaders);
|
|
41
|
+
headers[MS_TARGET_URL] = payload.urlString;
|
|
42
|
+
headers[MS_CLIENT_REQUESTID] = randomUUID();
|
|
43
|
+
if (options.authToken) {
|
|
44
|
+
headers.Authorization = 'Bearer ' + options.authToken;
|
|
45
|
+
}
|
|
46
|
+
appendUserAgent(headers);
|
|
47
|
+
try {
|
|
48
|
+
const response = await globalThis.fetch(options.forwardUrl, {
|
|
49
|
+
method: 'POST',
|
|
50
|
+
headers,
|
|
51
|
+
body: payload.data,
|
|
52
|
+
signal: payload.timeout ? AbortSignal.timeout(payload.timeout) : undefined,
|
|
53
|
+
});
|
|
54
|
+
const responseHeaders = {};
|
|
55
|
+
response.headers.forEach((value, name) => {
|
|
56
|
+
responseHeaders[name] = value;
|
|
57
|
+
});
|
|
58
|
+
const oneDsStatus = response.ok && response.status !== 204 ? 200 : response.status;
|
|
59
|
+
oncomplete(oneDsStatus, responseHeaders, await response.text());
|
|
60
|
+
return true;
|
|
61
|
+
}
|
|
62
|
+
catch (error) {
|
|
63
|
+
oncomplete(0, {}, error instanceof Error ? error.message : String(error));
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
export function createOneDsHttpForwardOverride(options) {
|
|
68
|
+
const forwardHeaders = parseForwardHeaders(options.customForwardHeadersJson);
|
|
69
|
+
return {
|
|
70
|
+
sendPOST: (payload, oncomplete) => sendForwardedTelemetry(payload, oncomplete, options, forwardHeaders),
|
|
71
|
+
};
|
|
72
|
+
}
|
|
7
73
|
export class OneDSWriter {
|
|
8
74
|
_provider;
|
|
9
|
-
constructor(sessionId, region, telemetryLocation, environmentId, appId, geoLocation, cliVersion, cliSource) {
|
|
75
|
+
constructor(sessionId, region, telemetryLocation, environmentId, appId, geoLocation, cliVersion, cliSource, httpForwardOptions) {
|
|
10
76
|
const commonProperties = {
|
|
11
77
|
environmentId,
|
|
12
78
|
isOnePlayer: 'false',
|
|
@@ -24,6 +90,15 @@ export class OneDSWriter {
|
|
|
24
90
|
if (geoLocation) {
|
|
25
91
|
commonProperties.geoLocation = geoLocation;
|
|
26
92
|
}
|
|
93
|
+
const channelConfig = {
|
|
94
|
+
maxEvtPerBatch: 500,
|
|
95
|
+
maxEventRetryAttempts: 6,
|
|
96
|
+
eventsLimitInMem: 10000,
|
|
97
|
+
};
|
|
98
|
+
if (httpForwardOptions) {
|
|
99
|
+
channelConfig.httpXHROverride = createOneDsHttpForwardOverride(httpForwardOptions);
|
|
100
|
+
channelConfig.alwaysUseXhrOverride = true;
|
|
101
|
+
}
|
|
27
102
|
this._provider = new OneDsTelemetryProvider({
|
|
28
103
|
clientType: 'ManagedAppsCLI',
|
|
29
104
|
clusterCategory: regionToClusterCategory(region),
|
|
@@ -41,11 +116,7 @@ export class OneDSWriter {
|
|
|
41
116
|
// leaving it only inside the customDimensions blob.
|
|
42
117
|
embeddingHostCorrelationId: 'embeddingHostCorrelationId',
|
|
43
118
|
},
|
|
44
|
-
channelConfig
|
|
45
|
-
maxEvtPerBatch: 500,
|
|
46
|
-
maxEventRetryAttempts: 6,
|
|
47
|
-
eventsLimitInMem: 10000,
|
|
48
|
-
},
|
|
119
|
+
channelConfig,
|
|
49
120
|
});
|
|
50
121
|
this._provider.sessionId = sessionId;
|
|
51
122
|
// Sync 1DS session id with CLI session id in Part A extension
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OneDSWriter.js","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAe,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,mBAAmB,GAEpB,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"OneDSWriter.js","sourceRoot":"","sources":["../../src/Logger/OneDSWriter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAe,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAC/F,OAAO,EACL,sBAAsB,EACtB,eAAe,EACf,mBAAmB,GAEpB,MAAM,0CAA0C,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAE3F,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAQ/E,SAAS,eAAe,CAAC,OAA+B;IACtD,IAAI,iBAAiB,GAAG,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE,CAAC;YACxC,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClB,iBAAiB,GAAG,iBAAiB;oBACnC,CAAC,CAAC,GAAG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;oBACzC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACpB,CAAC;YACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,CAAC,YAAY,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,GAAG,iBAAiB,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;AAChG,CAAC;AAED,SAAS,8BAA8B,CACrC,cAA4D,EAC5D,cAAgD;IAEhD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,yBAAyB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAEnD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC,EAAE,CAAC;QACjE,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE,CAAC;YACxC,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChD,IAAI,YAAY,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;oBACtD,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;gBAC/B,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IACxB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,OAAqB,EACrB,UAA8B,EAC9B,OAAgC,EAChC,cAAgD;IAEhD,MAAM,OAAO,GAAG,8BAA8B,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAChF,OAAO,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC;IAC3C,OAAO,CAAC,mBAAmB,CAAC,GAAG,UAAU,EAAE,CAAC;IAC5C,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACtB,OAAO,CAAC,aAAa,GAAG,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACxD,CAAC;IACD,eAAe,CAAC,OAAO,CAAC,CAAC;IAEzB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE;YAC1D,MAAM,EAAE,MAAM;YACd,OAAO;YACP,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;SAC3E,CAAC,CAAC;QACH,MAAM,eAAe,GAA2B,EAAE,CAAC;QACnD,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACvC,eAAe,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;QACnF,UAAU,CAAC,WAAW,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1E,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,OAAgC;IAC7E,MAAM,cAAc,GAAG,mBAAmB,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC7E,OAAO;QACL,QAAQ,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAChC,sBAAsB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,CAAC;KACvE,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,WAAW;IACd,SAAS,CAAyB;IAE1C,YACE,SAAiB,EACjB,MAAc,EACd,iBAAoC,EACpC,aAAqB,EACrB,KAAa,EACb,WAA+B,EAC/B,UAAkB,EAClB,SAAiB,EACjB,kBAA4C;QAE5C,MAAM,gBAAgB,GAA2B;YAC/C,aAAa;YACb,WAAW,EAAE,OAAO;YACpB,iBAAiB,EAAE,2BAA2B;YAC9C,KAAK,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;YAC7C,gBAAgB,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC1C,OAAO,EAAE,SAAS;YAClB,iBAAiB;YACjB,UAAU;YACV,SAAS;SACV,CAAC;QAEF,IAAI,KAAK,EAAE,CAAC;YACV,gBAAgB,CAAC,WAAW,GAAG,KAAK,CAAC;QACvC,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,gBAAgB,CAAC,WAAW,GAAG,WAAW,CAAC;QAC7C,CAAC;QAED,MAAM,aAAa,GAA4B;YAC7C,cAAc,EAAE,GAAG;YACnB,qBAAqB,EAAE,CAAC;YACxB,gBAAgB,EAAE,KAAK;SACxB,CAAC;QACF,IAAI,kBAAkB,EAAE,CAAC;YACvB,aAAa,CAAC,eAAe,GAAG,8BAA8B,CAAC,kBAAkB,CAAC,CAAC;YACnF,aAAa,CAAC,oBAAoB,GAAG,IAAI,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAsB,CAAC;YAC1C,UAAU,EAAE,gBAAgB;YAC5B,eAAe,EAAE,uBAAuB,CAAC,MAAM,CAAC;YAChD,iBAAiB;YACjB,gBAAgB;YAChB,iBAAiB,EAAE;gBACjB,WAAW,EAAE,UAAU;gBACvB,WAAW,EAAE,UAAU;gBACvB,aAAa,EAAE,eAAe;gBAC9B,YAAY,EAAE,KAAK;gBACnB,MAAM,EAAE,YAAY;gBACpB,UAAU,EAAE,YAAY;gBACxB,uEAAuE;gBACvE,4EAA4E;gBAC5E,oDAAoD;gBACpD,0BAA0B,EAAE,4BAA4B;aACzD;YACD,aAAa;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;QAErC,8DAA8D;QAC9D,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC,QAAQ,EAAE,EAAE;YAClD,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;YAChD,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;YACtC,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,kBAAkB,CAAC,aAAqB,EAAE,SAAkB;QACjE,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,QAAQ,EAAE;YAC7C,GAAG,SAAS;YACZ,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAEM,eAAe,CAAC,aAAqB,EAAE,SAAkB;QAC9D,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,KAAK,EAAE;YAC1C,GAAG,SAAS;YACZ,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAEM,aAAa,CAAC,YAAoB,EAAE,SAAkB;QAC3D,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,aAAa,EAAE;YAClD,aAAa,EAAE,YAAY;YAC3B,GAAG,SAAS;YACZ,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAEM,gBAAgB,CAAC,YAAoB,EAAE,YAAqB;QACjE,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,gBAAgB,EAAE;YACrD,aAAa,EAAE,YAAY;YAC3B,GAAG,YAAY;YACf,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAEM,gBAAgB,CAAC,YAAoB,EAAE,YAAqB;QACjE,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,WAAW,EAAE;YAChD,aAAa,EAAE,YAAY;YAC3B,GAAG,YAAY;YACf,YAAY;YACZ,cAAc,EAAE,eAAe,CAAC,OAAO;SACxC,CAAC,CAAC;IACL,CAAC;IAEM,cAAc,CAAC,YAAoB,EAAE,WAAoB;QAC9D,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,WAAW,EAAE;YAChD,aAAa,EAAE,YAAY;YAC3B,GAAG,WAAW;YACd,YAAY;YACZ,cAAc,EAAE,eAAe,CAAC,MAAM;SACvC,CAAC,CAAC;IACL,CAAC;IAEM,0BAA0B,CAAC,YAAoB,EAAE,qBAA8B;QACpF,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,WAAW,EAAE;YAChD,aAAa,EAAE,YAAY;YAC3B,GAAG,qBAAqB;YACxB,YAAY;YACZ,cAAc,EAAE,eAAe,CAAC,iBAAiB;SAClD,CAAC,CAAC;IACL,CAAC;IAEM,KAAK;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAEM,kBAAkB,CAAC,IAAY,EAAE,MAAc;QACpD,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAEO,MAAM,CAAU,aAAa,GAAG,iBAAiB,CAAC;IAElD,WAAW,CAAC,SAAiB,EAAE,SAAiB;QACtD,MAAM,aAAa,GAAI,SAAwC,CAAC,aAAa,IAAI,EAAE,CAAC;QAEpF,MAAM,QAAQ,GAAG,2BAA2B,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QAElF,MAAM,UAAU,GAA8C,EAAE,CAAC;QACjE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;gBACzF,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAED,IAAI,aAAa,EAAE,CAAC;YAClB,UAAU,CAAC,aAAa,GAAG,GAAG,WAAW,CAAC,aAAa,GAAG,aAAa,EAAE,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YACnB,SAAS;YACT,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,QAAQ,EAAE,MAAM;YAChB,UAAU;SACX,CAAC,CAAC;IACL,CAAC"}
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
3
|
*/
|
|
4
|
-
interface DataverseDataSource {
|
|
5
|
-
entitySetName: string;
|
|
6
|
-
logicalName: string;
|
|
7
|
-
isHidden: boolean;
|
|
8
|
-
}
|
|
9
4
|
interface DataSet {
|
|
10
5
|
dataSources: Record<string, {
|
|
11
6
|
tableName?: string;
|
|
@@ -31,13 +26,5 @@ interface TabularMetadata {
|
|
|
31
26
|
datasetOverride?: string;
|
|
32
27
|
resourceNameOverride?: string;
|
|
33
28
|
}
|
|
34
|
-
|
|
35
|
-
state: string;
|
|
36
|
-
instanceUrl: string;
|
|
37
|
-
webApiVersion: string;
|
|
38
|
-
dataSources: Record<string, DataverseDataSource>;
|
|
39
|
-
version: string;
|
|
40
|
-
environmentVariableName: string;
|
|
41
|
-
}
|
|
42
|
-
export type { ConnectionReference, DatabaseReference, DataSet, DataverseDataSource, TabularMetadata, };
|
|
29
|
+
export type { ConnectionReference, DataSet, TabularMetadata };
|
|
43
30
|
//# sourceMappingURL=Datasource.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Datasource.types.d.ts","sourceRoot":"","sources":["../../src/Types/Datasource.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,UAAU,
|
|
1
|
+
{"version":3,"file":"Datasource.types.d.ts","sourceRoot":"","sources":["../../src/Types/Datasource.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,UAAU,OAAO;IACf,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,eAAe,CAAC,EAAE;QAAE,uBAAuB,EAAE,MAAM,CAAA;KAAE,CAAC;CACvD;AAED,UAAU,mBAAmB;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,iCAAiC,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACxD;AAED,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,YAAY,EAAE,mBAAmB,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC"}
|
|
@@ -5,7 +5,7 @@ import { getPlayerServiceConfig, updateEnvironmentName } from '@microsoft/manage
|
|
|
5
5
|
import { NotFoundError, UsageError } from '@microsoft/managed-apps-common/errors';
|
|
6
6
|
import { getUserRoutingEnvironmentAsync, ManagedGovernanceError, ManagedGovernanceTimeoutError, pollRoutingEnvironmentAsync, } from '@microsoft/managed-apps-common/services';
|
|
7
7
|
import { resolveEnvironmentId } from '../CliUtils.js';
|
|
8
|
-
import {
|
|
8
|
+
import { ENVIRONMENT_ROUTING_CLIENT_ID } from '../Constants.js';
|
|
9
9
|
import { printError, printInfo } from './ConsoleOutput.js';
|
|
10
10
|
export async function resolveRoutingEnvironmentIdAsync(resultPromise, httpClient, logger) {
|
|
11
11
|
// Translate routing-service errors into a UsageError so the user sees an actionable message
|
|
@@ -81,7 +81,7 @@ export function startPdeRoutingAsync(argumentProvider, tenantId, logger, telemet
|
|
|
81
81
|
const { trackBackgroundFailure = true } = options ?? {};
|
|
82
82
|
const httpClient = argumentProvider.getHttpClient();
|
|
83
83
|
const { region } = getPlayerServiceConfig();
|
|
84
|
-
const promise = resolveRoutingEnvironmentIdAsync(getUserRoutingEnvironmentAsync(httpClient, tenantId,
|
|
84
|
+
const promise = resolveRoutingEnvironmentIdAsync(getUserRoutingEnvironmentAsync(httpClient, tenantId, ENVIRONMENT_ROUTING_CLIENT_ID, { provisionDataverse: false }, region, logger), httpClient, logger);
|
|
85
85
|
if (trackBackgroundFailure) {
|
|
86
86
|
promise.catch((error) => {
|
|
87
87
|
logger.trackErrorEvent(`${telemetryNamespace}.RoutingEnvironmentBackgroundFailure`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentRoutingUtils.js","sourceRoot":"","sources":["../../src/Utils/EnvironmentRoutingUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAChG,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAKlF,OAAO,EACL,8BAA8B,EAC9B,sBAAsB,EACtB,6BAA6B,EAC7B,2BAA2B,GAC5B,MAAM,yCAAyC,CAAC;AAIjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"EnvironmentRoutingUtils.js","sourceRoot":"","sources":["../../src/Utils/EnvironmentRoutingUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,10 +76,10 @@ export declare function runAddTableFlowAsync(args: AddTableFlowArgs): Promise<vo
|
|
|
76
76
|
* Caller must have already verified the connector exists and passed the
|
|
77
77
|
* connector-policy preflight.
|
|
78
78
|
*
|
|
79
|
-
* A connection is only resolved when the connector requires one
|
|
80
|
-
*
|
|
81
|
-
*
|
|
82
|
-
* are added without prompting for
|
|
79
|
+
* A connection is only resolved when the connector requires one — i.e. it offers
|
|
80
|
+
* more than one authentication option, so a specific connection is needed to know
|
|
81
|
+
* which auth was chosen. Connectors with a single auth option (auth type persisted
|
|
82
|
+
* directly) or none are added without prompting for a connection.
|
|
83
83
|
*
|
|
84
84
|
* When `policy` is provided, the action-level rules for this connector are
|
|
85
85
|
* passed down to `addConnectorActionAsync`, which filters blocked operations
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddConnectorFlows.d.ts","sourceRoot":"","sources":["../../src/Verbs/AddConnectorFlows.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAGV,GAAG,EACH,4BAA4B,EAG7B,MAAM,iCAAiC,CAAC;AAWzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AA6B5D;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,WAAW,eAAe;IAC9B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,SAAS,EAAE,GAAG,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD;;;;OAIG;IACH,MAAM,CAAC,EAAE,4BAA4B,CAAC;IACtC;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgJhF;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"AddConnectorFlows.d.ts","sourceRoot":"","sources":["../../src/Verbs/AddConnectorFlows.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAGV,GAAG,EACH,4BAA4B,EAG7B,MAAM,iCAAiC,CAAC;AAWzC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AA6B5D;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,WAAW,eAAe;IAC9B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,SAAS,EAAE,GAAG,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD;;;;OAIG;IACH,MAAM,CAAC,EAAE,4BAA4B,CAAC;IACtC;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgJhF;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiIlF;AAwDD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,GAAG,GAAG,OAAO,CAE1D"}
|
|
@@ -140,10 +140,10 @@ export async function runAddTableFlowAsync(args) {
|
|
|
140
140
|
* Caller must have already verified the connector exists and passed the
|
|
141
141
|
* connector-policy preflight.
|
|
142
142
|
*
|
|
143
|
-
* A connection is only resolved when the connector requires one
|
|
144
|
-
*
|
|
145
|
-
*
|
|
146
|
-
* are added without prompting for
|
|
143
|
+
* A connection is only resolved when the connector requires one — i.e. it offers
|
|
144
|
+
* more than one authentication option, so a specific connection is needed to know
|
|
145
|
+
* which auth was chosen. Connectors with a single auth option (auth type persisted
|
|
146
|
+
* directly) or none are added without prompting for a connection.
|
|
147
147
|
*
|
|
148
148
|
* When `policy` is provided, the action-level rules for this connector are
|
|
149
149
|
* passed down to `addConnectorActionAsync`, which filters blocked operations
|
|
@@ -159,9 +159,12 @@ export async function runAddActionFlowAsync(args) {
|
|
|
159
159
|
const playerServiceConfig = getPlayerServiceConfig();
|
|
160
160
|
const authProvider = argumentProvider.getAuthenticationProvider();
|
|
161
161
|
const logger = getCliLogger();
|
|
162
|
-
// ── Step 1: Does this connector require a connection?
|
|
163
|
-
|
|
164
|
-
|
|
162
|
+
// ── Step 1: Does this connector require a connection instance? ────────────
|
|
163
|
+
// Only connectors offering more than one authentication option need a specific
|
|
164
|
+
// connection to disambiguate which auth was chosen. A connector with a single
|
|
165
|
+
// auth option is unambiguous (its auth type is persisted without a connection),
|
|
166
|
+
// and a connector with none needs no connection at all.
|
|
167
|
+
const needsConnection = (connector.properties.connectionParameterSets?.values?.length ?? 0) > 1;
|
|
165
168
|
// ── Step 2: Connection resolution ─────────────────────────────────────────
|
|
166
169
|
let connectionId = connectionIdFlag;
|
|
167
170
|
if (needsConnection && !connectionId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddConnectorFlows.js","sourceRoot":"","sources":["../../src/Verbs/AddConnectorFlows.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AddConnectorFlows.js","sourceRoot":"","sources":["../../src/Verbs/AddConnectorFlows.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddFlow.d.ts","sourceRoot":"","sources":["../../src/Verbs/AddFlow.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"AddFlow.d.ts","sourceRoot":"","sources":["../../src/Verbs/AddFlow.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAO5D;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCpF"}
|
package/dist/Verbs/AddFlow.js
CHANGED
|
@@ -5,7 +5,6 @@ import { addFlowAsync as addFlowActionAsync, getPlayerServiceConfig, } from '@mi
|
|
|
5
5
|
import { getCliLogger, getSettings } from '../CliSettings.js';
|
|
6
6
|
import { createDefaultStringOption } from '../CliUtils.js';
|
|
7
7
|
import { HelpStrings } from '../Constants/HelpStrings.js';
|
|
8
|
-
import { CliFS } from '../FS/CliFs.js';
|
|
9
8
|
import { printError, printSuccess } from '../Utils/ConsoleOutput.js';
|
|
10
9
|
import { AddFlowArguments } from './VerbConstants.js';
|
|
11
10
|
/**
|
|
@@ -16,14 +15,9 @@ import { AddFlowArguments } from './VerbConstants.js';
|
|
|
16
15
|
*/
|
|
17
16
|
export async function addFlowAsync(argumentProvider) {
|
|
18
17
|
const settings = getSettings();
|
|
19
|
-
const { fileConfig } = settings;
|
|
18
|
+
const { fileConfig, cliFs } = settings;
|
|
20
19
|
createOptionSchema(argumentProvider);
|
|
21
20
|
await argumentProvider.runVerb();
|
|
22
|
-
const cliFs = new CliFS({
|
|
23
|
-
cwd: process.cwd(),
|
|
24
|
-
allowCwdRead: true,
|
|
25
|
-
allowCwdWrite: true,
|
|
26
|
-
});
|
|
27
21
|
const playerServiceConfig = getPlayerServiceConfig();
|
|
28
22
|
const authenticationProvider = argumentProvider.getAuthenticationProvider();
|
|
29
23
|
const flowId = await argumentProvider.getOption('flowId');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddFlow.js","sourceRoot":"","sources":["../../src/Verbs/AddFlow.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,YAAY,IAAI,kBAAkB,EAClC,sBAAsB,GACvB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AddFlow.js","sourceRoot":"","sources":["../../src/Verbs/AddFlow.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACL,YAAY,IAAI,kBAAkB,EAClC,sBAAsB,GACvB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,gBAAkC;IACnE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;IACvC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IACrC,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAEjC,MAAM,mBAAmB,GAAG,sBAAsB,EAAE,CAAC;IACrD,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,yBAAyB,EAAE,CAAC;IAE5E,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,SAAS,CAAS,QAAQ,CAAC,CAAC;IAElE,MAAM,OAAO,GAAmB;QAC9B,GAAG,EAAE,KAAK;QACV,YAAY,EAAE,sBAAsB;QACpC,UAAU,EAAE,gBAAgB,CAAC,aAAa,EAAE;QAC5C,MAAM,EAAE,mBAAmB,CAAC,MAAM;QAClC,eAAe,EAAE,mBAAmB,CAAC,eAAe;QACpD,aAAa,EAAE;YACb,MAAM;SACP;QACD,cAAc,EAAE;YACd,aAAa,EAAE,UAAU,CAAC,aAAa;YACvC,UAAU,EAAE,UAAU,CAAC,UAAU;YACjC,WAAW,EAAE,UAAU,CAAC,WAAW;SACpC;QACD,MAAM,EAAE,YAAY,EAAE;KACvB,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAEjD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,YAAY,CAAC,4BAA4B,CAAC,CAAC;IAC7C,CAAC;SAAM,CAAC;QACN,UAAU,CAAC,yBAAyB,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,gBAAkC;IAC5D,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,CAAC;IACtF,gBAAgB,CAAC,UAAU,CAAC;QAC1B,yBAAyB,CAAC;YACxB,KAAK,EAAE;gBACL,GAAG,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI;gBACjC,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC,KAAK;aACrC;YACD,GAAG,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM;YACnC,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,aAAa;YAC9C,WAAW,EAAE,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,MAAM;SACrE,CAAC;KACH,CAAC,CAAC;AACL,CAAC"}
|
package/dist/Verbs/Dev.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dev.d.ts","sourceRoot":"","sources":["../../src/Verbs/Dev.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"Dev.d.ts","sourceRoot":"","sources":["../../src/Verbs/Dev.ts"],"names":[],"mappings":"AAAA;;GAEG;AAeH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAW5D,wBAAsB,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwChF"}
|
package/dist/Verbs/Dev.js
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { spawn } from 'node:child_process';
|
|
5
5
|
import { createRequire } from 'node:module';
|
|
6
|
+
import * as path from 'node:path';
|
|
6
7
|
import { setTimeout as delay } from 'node:timers/promises';
|
|
7
8
|
import { pathToFileURL } from 'node:url';
|
|
8
9
|
import { styleText } from 'node:util';
|
|
@@ -11,7 +12,6 @@ import { cloudToRegionSafe, createMaafAppDevUrl } from '@microsoft/managed-apps-
|
|
|
11
12
|
import * as fs from 'fs';
|
|
12
13
|
import * as http from 'http';
|
|
13
14
|
import { getSettings } from '../CliSettings.js';
|
|
14
|
-
import { WORKING_DIRECTORY } from '../Constants.js';
|
|
15
15
|
import { HelpStrings } from '../Constants/HelpStrings.js';
|
|
16
16
|
import { ConfigurationError } from '../Errors/CliError.js';
|
|
17
17
|
import { printError, printInfo, printWarning } from '../Utils/ConsoleOutput.js';
|
|
@@ -22,6 +22,7 @@ const VITE_PLUGIN_NAMES = ['powerApps', 'managedApps'];
|
|
|
22
22
|
export async function devAsync(argumentProvider) {
|
|
23
23
|
const settings = getSettings();
|
|
24
24
|
const { appConfig, fileConfig } = settings;
|
|
25
|
+
const appRoot = path.dirname(fileConfig.appConfigPath);
|
|
25
26
|
createOptionSchema(argumentProvider, appConfig?.localAppUrl);
|
|
26
27
|
await argumentProvider.runVerb();
|
|
27
28
|
const configOnly = await argumentProvider.getOption('configOnly');
|
|
@@ -29,22 +30,22 @@ export async function devAsync(argumentProvider) {
|
|
|
29
30
|
process.once('SIGINT', () => ac.abort());
|
|
30
31
|
process.once('SIGTERM', () => ac.abort());
|
|
31
32
|
if (configOnly) {
|
|
32
|
-
if (await isUsingVitePlugin(
|
|
33
|
+
if (await isUsingVitePlugin(appRoot)) {
|
|
33
34
|
printWarning('Warning: --config-only is not needed when using the vite plugin. The plugin already serves the config and prints the play URL.');
|
|
34
35
|
}
|
|
35
36
|
await runConfigServerAsync(argumentProvider, fileConfig.appConfigPath, appConfig, ac.signal);
|
|
36
37
|
return;
|
|
37
38
|
}
|
|
38
|
-
const pkg = readPackageJson(
|
|
39
|
+
const pkg = readPackageJson(appRoot);
|
|
39
40
|
if (!pkg.scripts?.dev) {
|
|
40
41
|
throw new ConfigurationError('No "dev" script found in package.json. Add a "dev" script to start your app.');
|
|
41
42
|
}
|
|
42
|
-
if (await isUsingVitePlugin(
|
|
43
|
-
await runDevScriptAsync(
|
|
43
|
+
if (await isUsingVitePlugin(appRoot)) {
|
|
44
|
+
await runDevScriptAsync(appRoot, ac.signal, pkg);
|
|
44
45
|
return;
|
|
45
46
|
}
|
|
46
47
|
await Promise.all([
|
|
47
|
-
runDevScriptAsync(
|
|
48
|
+
runDevScriptAsync(appRoot, ac.signal, pkg),
|
|
48
49
|
runConfigServerAsync(argumentProvider, fileConfig.appConfigPath, appConfig, ac.signal),
|
|
49
50
|
]);
|
|
50
51
|
}
|
|
@@ -172,6 +173,7 @@ async function waitForAppUrl(appUrl, signal, pollInterval = 300, timeout = 10_00
|
|
|
172
173
|
try {
|
|
173
174
|
// Raw fetch is intentional: this probes the user's local dev server, not a
|
|
174
175
|
// Power Platform endpoint, so it must not be routed through CliHttpClient's forward mode.
|
|
176
|
+
// eslint-disable-next-line no-restricted-globals
|
|
175
177
|
const response = await fetch(appUrl, { method: 'HEAD' });
|
|
176
178
|
if (response.ok || response.status < 500)
|
|
177
179
|
return;
|
package/dist/Verbs/Dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dev.js","sourceRoot":"","sources":["../../src/Verbs/Dev.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACjG,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Dev.js","sourceRoot":"","sources":["../../src/Verbs/Dev.ts"],"names":[],"mappings":"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"}
|