@microsoft/power-apps-cli 0.6.0 → 0.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/ArgumentProvider.d.ts +4 -9
- package/lib/ArgumentProvider.d.ts.map +1 -1
- package/lib/ArgumentProvider.js +8 -23
- package/lib/ArgumentProvider.js.map +1 -1
- package/lib/Authentication/NodeMsalAuthenticationProvider.d.ts +3 -0
- package/lib/Authentication/NodeMsalAuthenticationProvider.d.ts.map +1 -1
- package/lib/Authentication/NodeMsalAuthenticationProvider.js +5 -0
- package/lib/Authentication/NodeMsalAuthenticationProvider.js.map +1 -1
- package/lib/Authentication/ServicePrincipalAuthenticationProvider.d.ts +3 -1
- package/lib/Authentication/ServicePrincipalAuthenticationProvider.d.ts.map +1 -1
- package/lib/Authentication/ServicePrincipalAuthenticationProvider.js +4 -2
- package/lib/Authentication/ServicePrincipalAuthenticationProvider.js.map +1 -1
- package/lib/Cli.d.ts +3 -0
- package/lib/Cli.d.ts.map +1 -1
- package/lib/Cli.js +27 -14
- package/lib/Cli.js.map +1 -1
- package/lib/CliUtils.d.ts +1 -1
- package/lib/CliUtils.d.ts.map +1 -1
- package/lib/CliUtils.js +36 -9
- package/lib/CliUtils.js.map +1 -1
- package/lib/Types/Cli.types.d.ts +1 -0
- package/lib/Types/Cli.types.d.ts.map +1 -1
- package/lib/Verbs/AddDataSource.d.ts +2 -1
- package/lib/Verbs/AddDataSource.d.ts.map +1 -1
- package/lib/Verbs/AddDataSource.js +1 -3
- package/lib/Verbs/AddDataSource.js.map +1 -1
- package/lib/Verbs/DeleteDataSource.d.ts +2 -1
- package/lib/Verbs/DeleteDataSource.d.ts.map +1 -1
- package/lib/Verbs/DeleteDataSource.js +1 -3
- package/lib/Verbs/DeleteDataSource.js.map +1 -1
- package/lib/Verbs/Init.d.ts.map +1 -1
- package/lib/Verbs/Init.js +1 -1
- package/lib/Verbs/Init.js.map +1 -1
- package/lib/Verbs/ListConnectionReferences.d.ts +2 -1
- package/lib/Verbs/ListConnectionReferences.d.ts.map +1 -1
- package/lib/Verbs/ListConnectionReferences.js +1 -3
- package/lib/Verbs/ListConnectionReferences.js.map +1 -1
- package/lib/Verbs/ListDatasets.d.ts +2 -1
- package/lib/Verbs/ListDatasets.d.ts.map +1 -1
- package/lib/Verbs/ListDatasets.js +1 -3
- package/lib/Verbs/ListDatasets.js.map +1 -1
- package/lib/Verbs/ListEnvironmentVariables.d.ts +2 -1
- package/lib/Verbs/ListEnvironmentVariables.d.ts.map +1 -1
- package/lib/Verbs/ListEnvironmentVariables.js +1 -3
- package/lib/Verbs/ListEnvironmentVariables.js.map +1 -1
- package/lib/Verbs/ListSqlStoredProcedures.d.ts +2 -1
- package/lib/Verbs/ListSqlStoredProcedures.d.ts.map +1 -1
- package/lib/Verbs/ListSqlStoredProcedures.js +1 -3
- package/lib/Verbs/ListSqlStoredProcedures.js.map +1 -1
- package/lib/Verbs/ListTables.d.ts +2 -1
- package/lib/Verbs/ListTables.d.ts.map +1 -1
- package/lib/Verbs/ListTables.js +1 -3
- package/lib/Verbs/ListTables.js.map +1 -1
- package/lib/Verbs/Push.d.ts +2 -1
- package/lib/Verbs/Push.d.ts.map +1 -1
- package/lib/Verbs/Push.js +1 -2
- package/lib/Verbs/Push.js.map +1 -1
- package/lib/__tests__/UnitTests/CliUtils.spec.d.ts +5 -0
- package/lib/__tests__/UnitTests/CliUtils.spec.d.ts.map +1 -0
- package/lib/__tests__/UnitTests/CliUtils.spec.js +94 -0
- package/lib/__tests__/UnitTests/CliUtils.spec.js.map +1 -0
- package/lib/__tests__/UnitTests/ListEnvironmentVariables.spec.js +2 -2
- package/lib/__tests__/UnitTests/ListEnvironmentVariables.spec.js.map +1 -1
- package/lib-cjs/ArgumentProvider.d.ts +4 -9
- package/lib-cjs/ArgumentProvider.d.ts.map +1 -1
- package/lib-cjs/ArgumentProvider.js +10 -28
- package/lib-cjs/ArgumentProvider.js.map +1 -1
- package/lib-cjs/Authentication/NodeMsalAuthenticationProvider.d.ts +3 -0
- package/lib-cjs/Authentication/NodeMsalAuthenticationProvider.d.ts.map +1 -1
- package/lib-cjs/Authentication/NodeMsalAuthenticationProvider.js +5 -1
- package/lib-cjs/Authentication/NodeMsalAuthenticationProvider.js.map +1 -1
- package/lib-cjs/Authentication/ServicePrincipalAuthenticationProvider.d.ts +3 -1
- package/lib-cjs/Authentication/ServicePrincipalAuthenticationProvider.d.ts.map +1 -1
- package/lib-cjs/Authentication/ServicePrincipalAuthenticationProvider.js +5 -2
- package/lib-cjs/Authentication/ServicePrincipalAuthenticationProvider.js.map +1 -1
- package/lib-cjs/Cli.d.ts +3 -0
- package/lib-cjs/Cli.d.ts.map +1 -1
- package/lib-cjs/Cli.js +59 -43
- package/lib-cjs/Cli.js.map +1 -1
- package/lib-cjs/CliUtils.d.ts +1 -1
- package/lib-cjs/CliUtils.d.ts.map +1 -1
- package/lib-cjs/CliUtils.js +38 -11
- package/lib-cjs/CliUtils.js.map +1 -1
- package/lib-cjs/Types/Cli.types.d.ts +1 -0
- package/lib-cjs/Types/Cli.types.d.ts.map +1 -1
- package/lib-cjs/Verbs/AddDataSource.d.ts +2 -1
- package/lib-cjs/Verbs/AddDataSource.d.ts.map +1 -1
- package/lib-cjs/Verbs/AddDataSource.js +2 -3
- package/lib-cjs/Verbs/AddDataSource.js.map +1 -1
- package/lib-cjs/Verbs/DeleteDataSource.d.ts +2 -1
- package/lib-cjs/Verbs/DeleteDataSource.d.ts.map +1 -1
- package/lib-cjs/Verbs/DeleteDataSource.js +2 -3
- package/lib-cjs/Verbs/DeleteDataSource.js.map +1 -1
- package/lib-cjs/Verbs/Init.d.ts.map +1 -1
- package/lib-cjs/Verbs/Init.js +9 -11
- package/lib-cjs/Verbs/Init.js.map +1 -1
- package/lib-cjs/Verbs/ListConnectionReferences.d.ts +2 -1
- package/lib-cjs/Verbs/ListConnectionReferences.d.ts.map +1 -1
- package/lib-cjs/Verbs/ListConnectionReferences.js +2 -3
- package/lib-cjs/Verbs/ListConnectionReferences.js.map +1 -1
- package/lib-cjs/Verbs/ListDatasets.d.ts +2 -1
- package/lib-cjs/Verbs/ListDatasets.d.ts.map +1 -1
- package/lib-cjs/Verbs/ListDatasets.js +2 -3
- package/lib-cjs/Verbs/ListDatasets.js.map +1 -1
- package/lib-cjs/Verbs/ListEnvironmentVariables.d.ts +2 -1
- package/lib-cjs/Verbs/ListEnvironmentVariables.d.ts.map +1 -1
- package/lib-cjs/Verbs/ListEnvironmentVariables.js +2 -3
- package/lib-cjs/Verbs/ListEnvironmentVariables.js.map +1 -1
- package/lib-cjs/Verbs/ListSqlStoredProcedures.d.ts +2 -1
- package/lib-cjs/Verbs/ListSqlStoredProcedures.d.ts.map +1 -1
- package/lib-cjs/Verbs/ListSqlStoredProcedures.js +2 -3
- package/lib-cjs/Verbs/ListSqlStoredProcedures.js.map +1 -1
- package/lib-cjs/Verbs/ListTables.d.ts +2 -1
- package/lib-cjs/Verbs/ListTables.d.ts.map +1 -1
- package/lib-cjs/Verbs/ListTables.js +2 -3
- package/lib-cjs/Verbs/ListTables.js.map +1 -1
- package/lib-cjs/Verbs/Push.d.ts +2 -1
- package/lib-cjs/Verbs/Push.d.ts.map +1 -1
- package/lib-cjs/Verbs/Push.js +2 -3
- package/lib-cjs/Verbs/Push.js.map +1 -1
- package/lib-cjs/__tests__/UnitTests/CliUtils.spec.d.ts +4 -0
- package/lib-cjs/__tests__/UnitTests/CliUtils.spec.d.ts.map +1 -0
- package/lib-cjs/__tests__/UnitTests/CliUtils.spec.js +97 -0
- package/lib-cjs/__tests__/UnitTests/CliUtils.spec.js.map +1 -0
- package/lib-cjs/__tests__/UnitTests/ListEnvironmentVariables.spec.js +2 -2
- package/lib-cjs/__tests__/UnitTests/ListEnvironmentVariables.spec.js.map +1 -1
- package/node_modules/@microsoft/powerapps-data/package.json +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/package.json +1 -1
- package/node_modules/@pa-client/powerapps-player-services/package.json +69 -69
- package/package.json +1 -1
|
@@ -75,12 +75,9 @@ var BuildVerbDescriptionTable_1 = require("./Utils/BuildVerbDescriptionTable");
|
|
|
75
75
|
// eslint-disable-next-line @typescript-eslint/no-require-imports, no-external-vars, @typescript-eslint/no-var-requires
|
|
76
76
|
var packageJson = require('../package.json');
|
|
77
77
|
var ArgumentProvider = /** @class */ (function () {
|
|
78
|
-
function ArgumentProvider(
|
|
78
|
+
function ArgumentProvider() {
|
|
79
79
|
var _this = this;
|
|
80
80
|
var _a, _b;
|
|
81
|
-
this._httpClient = _httpClient;
|
|
82
|
-
this._logger = _logger;
|
|
83
|
-
this._authenticationProvider = _authenticationProvider;
|
|
84
81
|
this._options = {};
|
|
85
82
|
this._verb = (process.argv[2] || process.env.VERB);
|
|
86
83
|
this._program = new commander_1.Command();
|
|
@@ -134,14 +131,6 @@ var ArgumentProvider = /** @class */ (function () {
|
|
|
134
131
|
description: HelpStrings_1.HelpStrings.Global.EnvironmentId,
|
|
135
132
|
}));
|
|
136
133
|
}
|
|
137
|
-
(0, powerapps_player_services_1.initializePlayerServices)({
|
|
138
|
-
httpClient: this._httpClient,
|
|
139
|
-
logger: this._logger,
|
|
140
|
-
// Default region is 'prod' if not specified
|
|
141
|
-
region: this._region || 'prod',
|
|
142
|
-
// Do a temporary variable
|
|
143
|
-
environmentName: this._environmentId || 'default',
|
|
144
|
-
});
|
|
145
134
|
}
|
|
146
135
|
ArgumentProvider.prototype.addSwitch = function (cliOption) {
|
|
147
136
|
this._createOption(cliOption, false);
|
|
@@ -231,9 +220,6 @@ var ArgumentProvider = /** @class */ (function () {
|
|
|
231
220
|
});
|
|
232
221
|
});
|
|
233
222
|
};
|
|
234
|
-
ArgumentProvider.prototype.getAuthenticationProvider = function () {
|
|
235
|
-
return this._authenticationProvider;
|
|
236
|
-
};
|
|
237
223
|
/**
|
|
238
224
|
* Sets the description for the current command context.
|
|
239
225
|
* This is used to display help information specific to the verb being executed.
|
|
@@ -246,13 +232,19 @@ var ArgumentProvider = /** @class */ (function () {
|
|
|
246
232
|
ArgumentProvider.prototype.getEnvironmentId = function () {
|
|
247
233
|
return this._environmentId;
|
|
248
234
|
};
|
|
235
|
+
ArgumentProvider.prototype.getRegion = function () {
|
|
236
|
+
return this._region;
|
|
237
|
+
};
|
|
238
|
+
ArgumentProvider.prototype.setRegion = function (region) {
|
|
239
|
+
this._region = region;
|
|
240
|
+
};
|
|
249
241
|
ArgumentProvider.prototype._getRequiredVariables = function () {
|
|
250
242
|
return __awaiter(this, void 0, void 0, function () {
|
|
251
|
-
var environmentId
|
|
243
|
+
var environmentId;
|
|
252
244
|
return __generator(this, function (_a) {
|
|
253
245
|
switch (_a.label) {
|
|
254
246
|
case 0:
|
|
255
|
-
if (!(this._verb !== 'telemetry')) return [3 /*break*/,
|
|
247
|
+
if (!(this._verb !== 'telemetry')) return [3 /*break*/, 2];
|
|
256
248
|
if (!!this._environmentId) return [3 /*break*/, 2];
|
|
257
249
|
return [4 /*yield*/, this.getOption('environmentId')];
|
|
258
250
|
case 1:
|
|
@@ -262,17 +254,7 @@ var ArgumentProvider = /** @class */ (function () {
|
|
|
262
254
|
(0, powerapps_player_services_1.updateEnvironmentName)(this._environmentId);
|
|
263
255
|
}
|
|
264
256
|
_a.label = 2;
|
|
265
|
-
case 2:
|
|
266
|
-
if (!!this._region) return [3 /*break*/, 4];
|
|
267
|
-
return [4 /*yield*/, this.getOption('region')];
|
|
268
|
-
case 3:
|
|
269
|
-
region = _a.sent();
|
|
270
|
-
if (region) {
|
|
271
|
-
this._region = region;
|
|
272
|
-
(0, powerapps_player_services_1.updateRegion)(region);
|
|
273
|
-
}
|
|
274
|
-
_a.label = 4;
|
|
275
|
-
case 4: return [2 /*return*/];
|
|
257
|
+
case 2: return [2 /*return*/];
|
|
276
258
|
}
|
|
277
259
|
});
|
|
278
260
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArgumentProvider.js","sourceRoot":"","sources":["../src/ArgumentProvider.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAoC;AAEpC,0CAA0C;
|
|
1
|
+
{"version":3,"file":"ArgumentProvider.js","sourceRoot":"","sources":["../src/ArgumentProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,12 @@
|
|
|
2
2
|
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
3
|
*/
|
|
4
4
|
import { IAuthenticationProvider } from '../Types/Cli.types';
|
|
5
|
+
import { Region } from '@pa-client/powerapps-player-services';
|
|
5
6
|
export declare class NodeMsalAuthenticationProvider implements IAuthenticationProvider {
|
|
6
7
|
private _msalClient;
|
|
7
8
|
private _tenantId;
|
|
9
|
+
private _region;
|
|
10
|
+
constructor(region?: Region | undefined);
|
|
8
11
|
initAsync(): Promise<void>;
|
|
9
12
|
getAccessTokenForResource(resource: string): Promise<string>;
|
|
10
13
|
getUserTenantId(): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeMsalAuthenticationProvider.d.ts","sourceRoot":"","sources":["../../src/Authentication/NodeMsalAuthenticationProvider.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"NodeMsalAuthenticationProvider.d.ts","sourceRoot":"","sources":["../../src/Authentication/NodeMsalAuthenticationProvider.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAI7D,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAG9D,qBAAa,8BAA+B,YAAW,uBAAuB;IAC5E,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,OAAO,CAAqB;gBAEjB,MAAM,GAAE,MAAM,GAAG,SAAqB;IAI5C,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB1B,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMlE,eAAe,IAAI,MAAM,GAAG,SAAS;YAI9B,qBAAqB;IAiCnC,OAAO,CAAC,2BAA2B;CAepC"}
|
|
@@ -47,8 +47,11 @@ var msal_node_1 = require("@azure/msal-node");
|
|
|
47
47
|
var msal_node_extensions_1 = require("@azure/msal-node-extensions");
|
|
48
48
|
var open_1 = __importDefault(require("open"));
|
|
49
49
|
var Constants_1 = require("../Constants");
|
|
50
|
+
var CliUtils_1 = require("../CliUtils");
|
|
50
51
|
var NodeMsalAuthenticationProvider = /** @class */ (function () {
|
|
51
|
-
function NodeMsalAuthenticationProvider() {
|
|
52
|
+
function NodeMsalAuthenticationProvider(region) {
|
|
53
|
+
if (region === void 0) { region = undefined; }
|
|
54
|
+
this._region = region;
|
|
52
55
|
}
|
|
53
56
|
NodeMsalAuthenticationProvider.prototype.initAsync = function () {
|
|
54
57
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -68,6 +71,7 @@ var NodeMsalAuthenticationProvider = /** @class */ (function () {
|
|
|
68
71
|
persistence = _a.sent();
|
|
69
72
|
authConfig = {
|
|
70
73
|
auth: {
|
|
74
|
+
authority: (0, CliUtils_1.getAuthority)(this._region, this._tenantId),
|
|
71
75
|
clientId: '9cee029c-6210-4654-90bb-17e6e9d36617',
|
|
72
76
|
},
|
|
73
77
|
cache: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeMsalAuthenticationProvider.js","sourceRoot":"","sources":["../../src/Authentication/NodeMsalAuthenticationProvider.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,8CAM0B;AAE1B,oEAA8G;AAC9G,8CAAwB;AACxB,0CAAoD;AAEpD;
|
|
1
|
+
{"version":3,"file":"NodeMsalAuthenticationProvider.js","sourceRoot":"","sources":["../../src/Authentication/NodeMsalAuthenticationProvider.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,8CAM0B;AAE1B,oEAA8G;AAC9G,8CAAwB;AACxB,0CAAoD;AAEpD,wCAA2C;AAE3C;IAKE,wCAAmB,MAAsC;QAAtC,uBAAA,EAAA,kBAAsC;QACvD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAEY,kDAAS,GAAtB;;;;;;wBACQ,wBAAwB,GAAG;4BAC/B,SAAS,EAAE,gCAAoB,GAAG,kBAAkB;4BACpD,mBAAmB,EAAE,0CAAmB,CAAC,WAAW;4BACpD,WAAW,EAAE,YAAY;4BACzB,WAAW,EAAE,YAAY;4BACzB,uBAAuB,EAAE,KAAK;yBAC/B,CAAC;wBAEkB,qBAAM,yCAAkB,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,EAAA;;wBAAlF,WAAW,GAAG,SAAoE;wBAElF,UAAU,GAAkB;4BAChC,IAAI,EAAE;gCACJ,SAAS,EAAE,IAAA,uBAAY,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;gCACrD,QAAQ,EAAE,sCAAsC;6BACjD;4BACD,KAAK,EAAE;gCACL,WAAW,EAAE,IAAI,6CAAsB,CAAC,WAAW,CAAC;6BACrD;yBACF,CAAC;wBAEF,IAAI,CAAC,WAAW,GAAG,IAAI,mCAAuB,CAAC,UAAU,CAAC,CAAC;;;;;KAC5D;IAEY,kEAAyB,GAAtC,UAAuC,QAAgB;;;;;4BACtC,qBAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,WAAW,CAAC,EAAA;;wBAAjE,MAAM,GAAG,SAAwD;wBACvE,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;wBACjC,sBAAO,MAAM,CAAC,WAAW,EAAC;;;;KAC3B;IAEM,wDAAe,GAAtB;QACE,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEa,8DAAqB,GAAnC,UAAoC,QAAgB;;;;;;wBAClD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;4BACrB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;yBACvD;wBAEgB,qBAAM,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,cAAc,EAAE,EAAA;;wBAAlE,QAAQ,GAAG,SAAuD;6BACpE,CAAA,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAA,EAArB,wBAAqB;wBACjB,aAAa,GAAG;4BACpB,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;4BACpB,MAAM,EAAE,CAAC,QAAQ,CAAC;yBACnB,CAAC;;;;wBAGe,qBAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,aAAa,CAAC,EAAA;;wBAAjE,MAAM,GAAG,SAAwD;wBACvE,sBAAO,MAAM,EAAC;;;wBAEd,IAAI,OAAK,YAAY,wCAA4B,EAAE;4BACjD,sBAAO,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,EAAC;yBAC7F;wBACD,MAAM,OAAK,CAAC;;;wBAET,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC9B,QAAQ,CAAC,OAAO,CAAC,UAAC,OAAO;gCACvB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;4BAChC,CAAC,CAAC,CAAC;4BACH,sBAAO,OAAO,CAAC,MAAM,CACnB,qFAAqF,CACtF,EAAC;yBACH;6BAAM;4BACL,sBAAO,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,EAAC;yBAC7F;;;;;;KACF;IAEO,oEAA2B,GAAnC,UAAoC,QAAgB;QAApD,iBAcC;QAbC,IAAM,WAAW,GAAG,UAAO,GAAW;;;;;;wBAElC,qBAAM,IAAA,cAAI,EAAC,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAA;;wBAAhC,SAAgC,CAAC;;;;wBAEjC,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,OAAK,CAAC,CAAC;;;;;aAEnD,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,CAAC,QAAQ,CAAC;YAClB,WAAW,aAAA;YACX,eAAe,EAAE,gCAAgC;SAClD,CAAC;IACJ,CAAC;IACH,qCAAC;AAAD,CAAC,AA3FD,IA2FC;AA3FY,wEAA8B"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
3
|
*/
|
|
4
4
|
import { IAuthenticationProvider } from '../Types/Cli.types';
|
|
5
|
+
import { Region } from '@pa-client/powerapps-player-services';
|
|
5
6
|
/**
|
|
6
7
|
* note: This is meant for use in CI only since it hardcodes the authority & tenant ID.
|
|
7
8
|
*/
|
|
@@ -10,7 +11,8 @@ export declare class ServicePrincipalAuthenticationProvider implements IAuthenti
|
|
|
10
11
|
private _clientId;
|
|
11
12
|
private _clientSecret;
|
|
12
13
|
private _tenantId;
|
|
13
|
-
|
|
14
|
+
private _region;
|
|
15
|
+
constructor(region?: Region | undefined);
|
|
14
16
|
initAsync(): Promise<void>;
|
|
15
17
|
getAccessTokenForResource(resource: string): Promise<string>;
|
|
16
18
|
getUserTenantId(): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServicePrincipalAuthenticationProvider.d.ts","sourceRoot":"","sources":["../../src/Authentication/ServicePrincipalAuthenticationProvider.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ServicePrincipalAuthenticationProvider.d.ts","sourceRoot":"","sources":["../../src/Authentication/ServicePrincipalAuthenticationProvider.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAG9D;;GAEG;AACH,qBAAa,sCAAuC,YAAW,uBAAuB;IACpF,OAAO,CAAC,WAAW,CAA4C;IAC/D,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAqB;gBAExB,MAAM,GAAE,MAAM,GAAG,SAAqB;IAYrC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAY1B,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBlE,eAAe,IAAI,MAAM,GAAG,SAAS;CAG7C"}
|
|
@@ -41,17 +41,20 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
exports.ServicePrincipalAuthenticationProvider = void 0;
|
|
43
43
|
var msal_node_1 = require("@azure/msal-node");
|
|
44
|
+
var CliUtils_1 = require("../CliUtils");
|
|
44
45
|
/**
|
|
45
46
|
* note: This is meant for use in CI only since it hardcodes the authority & tenant ID.
|
|
46
47
|
*/
|
|
47
48
|
var ServicePrincipalAuthenticationProvider = /** @class */ (function () {
|
|
48
|
-
function ServicePrincipalAuthenticationProvider() {
|
|
49
|
+
function ServicePrincipalAuthenticationProvider(region) {
|
|
50
|
+
if (region === void 0) { region = undefined; }
|
|
49
51
|
if (!process.env.SP_CLIENT_ID || !process.env.SP_CLIENT_SECRET || !process.env.SP_TENANT_ID) {
|
|
50
52
|
throw new Error('Service Principal environment variables SP_CLIENT_ID, SP_CLIENT_SECRET, and SP_TENANT_ID must be set');
|
|
51
53
|
}
|
|
52
54
|
this._clientId = process.env.SP_CLIENT_ID;
|
|
53
55
|
this._clientSecret = process.env.SP_CLIENT_SECRET;
|
|
54
56
|
this._tenantId = process.env.SP_TENANT_ID;
|
|
57
|
+
this._region = region;
|
|
55
58
|
}
|
|
56
59
|
ServicePrincipalAuthenticationProvider.prototype.initAsync = function () {
|
|
57
60
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -61,7 +64,7 @@ var ServicePrincipalAuthenticationProvider = /** @class */ (function () {
|
|
|
61
64
|
auth: {
|
|
62
65
|
clientId: this._clientId,
|
|
63
66
|
clientSecret: this._clientSecret,
|
|
64
|
-
authority:
|
|
67
|
+
authority: (0, CliUtils_1.getAuthority)(this._region, this._tenantId),
|
|
65
68
|
},
|
|
66
69
|
};
|
|
67
70
|
this._msalClient = new msal_node_1.ConfidentialClientApplication(authConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServicePrincipalAuthenticationProvider.js","sourceRoot":"","sources":["../../src/Authentication/ServicePrincipalAuthenticationProvider.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,8CAAgF;AAGhF;;GAEG;AACH;
|
|
1
|
+
{"version":3,"file":"ServicePrincipalAuthenticationProvider.js","sourceRoot":"","sources":["../../src/Authentication/ServicePrincipalAuthenticationProvider.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,8CAAgF;AAGhF,wCAA2C;AAE3C;;GAEG;AACH;IAOE,gDAAY,MAAsC;QAAtC,uBAAA,EAAA,kBAAsC;QAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;YAC3F,MAAM,IAAI,KAAK,CACb,sGAAsG,CACvG,CAAC;SACH;QACD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;QAC1C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;QAClD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAEY,0DAAS,GAAtB;;;;gBACQ,UAAU,GAAkB;oBAChC,IAAI,EAAE;wBACJ,QAAQ,EAAE,IAAI,CAAC,SAAS;wBACxB,YAAY,EAAE,IAAI,CAAC,aAAa;wBAChC,SAAS,EAAE,IAAA,uBAAY,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;qBACtD;iBACF,CAAC;gBAEF,IAAI,CAAC,WAAW,GAAG,IAAI,yCAA6B,CAAC,UAAU,CAAC,CAAC;;;;KAClE;IAEY,0EAAyB,GAAtC,UAAuC,QAAgB;;;;;;wBACrD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;4BACrB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;yBACvD;wBAEK,uBAAuB,GAAG;4BAC9B,MAAM,EAAE,CAAC,QAAQ,GAAG,WAAW,CAAC;yBACjC,CAAC;wBAEa,qBAAM,IAAI,CAAC,WAAW,CAAC,8BAA8B,CAAC,uBAAuB,CAAC,EAAA;;wBAAvF,MAAM,GAAG,SAA8E;wBAE7F,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,CAAA,EAAE;4BACxB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;yBACpE;wBACD,sBAAO,MAAM,CAAC,WAAW,EAAC;;;;KAC3B;IAEM,gEAAe,GAAtB;QACE,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IACH,6CAAC;AAAD,CAAC,AAnDD,IAmDC;AAnDY,wFAAsC"}
|
package/lib-cjs/Cli.d.ts
CHANGED
package/lib-cjs/Cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cli.d.ts","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Cli.d.ts","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":"AAAA;;GAEG;AA4BH,wBAAsB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CA8D1C"}
|
package/lib-cjs/Cli.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/*!
|
|
3
|
+
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
4
|
+
*/
|
|
2
5
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
6
|
if (k2 === undefined) k2 = k;
|
|
4
7
|
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
@@ -60,9 +63,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
60
63
|
};
|
|
61
64
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
62
65
|
exports.boot = void 0;
|
|
63
|
-
/*!
|
|
64
|
-
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
65
|
-
*/
|
|
66
66
|
var ArgumentProvider_1 = require("./ArgumentProvider");
|
|
67
67
|
var PacCliAuthenticationProvider_1 = require("./Authentication/PacCliAuthenticationProvider");
|
|
68
68
|
var CliSettings_1 = require("./CliSettings");
|
|
@@ -71,70 +71,86 @@ var CliLogger_1 = require("./Logger/CliLogger");
|
|
|
71
71
|
var Verbs_1 = require("./Verbs");
|
|
72
72
|
var ListEnvironmentVariables_1 = require("./Verbs/ListEnvironmentVariables");
|
|
73
73
|
var TelemetrySettings_1 = require("./Verbs/TelemetrySettings");
|
|
74
|
+
var powerapps_player_services_1 = require("@pa-client/powerapps-player-services");
|
|
74
75
|
var logger;
|
|
75
76
|
var exitCode = 0;
|
|
76
77
|
function boot() {
|
|
77
78
|
return __awaiter(this, void 0, void 0, function () {
|
|
78
|
-
var isPacCli, isTestRun, cliSettings, authenticationProvider, ServicePrincipalAuthenticationProvider, NodeMsalAuthenticationProvider, httpClient,
|
|
79
|
+
var isPacCli, isTestRun, cliSettings, argumentProvider, cloud, authenticationProvider, ServicePrincipalAuthenticationProvider, NodeMsalAuthenticationProvider, httpClient, verb, error_1;
|
|
79
80
|
return __generator(this, function (_a) {
|
|
80
81
|
switch (_a.label) {
|
|
81
82
|
case 0:
|
|
82
|
-
_a.trys.push([0,
|
|
83
|
+
_a.trys.push([0, 13, 14, 17]);
|
|
83
84
|
isPacCli = process.env.IS_PAC_CLI === 'true';
|
|
84
85
|
isTestRun = process.env.CI === 'true';
|
|
85
|
-
return [4 /*yield*/, (0, CliSettings_1.initializeCliSettings)(isPacCli || isTestRun
|
|
86
|
+
return [4 /*yield*/, (0, CliSettings_1.initializeCliSettings)(isPacCli || isTestRun)];
|
|
86
87
|
case 1:
|
|
87
88
|
cliSettings = _a.sent();
|
|
89
|
+
argumentProvider = new ArgumentProvider_1.ArgumentProvider();
|
|
90
|
+
if (!!argumentProvider.getRegion()) return [3 /*break*/, 3];
|
|
91
|
+
return [4 /*yield*/, argumentProvider.getOption('region', true)];
|
|
92
|
+
case 2:
|
|
93
|
+
cloud = (_a.sent());
|
|
94
|
+
argumentProvider.setRegion(cloud);
|
|
95
|
+
_a.label = 3;
|
|
96
|
+
case 3:
|
|
88
97
|
authenticationProvider = void 0;
|
|
89
|
-
if (!isPacCli) return [3 /*break*/,
|
|
98
|
+
if (!isPacCli) return [3 /*break*/, 4];
|
|
90
99
|
authenticationProvider = new PacCliAuthenticationProvider_1.PacCliAuthenticationProvider();
|
|
91
|
-
return [3 /*break*/,
|
|
92
|
-
case
|
|
93
|
-
if (!isTestRun) return [3 /*break*/,
|
|
100
|
+
return [3 /*break*/, 8];
|
|
101
|
+
case 4:
|
|
102
|
+
if (!isTestRun) return [3 /*break*/, 6];
|
|
94
103
|
return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('./Authentication/ServicePrincipalAuthenticationProvider')); })];
|
|
95
|
-
case 3:
|
|
96
|
-
ServicePrincipalAuthenticationProvider = (_a.sent()).ServicePrincipalAuthenticationProvider;
|
|
97
|
-
authenticationProvider = new ServicePrincipalAuthenticationProvider();
|
|
98
|
-
return [3 /*break*/, 6];
|
|
99
|
-
case 4: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('./Authentication/NodeMsalAuthenticationProvider')); })];
|
|
100
104
|
case 5:
|
|
101
|
-
|
|
102
|
-
authenticationProvider = new
|
|
103
|
-
|
|
104
|
-
case 6: return [4 /*yield*/,
|
|
105
|
+
ServicePrincipalAuthenticationProvider = (_a.sent()).ServicePrincipalAuthenticationProvider;
|
|
106
|
+
authenticationProvider = new ServicePrincipalAuthenticationProvider(argumentProvider.getRegion());
|
|
107
|
+
return [3 /*break*/, 8];
|
|
108
|
+
case 6: return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('./Authentication/NodeMsalAuthenticationProvider')); })];
|
|
105
109
|
case 7:
|
|
110
|
+
NodeMsalAuthenticationProvider = (_a.sent()).NodeMsalAuthenticationProvider;
|
|
111
|
+
authenticationProvider = new NodeMsalAuthenticationProvider(argumentProvider.getRegion());
|
|
112
|
+
_a.label = 8;
|
|
113
|
+
case 8: return [4 /*yield*/, authenticationProvider.initAsync()];
|
|
114
|
+
case 9:
|
|
106
115
|
_a.sent();
|
|
107
116
|
httpClient = new CliHttpClient_1.CliHttpClient(authenticationProvider);
|
|
108
117
|
return [4 /*yield*/, CliLogger_1.CliLogger.create(cliSettings, httpClient, authenticationProvider)];
|
|
109
|
-
case
|
|
118
|
+
case 10:
|
|
110
119
|
// The CLI logger might need to use httpClient and environment info during its initialization
|
|
111
120
|
// So we create it after the httpClient and authenticationProvider are ready
|
|
112
121
|
logger = _a.sent();
|
|
113
122
|
(0, CliSettings_1.setCliLogger)(logger);
|
|
114
|
-
|
|
123
|
+
(0, powerapps_player_services_1.initializePlayerServices)({
|
|
124
|
+
httpClient: httpClient,
|
|
125
|
+
logger: logger,
|
|
126
|
+
// Default region is 'prod' if not specified
|
|
127
|
+
region: argumentProvider.getRegion() || 'prod',
|
|
128
|
+
// Do a temporary variable
|
|
129
|
+
environmentName: argumentProvider.getEnvironmentId() || 'default',
|
|
130
|
+
});
|
|
115
131
|
argumentProvider.handleGlobalHelpOrFlagsAndExit();
|
|
116
132
|
return [4 /*yield*/, argumentProvider.getVerb()];
|
|
117
|
-
case
|
|
133
|
+
case 11:
|
|
118
134
|
verb = _a.sent();
|
|
119
|
-
return [4 /*yield*/, executeVerb({ verb: verb, argumentProvider: argumentProvider })];
|
|
120
|
-
case
|
|
135
|
+
return [4 /*yield*/, executeVerb({ verb: verb, argumentProvider: argumentProvider, authenticationProvider: authenticationProvider })];
|
|
136
|
+
case 12:
|
|
121
137
|
_a.sent();
|
|
122
|
-
return [3 /*break*/,
|
|
123
|
-
case
|
|
138
|
+
return [3 /*break*/, 17];
|
|
139
|
+
case 13:
|
|
124
140
|
error_1 = _a.sent();
|
|
125
141
|
console.error("Error during CLI execution: ".concat(error_1));
|
|
126
142
|
exitCode = 1;
|
|
127
|
-
return [3 /*break*/,
|
|
128
|
-
case
|
|
129
|
-
if (!logger) return [3 /*break*/,
|
|
143
|
+
return [3 /*break*/, 17];
|
|
144
|
+
case 14:
|
|
145
|
+
if (!logger) return [3 /*break*/, 16];
|
|
130
146
|
return [4 /*yield*/, logger.flush()];
|
|
131
|
-
case
|
|
147
|
+
case 15:
|
|
132
148
|
_a.sent();
|
|
133
|
-
_a.label =
|
|
134
|
-
case
|
|
149
|
+
_a.label = 16;
|
|
150
|
+
case 16:
|
|
135
151
|
process.exit(exitCode);
|
|
136
152
|
return [7 /*endfinally*/];
|
|
137
|
-
case
|
|
153
|
+
case 17: return [2 /*return*/];
|
|
138
154
|
}
|
|
139
155
|
});
|
|
140
156
|
});
|
|
@@ -142,11 +158,11 @@ function boot() {
|
|
|
142
158
|
exports.boot = boot;
|
|
143
159
|
function executeVerb(config) {
|
|
144
160
|
return __awaiter(this, void 0, void 0, function () {
|
|
145
|
-
var verb, argumentProvider, _a;
|
|
161
|
+
var verb, argumentProvider, authenticationProvider, _a;
|
|
146
162
|
return __generator(this, function (_b) {
|
|
147
163
|
switch (_b.label) {
|
|
148
164
|
case 0:
|
|
149
|
-
verb = config.verb, argumentProvider = config.argumentProvider;
|
|
165
|
+
verb = config.verb, argumentProvider = config.argumentProvider, authenticationProvider = config.authenticationProvider;
|
|
150
166
|
_a = verb;
|
|
151
167
|
switch (_a) {
|
|
152
168
|
case 'init': return [3 /*break*/, 1];
|
|
@@ -172,23 +188,23 @@ function executeVerb(config) {
|
|
|
172
188
|
case 4:
|
|
173
189
|
_b.sent();
|
|
174
190
|
return [3 /*break*/, 28];
|
|
175
|
-
case 5: return [4 /*yield*/, (0, Verbs_1.addDataSourceAsync)(argumentProvider)];
|
|
191
|
+
case 5: return [4 /*yield*/, (0, Verbs_1.addDataSourceAsync)(argumentProvider, authenticationProvider)];
|
|
176
192
|
case 6:
|
|
177
193
|
_b.sent();
|
|
178
194
|
return [3 /*break*/, 28];
|
|
179
|
-
case 7: return [4 /*yield*/, (0, Verbs_1.listDatasetsAsync)(argumentProvider)];
|
|
195
|
+
case 7: return [4 /*yield*/, (0, Verbs_1.listDatasetsAsync)(argumentProvider, authenticationProvider)];
|
|
180
196
|
case 8:
|
|
181
197
|
_b.sent();
|
|
182
198
|
return [3 /*break*/, 28];
|
|
183
|
-
case 9: return [4 /*yield*/, (0, Verbs_1.listTablesAsync)(argumentProvider)];
|
|
199
|
+
case 9: return [4 /*yield*/, (0, Verbs_1.listTablesAsync)(argumentProvider, authenticationProvider)];
|
|
184
200
|
case 10:
|
|
185
201
|
_b.sent();
|
|
186
202
|
return [3 /*break*/, 28];
|
|
187
|
-
case 11: return [4 /*yield*/, (0, Verbs_1.listSqlStoredProceduresAsync)(argumentProvider)];
|
|
203
|
+
case 11: return [4 /*yield*/, (0, Verbs_1.listSqlStoredProceduresAsync)(argumentProvider, authenticationProvider)];
|
|
188
204
|
case 12:
|
|
189
205
|
_b.sent();
|
|
190
206
|
return [3 /*break*/, 28];
|
|
191
|
-
case 13: return [4 /*yield*/, (0, Verbs_1.deleteDataSourceAsync)(argumentProvider)];
|
|
207
|
+
case 13: return [4 /*yield*/, (0, Verbs_1.deleteDataSourceAsync)(argumentProvider, authenticationProvider)];
|
|
192
208
|
case 14:
|
|
193
209
|
_b.sent();
|
|
194
210
|
return [3 /*break*/, 28];
|
|
@@ -196,15 +212,15 @@ function executeVerb(config) {
|
|
|
196
212
|
case 16:
|
|
197
213
|
_b.sent();
|
|
198
214
|
return [3 /*break*/, 28];
|
|
199
|
-
case 17: return [4 /*yield*/, (0, ListEnvironmentVariables_1.listAllEnvironmentVariablesAsync)(argumentProvider)];
|
|
215
|
+
case 17: return [4 /*yield*/, (0, ListEnvironmentVariables_1.listAllEnvironmentVariablesAsync)(argumentProvider, authenticationProvider)];
|
|
200
216
|
case 18:
|
|
201
217
|
_b.sent();
|
|
202
218
|
return [3 /*break*/, 28];
|
|
203
|
-
case 19: return [4 /*yield*/, (0, Verbs_1.listConnectionReferences)(argumentProvider)];
|
|
219
|
+
case 19: return [4 /*yield*/, (0, Verbs_1.listConnectionReferences)(argumentProvider, authenticationProvider)];
|
|
204
220
|
case 20:
|
|
205
221
|
_b.sent();
|
|
206
222
|
return [3 /*break*/, 28];
|
|
207
|
-
case 21: return [4 /*yield*/, (0, Verbs_1.pushAsync)(argumentProvider)];
|
|
223
|
+
case 21: return [4 /*yield*/, (0, Verbs_1.pushAsync)(argumentProvider, authenticationProvider)];
|
|
208
224
|
case 22:
|
|
209
225
|
_b.sent();
|
|
210
226
|
return [3 /*break*/, 28];
|
package/lib-cjs/Cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cli.js","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Cli.js","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,uDAAsD;AACtD,8FAA6F;AAC7F,6CAAoE;AACpE,4DAA2D;AAC3D,gDAA+C;AAE/C,iCAYiB;AACjB,6EAAoF;AACpF,+DAAoE;AACpE,kFAAgF;AAEhF,IAAI,MAAiB,CAAC;AACtB,IAAI,QAAQ,GAAG,CAAC,CAAC;AACjB,SAAsB,IAAI;;;;;;;oBAEhB,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,CAAC;oBAC7C,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM,CAAC;oBAExB,qBAAM,IAAA,mCAAqB,EAAC,QAAQ,IAAI,SAAS,CAAC,EAAA;;oBAAhE,WAAW,GAAG,SAAkD;oBAChE,gBAAgB,GAAG,IAAI,mCAAgB,EAAE,CAAC;yBAC5C,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAA7B,wBAA6B;oBAChB,qBAAM,gBAAgB,CAAC,SAAS,CAAS,QAAQ,EAAE,IAAI,CAAC,EAAA;;oBAAjE,KAAK,GAAG,CAAC,SAAwD,CAAW;oBAClF,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;;;oBAGhC,sBAAsB,SAAA,CAAC;yBACvB,QAAQ,EAAR,wBAAQ;oBACV,sBAAsB,GAAG,IAAI,2DAA4B,EAAE,CAAC;;;yBACnD,SAAS,EAAT,wBAAS;oBACiC,sFACjD,yDAAyD,QAC1D;;oBAFO,sCAAsC,GAAK,CAAA,SAElD,CAAA,uCAF6C;oBAI9C,sBAAsB,GAAG,IAAI,sCAAsC,CAAC,gBAAgB,CAAC,SAAS,EAAG,CAAC,CAAC;;wBAGxD,sFACzC,iDAAiD,QAClD;;oBAFO,8BAA8B,GAAK,CAAA,SAE1C,CAAA,+BAFqC;oBAItC,sBAAsB,GAAG,IAAI,8BAA8B,CAAC,gBAAgB,CAAC,SAAS,EAAG,CAAC,CAAC;;wBAG7F,qBAAM,sBAAsB,CAAC,SAAS,EAAE,EAAA;;oBAAxC,SAAwC,CAAC;oBACnC,UAAU,GAAG,IAAI,6BAAa,CAAC,sBAAsB,CAAC,CAAC;oBAIpD,qBAAM,qBAAS,CAAC,MAAM,CAAC,WAAW,EAAE,UAAU,EAAE,sBAAsB,CAAC,EAAA;;oBAFhF,6FAA6F;oBAC7F,4EAA4E;oBAC5E,MAAM,GAAG,SAAuE,CAAC;oBACjF,IAAA,0BAAY,EAAC,MAAM,CAAC,CAAC;oBAErB,IAAA,oDAAwB,EAAC;wBACvB,UAAU,YAAA;wBACV,MAAM,QAAA;wBACN,4CAA4C;wBAC5C,MAAM,EAAE,gBAAgB,CAAC,SAAS,EAAE,IAAI,MAAM;wBAC9C,0BAA0B;wBAC1B,eAAe,EAAE,gBAAgB,CAAC,gBAAgB,EAAE,IAAI,SAAS;qBAClE,CAAC,CAAC;oBAEH,gBAAgB,CAAC,8BAA8B,EAAE,CAAC;oBAErC,qBAAM,gBAAgB,CAAC,OAAO,EAAE,EAAA;;oBAAvC,IAAI,GAAG,SAAgC;oBAE7C,qBAAM,WAAW,CAAC,EAAE,IAAI,MAAA,EAAE,gBAAgB,kBAAA,EAAE,sBAAsB,wBAAA,EAAE,CAAC,EAAA;;oBAArE,SAAqE,CAAC;;;;oBAEtE,OAAO,CAAC,KAAK,CAAC,sCAA+B,OAAK,CAAE,CAAC,CAAC;oBACtD,QAAQ,GAAG,CAAC,CAAC;;;yBAGT,MAAM,EAAN,yBAAM;oBACR,qBAAM,MAAM,CAAC,KAAK,EAAE,EAAA;;oBAApB,SAAoB,CAAC;;;oBAEvB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;;;;;;CAE1B;AA9DD,oBA8DC;AAED,SAAe,WAAW,CAAC,MAAyB;;;;;;oBAC1C,IAAI,GAA+C,MAAM,KAArD,EAAE,gBAAgB,GAA6B,MAAM,iBAAnC,EAAE,sBAAsB,GAAK,MAAM,uBAAX,CAAY;oBAE1D,KAAA,IAAI,CAAA;;6BACL,MAAM,CAAC,CAAP,wBAAM;6BAGN,eAAe,CAAC,CAAhB,wBAAe;6BAGf,iBAAiB,CAAC,CAAlB,wBAAiB;6BAGjB,eAAe,CAAC,CAAhB,wBAAe;6BAGf,aAAa,CAAC,CAAd,wBAAa;6BAGb,0BAA0B,CAAC,CAA3B,yBAA0B;6BAG1B,oBAAoB,CAAC,CAArB,yBAAoB;6BAGpB,QAAQ,CAAC,CAAT,yBAAQ;6BAGR,4BAA4B,CAAC,CAA7B,yBAA4B;6BAG5B,4BAA4B,CAAC,CAA7B,yBAA4B;6BAG5B,MAAM,CAAC,CAAP,yBAAM;6BAGN,KAAK,CAAC,CAAN,yBAAK;6BAGL,WAAW,CAAC,CAAZ,yBAAW;;;wBAnCd,qBAAM,IAAA,iBAAS,EAAC,gBAAgB,CAAC,EAAA;;oBAAjC,SAAiC,CAAC;oBAClC,yBAAM;wBAEN,qBAAM,IAAA,wBAAgB,EAAC,gBAAgB,CAAC,EAAA;;oBAAxC,SAAwC,CAAC;oBACzC,yBAAM;wBAEN,qBAAM,IAAA,0BAAkB,EAAC,gBAAgB,EAAE,sBAAsB,CAAC,EAAA;;oBAAlE,SAAkE,CAAC;oBACnE,yBAAM;wBAEN,qBAAM,IAAA,yBAAiB,EAAC,gBAAgB,EAAE,sBAAsB,CAAC,EAAA;;oBAAjE,SAAiE,CAAC;oBAClE,yBAAM;wBAEN,qBAAM,IAAA,uBAAe,EAAC,gBAAgB,EAAE,sBAAsB,CAAC,EAAA;;oBAA/D,SAA+D,CAAC;oBAChE,yBAAM;yBAEN,qBAAM,IAAA,oCAA4B,EAAC,gBAAgB,EAAE,sBAAsB,CAAC,EAAA;;oBAA5E,SAA4E,CAAC;oBAC7E,yBAAM;yBAEN,qBAAM,IAAA,6BAAqB,EAAC,gBAAgB,EAAE,sBAAsB,CAAC,EAAA;;oBAArE,SAAqE,CAAC;oBACtE,yBAAM;yBAEN,qBAAM,IAAA,mBAAW,EAAC,gBAAgB,CAAC,EAAA;;oBAAnC,SAAmC,CAAC;oBACpC,yBAAM;yBAEN,qBAAM,IAAA,2DAAgC,EAAC,gBAAgB,EAAE,sBAAsB,CAAC,EAAA;;oBAAhF,SAAgF,CAAC;oBACjF,yBAAM;yBAEN,qBAAM,IAAA,gCAAwB,EAAC,gBAAgB,EAAE,sBAAsB,CAAC,EAAA;;oBAAxE,SAAwE,CAAC;oBACzE,yBAAM;yBAEN,qBAAM,IAAA,iBAAS,EAAC,gBAAgB,EAAE,sBAAsB,CAAC,EAAA;;oBAAzD,SAAyD,CAAC;oBAC1D,yBAAM;yBAEN,qBAAM,IAAA,gBAAQ,EAAC,gBAAgB,CAAC,EAAA;;oBAAhC,SAAgC,CAAC;oBACjC,yBAAM;yBAEN,qBAAM,IAAA,2CAAuB,EAAC,gBAAgB,CAAC,EAAA;;oBAA/C,SAA+C,CAAC;oBAChD,yBAAM;;oBAEN,eAAe,CAAC,IAAI,CAAC,CAAC;;;;;;CAE3B;AAED,6EAA6E;AAC7E,SAAS,eAAe,CAAC,IAAW;IAClC,MAAM,IAAI,KAAK,CAAC,qBAAa,IAAI,yBAAqB,CAAC,CAAC;AAC1D,CAAC"}
|
package/lib-cjs/CliUtils.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Region } from '@pa-client/powerapps-player-services';
|
|
2
2
|
import { CliOption, DefaultStringOption } from './Types/Argument.types';
|
|
3
|
-
export declare function getRegion(region: string): Region;
|
|
4
3
|
export declare function createDefaultStringOption(options: DefaultStringOption): CliOption<string>;
|
|
5
4
|
export declare function isGuid(value: string): boolean;
|
|
6
5
|
export declare function createPlayUrl(region: Region, environmentId: string, appId: string, localAppUrl?: string, localConnectionsUrl?: string): string;
|
|
6
|
+
export declare function getAuthority(region: Region | undefined, tenantId: string | undefined): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliUtils.d.ts","sourceRoot":"","sources":["../src/CliUtils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAExE,wBAAgB,
|
|
1
|
+
{"version":3,"file":"CliUtils.d.ts","sourceRoot":"","sources":["../src/CliUtils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAExE,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,CAAC,MAAM,CAAC,CAWzF;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAG7C;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,MAAM,UAgB7B;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAU7F"}
|
package/lib-cjs/CliUtils.js
CHANGED
|
@@ -59,20 +59,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
59
59
|
}
|
|
60
60
|
};
|
|
61
61
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
62
|
-
exports.
|
|
62
|
+
exports.getAuthority = exports.createPlayUrl = exports.isGuid = exports.createDefaultStringOption = void 0;
|
|
63
63
|
/*!
|
|
64
64
|
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
65
65
|
*/
|
|
66
66
|
var prompts = __importStar(require("@clack/prompts"));
|
|
67
|
-
function getRegion(region) {
|
|
68
|
-
region = region.toLowerCase();
|
|
69
|
-
// PAC-CLI returns public for prod + preview, but they use the production endpoints anyway.
|
|
70
|
-
if (region === 'public') {
|
|
71
|
-
region = 'prod';
|
|
72
|
-
}
|
|
73
|
-
return region;
|
|
74
|
-
}
|
|
75
|
-
exports.getRegion = getRegion;
|
|
76
67
|
function createDefaultStringOption(options) {
|
|
77
68
|
var _this = this;
|
|
78
69
|
var flags = options.flags, env = options.env, message = options.message, initialValue = options.initialValue, description = options.description, defaultValue = options.default;
|
|
@@ -98,7 +89,7 @@ function isGuid(value) {
|
|
|
98
89
|
}
|
|
99
90
|
exports.isGuid = isGuid;
|
|
100
91
|
function createPlayUrl(region, environmentId, appId, localAppUrl, localConnectionsUrl) {
|
|
101
|
-
var baseUrl =
|
|
92
|
+
var baseUrl = _getBaseUrl(region);
|
|
102
93
|
var playUrl = "".concat(baseUrl, "/play/e/").concat(environmentId, "/app/").concat(appId);
|
|
103
94
|
var queryParams = [];
|
|
104
95
|
if (localAppUrl) {
|
|
@@ -110,4 +101,40 @@ function createPlayUrl(region, environmentId, appId, localAppUrl, localConnectio
|
|
|
110
101
|
return queryParams.length > 0 ? "".concat(playUrl, "?").concat(queryParams.join('&')) : playUrl;
|
|
111
102
|
}
|
|
112
103
|
exports.createPlayUrl = createPlayUrl;
|
|
104
|
+
function getAuthority(region, tenantId) {
|
|
105
|
+
switch (region) {
|
|
106
|
+
case 'gcchigh':
|
|
107
|
+
case 'dod':
|
|
108
|
+
return "https://login.microsoftonline.us/".concat(tenantId);
|
|
109
|
+
case 'mooncake':
|
|
110
|
+
return "https://login.partner.microsoftonline.cn/".concat(tenantId);
|
|
111
|
+
default:
|
|
112
|
+
return "https://login.microsoftonline.com/".concat(tenantId);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
exports.getAuthority = getAuthority;
|
|
116
|
+
function _getBaseUrl(region) {
|
|
117
|
+
switch (region) {
|
|
118
|
+
case 'dev':
|
|
119
|
+
return 'https://apps.dev.powerapps.com';
|
|
120
|
+
case 'test':
|
|
121
|
+
return 'https://apps.test.powerapps.com';
|
|
122
|
+
case 'preprod':
|
|
123
|
+
return 'https://apps.preprod.powerapps.com';
|
|
124
|
+
case 'preview':
|
|
125
|
+
return 'https://apps.preview.powerapps.com';
|
|
126
|
+
case 'prod':
|
|
127
|
+
return 'https://apps.powerapps.com';
|
|
128
|
+
case 'gccmoderate':
|
|
129
|
+
return 'https://apps.gov.powerapps.us';
|
|
130
|
+
case 'gcchigh':
|
|
131
|
+
return 'https://apps.high.powerapps.us';
|
|
132
|
+
case 'dod':
|
|
133
|
+
return 'https://play.apps.appsplatform.us';
|
|
134
|
+
case 'mooncake':
|
|
135
|
+
return 'https://apps.powerapps.cn';
|
|
136
|
+
default:
|
|
137
|
+
return '';
|
|
138
|
+
}
|
|
139
|
+
}
|
|
113
140
|
//# sourceMappingURL=CliUtils.js.map
|
package/lib-cjs/CliUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliUtils.js","sourceRoot":"","sources":["../src/CliUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,sDAA0C;AAI1C,SAAgB,
|
|
1
|
+
{"version":3,"file":"CliUtils.js","sourceRoot":"","sources":["../src/CliUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,sDAA0C;AAI1C,SAAgB,yBAAyB,CAAC,OAA4B;IAAtE,iBAWC;IAVS,IAAA,KAAK,GAAqE,OAAO,MAA5E,EAAE,GAAG,GAAgE,OAAO,IAAvE,EAAE,OAAO,GAAuD,OAAO,QAA9D,EAAE,YAAY,GAAyC,OAAO,aAAhD,EAAE,WAAW,GAA4B,OAAO,YAAnC,EAAW,YAAY,GAAK,OAAO,QAAZ,CAAa;IAC1F,OAAO;QACL,KAAK,OAAA;QACL,GAAG,KAAA;QACH,WAAW,aAAA;QACX,OAAO,EAAE,YAAsB;QAC/B,YAAY,EAAE;;;4BACJ,qBAAM,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,SAAA,EAAE,YAAY,cAAA,EAAE,CAAC,EAAA;4BAArD,sBAAO,CAAC,SAA6C,CAAW,EAAC;;;aAClE;KACF,CAAC;AACJ,CAAC;AAXD,8DAWC;AAED,SAAgB,MAAM,CAAC,KAAa;IAClC,IAAM,SAAS,GAAG,4EAA4E,CAAC;IAC/F,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAHD,wBAGC;AAED,SAAgB,aAAa,CAC3B,MAAc,EACd,aAAqB,EACrB,KAAa,EACb,WAAoB,EACpB,mBAA4B;IAE5B,IAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAEpC,IAAM,OAAO,GAAG,UAAG,OAAO,qBAAW,aAAa,kBAAQ,KAAK,CAAE,CAAC;IAElE,IAAM,WAAW,GAAa,EAAE,CAAC;IACjC,IAAI,WAAW,EAAE;QACf,WAAW,CAAC,IAAI,CAAC,uBAAgB,WAAW,CAAE,CAAC,CAAC;KACjD;IAED,IAAI,mBAAmB,EAAE;QACvB,WAAW,CAAC,IAAI,CAAC,8BAAuB,mBAAmB,CAAE,CAAC,CAAC;KAChE;IAED,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAG,OAAO,cAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAE,CAAC,CAAC,CAAC,OAAO,CAAC;AAClF,CAAC;AArBD,sCAqBC;AAED,SAAgB,YAAY,CAAC,MAA0B,EAAE,QAA4B;IACnF,QAAQ,MAAM,EAAE;QACd,KAAK,SAAS,CAAC;QACf,KAAK,KAAK;YACR,OAAO,2CAAoC,QAAQ,CAAE,CAAC;QACxD,KAAK,UAAU;YACb,OAAO,mDAA4C,QAAQ,CAAE,CAAC;QAChE;YACE,OAAO,4CAAqC,QAAQ,CAAE,CAAC;KAC1D;AACH,CAAC;AAVD,oCAUC;AAED,SAAS,WAAW,CAAC,MAAc;IACjC,QAAQ,MAAM,EAAE;QACd,KAAK,KAAK;YACR,OAAO,gCAAgC,CAAC;QAC1C,KAAK,MAAM;YACT,OAAO,iCAAiC,CAAC;QAC3C,KAAK,SAAS;YACZ,OAAO,oCAAoC,CAAC;QAC9C,KAAK,SAAS;YACZ,OAAO,oCAAoC,CAAC;QAC9C,KAAK,MAAM;YACT,OAAO,4BAA4B,CAAC;QACtC,KAAK,aAAa;YAChB,OAAO,+BAA+B,CAAC;QACzC,KAAK,SAAS;YACZ,OAAO,gCAAgC,CAAC;QAC1C,KAAK,KAAK;YACR,OAAO,mCAAmC,CAAC;QAC7C,KAAK,UAAU;YACb,OAAO,2BAA2B,CAAC;QACrC;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cli.types.d.ts","sourceRoot":"","sources":["../../src/Types/Cli.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6DAA6D,CAAC;AAClG,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,MAAM,WAAW,uBAAuB;IACtC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7D,eAAe,IAAI,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,MAAM,MAAM,IAAI,GACZ,MAAM,GACN,MAAM,GACN,KAAK,GACL,iBAAiB,GACjB,eAAe,GACf,eAAe,GACf,aAAa,GACb,0BAA0B,GAC1B,oBAAoB,GACpB,4BAA4B,GAC5B,4BAA4B,GAC5B,QAAQ,GACR,WAAW,CAAC;AAEhB,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,SAAS,GAAG,YAAY,CAAC;IACjC,UAAU,EAAE,cAAc,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,IAAI,CAAC;IACX,gBAAgB,EAAE,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"Cli.types.d.ts","sourceRoot":"","sources":["../../src/Types/Cli.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6DAA6D,CAAC;AAClG,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,MAAM,WAAW,uBAAuB;IACtC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7D,eAAe,IAAI,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,MAAM,MAAM,IAAI,GACZ,MAAM,GACN,MAAM,GACN,KAAK,GACL,iBAAiB,GACjB,eAAe,GACf,eAAe,GACf,aAAa,GACb,0BAA0B,GAC1B,oBAAoB,GACpB,4BAA4B,GAC5B,4BAA4B,GAC5B,QAAQ,GACR,WAAW,CAAC;AAEhB,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,SAAS,GAAG,YAAY,CAAC;IACjC,UAAU,EAAE,cAAc,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,CAAC,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,IAAI,CAAC;IACX,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,sBAAsB,EAAE,uBAAuB,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
3
|
*/
|
|
4
4
|
import { ArgumentProvider } from '../ArgumentProvider';
|
|
5
|
+
import { IAuthenticationProvider } from '../Types/Cli.types';
|
|
5
6
|
/**
|
|
6
7
|
* Adds a data source based on the provided environment variables.
|
|
7
8
|
* It supports both Dataverse and connector data sources.
|
|
@@ -15,4 +16,4 @@ import { ArgumentProvider } from '../ArgumentProvider';
|
|
|
15
16
|
* @param config - Local file paths configuration
|
|
16
17
|
* @returns Promise<void>
|
|
17
18
|
*/
|
|
18
|
-
export declare function addDataSourceAsync(argumentProvider: ArgumentProvider): Promise<void>;
|
|
19
|
+
export declare function addDataSourceAsync(argumentProvider: ArgumentProvider, authenticationProvider: IAuthenticationProvider): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddDataSource.d.ts","sourceRoot":"","sources":["../../src/Verbs/AddDataSource.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"AddDataSource.d.ts","sourceRoot":"","sources":["../../src/Verbs/AddDataSource.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAIvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D;;;;;;;;;;;;GAYG;AACH,wBAAsB,kBAAkB,CACtC,gBAAgB,EAAE,gBAAgB,EAClC,sBAAsB,EAAE,uBAAuB,GAC9C,OAAO,CAAC,IAAI,CAAC,CAgCf"}
|
|
@@ -83,9 +83,9 @@ var HelpStrings_1 = require("../Constants/HelpStrings");
|
|
|
83
83
|
* @param config - Local file paths configuration
|
|
84
84
|
* @returns Promise<void>
|
|
85
85
|
*/
|
|
86
|
-
function addDataSourceAsync(argumentProvider) {
|
|
86
|
+
function addDataSourceAsync(argumentProvider, authenticationProvider) {
|
|
87
87
|
return __awaiter(this, void 0, void 0, function () {
|
|
88
|
-
var settings, fileConfig, cliFs, playerServiceConfig,
|
|
88
|
+
var settings, fileConfig, cliFs, playerServiceConfig, dsConfig;
|
|
89
89
|
return __generator(this, function (_a) {
|
|
90
90
|
switch (_a.label) {
|
|
91
91
|
case 0:
|
|
@@ -96,7 +96,6 @@ function addDataSourceAsync(argumentProvider) {
|
|
|
96
96
|
case 1:
|
|
97
97
|
_a.sent();
|
|
98
98
|
playerServiceConfig = (0, powerapps_player_services_1.getPlayerServiceConfig)();
|
|
99
|
-
authenticationProvider = argumentProvider.getAuthenticationProvider();
|
|
100
99
|
dsConfig = {
|
|
101
100
|
vfs: cliFs,
|
|
102
101
|
authProvider: authenticationProvider,
|