@microsoft/power-apps-cli 0.6.0 → 0.6.4
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.map +1 -1
- package/lib/ArgumentProvider.js +11 -7
- package/lib/ArgumentProvider.js.map +1 -1
- package/lib/Authentication/NodeMsalAuthenticationProvider.d.ts +4 -1
- package/lib/Authentication/NodeMsalAuthenticationProvider.d.ts.map +1 -1
- package/lib/Authentication/NodeMsalAuthenticationProvider.js +5 -1
- package/lib/Authentication/NodeMsalAuthenticationProvider.js.map +1 -1
- package/lib/Authentication/PacCliAuthenticationProvider.d.ts +2 -1
- package/lib/Authentication/PacCliAuthenticationProvider.d.ts.map +1 -1
- package/lib/Authentication/PacCliAuthenticationProvider.js +1 -1
- package/lib/Authentication/PacCliAuthenticationProvider.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.map +1 -1
- package/lib/Cli.js +1 -2
- 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/HttpClient/CliHttpClient.d.ts.map +1 -1
- package/lib/HttpClient/CliHttpClient.js +2 -1
- package/lib/HttpClient/CliHttpClient.js.map +1 -1
- package/lib/Types/Cli.types.d.ts +2 -1
- package/lib/Types/Cli.types.d.ts.map +1 -1
- package/lib/Utils/EnhanceNetworkError.d.ts +14 -0
- package/lib/Utils/EnhanceNetworkError.d.ts.map +1 -0
- package/lib/Utils/EnhanceNetworkError.js +59 -0
- package/lib/Utils/EnhanceNetworkError.js.map +1 -0
- package/lib/Verbs/Init.d.ts.map +1 -1
- package/lib/Verbs/Init.js +3 -0
- package/lib/Verbs/Init.js.map +1 -1
- package/lib/__tests__/E2eTests/basicSetup/loggingConfiguration.test.d.ts +5 -0
- package/lib/__tests__/E2eTests/basicSetup/loggingConfiguration.test.d.ts.map +1 -0
- package/lib/__tests__/E2eTests/basicSetup/loggingConfiguration.test.js +246 -0
- package/lib/__tests__/E2eTests/basicSetup/loggingConfiguration.test.js.map +1 -0
- package/lib/__tests__/E2eTests/cliUsability/cliHelp.test.d.ts +5 -0
- package/lib/__tests__/E2eTests/cliUsability/cliHelp.test.d.ts.map +1 -0
- package/lib/__tests__/E2eTests/cliUsability/cliHelp.test.js +162 -0
- package/lib/__tests__/E2eTests/cliUsability/cliHelp.test.js.map +1 -0
- package/lib/__tests__/E2eTests/cliUsability/logoutReauth.test.d.ts +5 -0
- package/lib/__tests__/E2eTests/cliUsability/logoutReauth.test.d.ts.map +1 -0
- package/lib/__tests__/E2eTests/cliUsability/logoutReauth.test.js +115 -0
- package/lib/__tests__/E2eTests/cliUsability/logoutReauth.test.js.map +1 -0
- package/lib/__tests__/E2eTests/cliUsability/missingParameters.test.d.ts +5 -0
- package/lib/__tests__/E2eTests/cliUsability/missingParameters.test.d.ts.map +1 -0
- package/lib/__tests__/E2eTests/cliUsability/missingParameters.test.js +189 -0
- package/lib/__tests__/E2eTests/cliUsability/missingParameters.test.js.map +1 -0
- package/lib/__tests__/E2eTests/commonUserWorkflowSmokeTest.test.js +8 -6
- package/lib/__tests__/E2eTests/commonUserWorkflowSmokeTest.test.js.map +1 -1
- package/lib/__tests__/E2eTests/e2eConfig.d.ts +95 -0
- package/lib/__tests__/E2eTests/e2eConfig.d.ts.map +1 -0
- package/lib/__tests__/E2eTests/e2eConfig.js +122 -0
- package/lib/__tests__/E2eTests/e2eConfig.js.map +1 -0
- 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/ServicePrincipalAuthenticationProvider.spec.js +3 -3
- package/lib/__tests__/UnitTests/ServicePrincipalAuthenticationProvider.spec.js.map +1 -1
- package/lib/__tests__/UnitTests/enhanceNetworkError.test.d.ts +5 -0
- package/lib/__tests__/UnitTests/enhanceNetworkError.test.d.ts.map +1 -0
- package/lib/__tests__/UnitTests/enhanceNetworkError.test.js +177 -0
- package/lib/__tests__/UnitTests/enhanceNetworkError.test.js.map +1 -0
- package/lib/__tests__/helpers/e2eTestHelpers.d.ts.map +1 -1
- package/lib/__tests__/helpers/e2eTestHelpers.js +16 -0
- package/lib/__tests__/helpers/e2eTestHelpers.js.map +1 -1
- package/lib/__tests__/helpers/testHelpers.d.ts +146 -30
- package/lib/__tests__/helpers/testHelpers.d.ts.map +1 -1
- package/lib/__tests__/helpers/testHelpers.js +245 -74
- package/lib/__tests__/helpers/testHelpers.js.map +1 -1
- package/lib-cjs/ArgumentProvider.d.ts.map +1 -1
- package/lib-cjs/ArgumentProvider.js +7 -1
- package/lib-cjs/ArgumentProvider.js.map +1 -1
- package/lib-cjs/Authentication/NodeMsalAuthenticationProvider.d.ts +4 -1
- package/lib-cjs/Authentication/NodeMsalAuthenticationProvider.d.ts.map +1 -1
- package/lib-cjs/Authentication/NodeMsalAuthenticationProvider.js +4 -1
- package/lib-cjs/Authentication/NodeMsalAuthenticationProvider.js.map +1 -1
- package/lib-cjs/Authentication/PacCliAuthenticationProvider.d.ts +2 -1
- package/lib-cjs/Authentication/PacCliAuthenticationProvider.d.ts.map +1 -1
- package/lib-cjs/Authentication/PacCliAuthenticationProvider.js +1 -1
- package/lib-cjs/Authentication/PacCliAuthenticationProvider.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 +4 -2
- package/lib-cjs/Authentication/ServicePrincipalAuthenticationProvider.js.map +1 -1
- package/lib-cjs/Cli.d.ts.map +1 -1
- package/lib-cjs/Cli.js +14 -18
- 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/HttpClient/CliHttpClient.d.ts.map +1 -1
- package/lib-cjs/HttpClient/CliHttpClient.js +2 -1
- package/lib-cjs/HttpClient/CliHttpClient.js.map +1 -1
- package/lib-cjs/Types/Cli.types.d.ts +2 -1
- package/lib-cjs/Types/Cli.types.d.ts.map +1 -1
- package/lib-cjs/Utils/EnhanceNetworkError.d.ts +13 -0
- package/lib-cjs/Utils/EnhanceNetworkError.d.ts.map +1 -0
- package/lib-cjs/Utils/EnhanceNetworkError.js +63 -0
- package/lib-cjs/Utils/EnhanceNetworkError.js.map +1 -0
- package/lib-cjs/Verbs/Init.d.ts.map +1 -1
- package/lib-cjs/Verbs/Init.js +4 -0
- package/lib-cjs/Verbs/Init.js.map +1 -1
- package/lib-cjs/__tests__/E2eTests/basicSetup/loggingConfiguration.test.d.ts +4 -0
- package/lib-cjs/__tests__/E2eTests/basicSetup/loggingConfiguration.test.d.ts.map +1 -0
- package/lib-cjs/__tests__/E2eTests/basicSetup/loggingConfiguration.test.js +271 -0
- package/lib-cjs/__tests__/E2eTests/basicSetup/loggingConfiguration.test.js.map +1 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/cliHelp.test.d.ts +4 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/cliHelp.test.d.ts.map +1 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/cliHelp.test.js +187 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/cliHelp.test.js.map +1 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/logoutReauth.test.d.ts +4 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/logoutReauth.test.d.ts.map +1 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/logoutReauth.test.js +140 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/logoutReauth.test.js.map +1 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/missingParameters.test.d.ts +4 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/missingParameters.test.d.ts.map +1 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/missingParameters.test.js +191 -0
- package/lib-cjs/__tests__/E2eTests/cliUsability/missingParameters.test.js.map +1 -0
- package/lib-cjs/__tests__/E2eTests/commonUserWorkflowSmokeTest.test.js +5 -5
- package/lib-cjs/__tests__/E2eTests/commonUserWorkflowSmokeTest.test.js.map +1 -1
- package/lib-cjs/__tests__/E2eTests/e2eConfig.d.ts +94 -0
- package/lib-cjs/__tests__/E2eTests/e2eConfig.d.ts.map +1 -0
- package/lib-cjs/__tests__/E2eTests/e2eConfig.js +149 -0
- package/lib-cjs/__tests__/E2eTests/e2eConfig.js.map +1 -0
- 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/ServicePrincipalAuthenticationProvider.spec.js +3 -3
- package/lib-cjs/__tests__/UnitTests/ServicePrincipalAuthenticationProvider.spec.js.map +1 -1
- package/lib-cjs/__tests__/UnitTests/enhanceNetworkError.test.d.ts +4 -0
- package/lib-cjs/__tests__/UnitTests/enhanceNetworkError.test.d.ts.map +1 -0
- package/lib-cjs/__tests__/UnitTests/enhanceNetworkError.test.js +179 -0
- package/lib-cjs/__tests__/UnitTests/enhanceNetworkError.test.js.map +1 -0
- package/lib-cjs/__tests__/helpers/e2eTestHelpers.d.ts.map +1 -1
- package/lib-cjs/__tests__/helpers/e2eTestHelpers.js +16 -0
- package/lib-cjs/__tests__/helpers/e2eTestHelpers.js.map +1 -1
- package/lib-cjs/__tests__/helpers/testHelpers.d.ts +146 -30
- package/lib-cjs/__tests__/helpers/testHelpers.d.ts.map +1 -1
- package/lib-cjs/__tests__/helpers/testHelpers.js +242 -98
- package/lib-cjs/__tests__/helpers/testHelpers.js.map +1 -1
- package/node_modules/@microsoft/powerapps-data/package.json +2 -2
- package/node_modules/@microsoft/powerapps-player-actions/lib/Actions/ListTables.d.ts +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib/Actions/ListTables.d.ts.map +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib/Actions/ListTables.js +11 -2
- package/node_modules/@microsoft/powerapps-player-actions/lib/Actions/ListTables.js.map +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib/CodeGen/modelServiceGenerator.d.ts +10 -0
- package/node_modules/@microsoft/powerapps-player-actions/lib/CodeGen/modelServiceGenerator.d.ts.map +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib/CodeGen/modelServiceGenerator.js +98 -36
- package/node_modules/@microsoft/powerapps-player-actions/lib/CodeGen/modelServiceGenerator.js.map +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib/__tests__/ModelServiceGenerator.spec.js +16 -2
- package/node_modules/@microsoft/powerapps-player-actions/lib/__tests__/ModelServiceGenerator.spec.js.map +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/Actions/ListTables.d.ts +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/Actions/ListTables.d.ts.map +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/Actions/ListTables.js +14 -5
- package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/Actions/ListTables.js.map +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/CodeGen/modelServiceGenerator.d.ts +10 -0
- package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/CodeGen/modelServiceGenerator.d.ts.map +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/CodeGen/modelServiceGenerator.js +139 -65
- package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/CodeGen/modelServiceGenerator.js.map +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/__tests__/ModelServiceGenerator.spec.js +31 -1
- package/node_modules/@microsoft/powerapps-player-actions/lib-cjs/__tests__/ModelServiceGenerator.spec.js.map +1 -1
- package/node_modules/@microsoft/powerapps-player-actions/package.json +2 -2
- package/node_modules/@pa-client/powerapps-player-services/lib/Services/Connectivity/__tests__/ApimService.spec.js +3 -0
- package/node_modules/@pa-client/powerapps-player-services/lib/Services/Connectivity/__tests__/ApimService.spec.js.map +1 -1
- package/node_modules/@pa-client/powerapps-player-services/lib/Services/PlayerLaunchService/PlayerLaunchService.types.d.ts +1 -0
- package/node_modules/@pa-client/powerapps-player-services/lib/Services/PlayerLaunchService/PlayerLaunchService.types.d.ts.map +1 -1
- package/node_modules/@pa-client/powerapps-player-services/lib-cjs/Services/Connectivity/__tests__/ApimService.spec.js +3 -0
- package/node_modules/@pa-client/powerapps-player-services/lib-cjs/Services/Connectivity/__tests__/ApimService.spec.js.map +1 -1
- package/node_modules/@pa-client/powerapps-player-services/lib-cjs/Services/PlayerLaunchService/PlayerLaunchService.types.d.ts +1 -0
- package/node_modules/@pa-client/powerapps-player-services/lib-cjs/Services/PlayerLaunchService/PlayerLaunchService.types.d.ts.map +1 -1
- package/node_modules/@pa-client/powerapps-player-services/package.json +1 -1
- package/package.json +4 -4
|
@@ -4,9 +4,54 @@
|
|
|
4
4
|
import { expect } from '@jest/globals';
|
|
5
5
|
import fs from 'fs';
|
|
6
6
|
import path from 'path';
|
|
7
|
+
import os from 'os';
|
|
7
8
|
import process from 'process';
|
|
8
|
-
import { DEFAULT_COMMAND_MAX_BUFFER, DEFAULT_COMMAND_TIMEOUT_MS,
|
|
9
|
+
import { DEFAULT_COMMAND_MAX_BUFFER, DEFAULT_COMMAND_TIMEOUT_MS, runCliCommandAllowFailure, testDir, verifyCanRunNPM, } from './commandLineUtils';
|
|
9
10
|
import { spawnSync } from 'child_process';
|
|
11
|
+
import { E2E_CONFIG } from '../E2eTests/e2eConfig';
|
|
12
|
+
/** Environment variable name for CLI config directory override */
|
|
13
|
+
const POWERAPPS_CLI_CONFIG_DIR = 'POWERAPPS_CLI_CONFIG_DIR';
|
|
14
|
+
/** Default temp base directory for E2E tests */
|
|
15
|
+
const DEFAULT_E2E_TEMP_BASE = path.join(os.tmpdir(), 'powerapps-cli-e2e');
|
|
16
|
+
/** Default CLI path - imported from centralized E2E config */
|
|
17
|
+
const DEFAULT_CLI_PATH = E2E_CONFIG.cliPath;
|
|
18
|
+
/**
|
|
19
|
+
* Gets the path to power.config.json for a project.
|
|
20
|
+
*
|
|
21
|
+
* @param {string | E2eTestSetup} projectRootOrSetup - Project root path or E2eTestSetup object
|
|
22
|
+
* @returns {string} Path to power.config.json
|
|
23
|
+
*/
|
|
24
|
+
export function getConfigPath(projectRootOrSetup) {
|
|
25
|
+
const root = typeof projectRootOrSetup === 'string' ? projectRootOrSetup : projectRootOrSetup.projectRoot;
|
|
26
|
+
return path.join(root, 'power.config.json');
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Gets the auth cache directory path for a test setup.
|
|
30
|
+
*
|
|
31
|
+
* @param {E2eTestSetup} testSetup - The test setup object
|
|
32
|
+
* @returns {string} Path to auth cache directory
|
|
33
|
+
*/
|
|
34
|
+
export function getAuthCachePath(testSetup) {
|
|
35
|
+
return path.join(testSetup.cliConfigDir, 'cache', 'auth');
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Combines stdout and stderr to lowercase for test assertions.
|
|
39
|
+
*
|
|
40
|
+
* @param {object} result - Command result with stdout and stderr
|
|
41
|
+
* @returns {string} Combined lowercase output
|
|
42
|
+
*/
|
|
43
|
+
export function getCombinedOutput(result) {
|
|
44
|
+
return `${result.stdout} ${result.stderr}`.toLowerCase();
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Normalizes whitespace for help text comparison.
|
|
48
|
+
*
|
|
49
|
+
* @param {string} text - Text to normalize
|
|
50
|
+
* @returns {string} Text with whitespace normalized
|
|
51
|
+
*/
|
|
52
|
+
export function normalizeWhitespace(text) {
|
|
53
|
+
return text.replace(/\s+/g, ' ');
|
|
54
|
+
}
|
|
10
55
|
// Test helpers for power-data-runtime tests
|
|
11
56
|
/**
|
|
12
57
|
* Creates a test folder relative to the current working directory.
|
|
@@ -37,42 +82,9 @@ export function cleanupTestFolder(folderName) {
|
|
|
37
82
|
// change back to the original working directory
|
|
38
83
|
process.chdir(path.resolve(testDir, '..'));
|
|
39
84
|
}
|
|
40
|
-
/**
|
|
41
|
-
* Copies a host template app from source to destination directory.
|
|
42
|
-
*
|
|
43
|
-
* @param {string} source - Source directory path
|
|
44
|
-
* @param {string} destination - Destination directory path
|
|
45
|
-
*/
|
|
46
|
-
export function copyHostTemplateApp(source, destination) {
|
|
47
|
-
if (fs.existsSync(source) && fs.readdirSync(source).length > 0) {
|
|
48
|
-
fs.cpSync(source, destination, { recursive: true });
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
85
|
export function readJson(filePath) {
|
|
52
86
|
return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
|
|
53
87
|
}
|
|
54
|
-
/**
|
|
55
|
-
* Recursively copies a directory and its contents from source to destination.
|
|
56
|
-
*
|
|
57
|
-
* @param {string} src - Source directory path
|
|
58
|
-
* @param {string} dest - Destination directory path
|
|
59
|
-
*/
|
|
60
|
-
export function copyDirRecursive(src, dest) {
|
|
61
|
-
if (!fs.existsSync(dest)) {
|
|
62
|
-
fs.mkdirSync(dest, { recursive: true });
|
|
63
|
-
}
|
|
64
|
-
const entries = fs.readdirSync(src, { withFileTypes: true });
|
|
65
|
-
for (const entry of entries) {
|
|
66
|
-
const srcPath = path.join(src, entry.name);
|
|
67
|
-
const destPath = path.join(dest, entry.name);
|
|
68
|
-
if (entry.isDirectory()) {
|
|
69
|
-
copyDirRecursive(srcPath, destPath);
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
fs.copyFileSync(srcPath, destPath);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
88
|
/**
|
|
77
89
|
* Validates that generated model and service files exist for a given data source.
|
|
78
90
|
* Generated files follow the pattern: {DataSourceName}Model.ts and {DataSourceName}Service.ts
|
|
@@ -83,8 +95,8 @@ export function copyDirRecursive(src, dest) {
|
|
|
83
95
|
* @throws {AssertionError} if files don't exist or have invalid content
|
|
84
96
|
*/
|
|
85
97
|
export function validateGeneratedFiles(projectRoot, dataSourceName) {
|
|
86
|
-
const generatedModelsDir = path.join(projectRoot, 'generated', 'models');
|
|
87
|
-
const generatedServicesDir = path.join(projectRoot, 'generated', 'services');
|
|
98
|
+
const generatedModelsDir = path.join(projectRoot, 'src', 'generated', 'models');
|
|
99
|
+
const generatedServicesDir = path.join(projectRoot, 'src', 'generated', 'services');
|
|
88
100
|
// Check if generated directories exist
|
|
89
101
|
expect(fs.existsSync(generatedModelsDir)).toBe(true);
|
|
90
102
|
expect(fs.existsSync(generatedServicesDir)).toBe(true);
|
|
@@ -119,10 +131,9 @@ export function validateGeneratedFiles(projectRoot, dataSourceName) {
|
|
|
119
131
|
*/
|
|
120
132
|
export function setupE2eTestProject(config) {
|
|
121
133
|
var _a;
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
throw new Error(`The built CLI entry point at ${config.cliPath} was not found. Run 'npm run bundle' before executing the E2E suite.`);
|
|
134
|
+
const cliPath = (_a = config.cliPath) !== null && _a !== void 0 ? _a : DEFAULT_CLI_PATH;
|
|
135
|
+
if (!fs.existsSync(cliPath)) {
|
|
136
|
+
throw new Error(`The built CLI entry point at ${cliPath} was not found. Run 'npm run bundle' before executing the E2E suite.`);
|
|
126
137
|
}
|
|
127
138
|
if (!verifyCanRunNPM()) {
|
|
128
139
|
throw new Error('NPM executable is not available on PATH. Install Node.js/npm before running E2E tests.');
|
|
@@ -139,7 +150,7 @@ export function setupE2eTestProject(config) {
|
|
|
139
150
|
extractZip(config.hostTemplateFolder, projectRoot);
|
|
140
151
|
}
|
|
141
152
|
else {
|
|
142
|
-
|
|
153
|
+
fs.cpSync(config.hostTemplateFolder, projectRoot, { recursive: true });
|
|
143
154
|
}
|
|
144
155
|
}
|
|
145
156
|
return projectRoot;
|
|
@@ -167,20 +178,19 @@ export function cleanupE2eTestProject(projectRoot) {
|
|
|
167
178
|
}
|
|
168
179
|
}
|
|
169
180
|
/**
|
|
170
|
-
* Creates a
|
|
171
|
-
*
|
|
181
|
+
* Creates a command executor that allows CLI command failures.
|
|
182
|
+
* Useful for testing error scenarios and validating error handling.
|
|
172
183
|
*
|
|
184
|
+
* @param {object} options - Configuration object
|
|
173
185
|
* @param {string} [options.cliPath] - Path to the CLI entry point (defaults to dist/nomodule/powerapps-player-cli.js)
|
|
174
186
|
* @param {string} options.workingDirectory - Working directory for command execution
|
|
175
187
|
* @param {NodeJS.ProcessEnv} [options.envOverrides] - Environment variable overrides
|
|
176
|
-
* @returns {(verb: string, args?: string[]) =>
|
|
188
|
+
* @returns {(verb: string, args?: string[]) => CliCommandResultWithExitCode} executor function
|
|
177
189
|
*/
|
|
178
190
|
export function createExecuteCodeCommand(options) {
|
|
179
191
|
var _a;
|
|
180
192
|
const { workingDirectory: projectRoot, envOverrides } = options;
|
|
181
|
-
const cliPath = (_a = options.cliPath) !== null && _a !== void 0 ? _a :
|
|
182
|
-
// eslint-disable-next-line no-external-vars
|
|
183
|
-
path.resolve(__dirname, '..', '..', '..', 'dist', 'nomodule', 'powerapps-player-cli.js');
|
|
193
|
+
const cliPath = (_a = options.cliPath) !== null && _a !== void 0 ? _a : DEFAULT_CLI_PATH;
|
|
184
194
|
const sharedOptions = {
|
|
185
195
|
env: {
|
|
186
196
|
CI: 'true',
|
|
@@ -192,42 +202,203 @@ export function createExecuteCodeCommand(options) {
|
|
|
192
202
|
maxBuffer: DEFAULT_COMMAND_MAX_BUFFER,
|
|
193
203
|
};
|
|
194
204
|
return (verb, args = []) => {
|
|
195
|
-
const result =
|
|
205
|
+
const result = runCliCommandAllowFailure({ ...sharedOptions, verb, args });
|
|
196
206
|
return result;
|
|
197
207
|
};
|
|
198
208
|
}
|
|
209
|
+
export function readConfig(projectRoot) {
|
|
210
|
+
return readJson(getConfigPath(projectRoot));
|
|
211
|
+
}
|
|
199
212
|
/**
|
|
200
|
-
* Creates a
|
|
201
|
-
*
|
|
213
|
+
* Creates a minimal power.config.json for testing.
|
|
214
|
+
* Use this instead of manually creating config objects in individual test files.
|
|
202
215
|
*
|
|
203
|
-
* @param
|
|
204
|
-
* @
|
|
205
|
-
* @param {string} options.workingDirectory - Working directory for command execution
|
|
206
|
-
* @param {NodeJS.ProcessEnv} [options.envOverrides] - Environment variable overrides
|
|
207
|
-
* @returns {(verb: string, args?: string[]) => CliCommandResultWithExitCode} executor function
|
|
216
|
+
* @param overrides - Partial config to override defaults
|
|
217
|
+
* @returns A complete minimal config object
|
|
208
218
|
*/
|
|
209
|
-
export function
|
|
219
|
+
export function createMinimalConfig(overrides) {
|
|
220
|
+
return {
|
|
221
|
+
version: '1.0',
|
|
222
|
+
appId: null,
|
|
223
|
+
appDisplayName: 'Test App',
|
|
224
|
+
region: 'prod',
|
|
225
|
+
environmentId: '',
|
|
226
|
+
description: 'Test application',
|
|
227
|
+
buildPath: './dist',
|
|
228
|
+
buildEntryPoint: 'index.html',
|
|
229
|
+
localAppUrl: 'http://localhost:3000',
|
|
230
|
+
logoPath: 'Default',
|
|
231
|
+
connectionReferences: {},
|
|
232
|
+
databaseReferences: {},
|
|
233
|
+
...overrides,
|
|
234
|
+
};
|
|
235
|
+
}
|
|
236
|
+
/**
|
|
237
|
+
* Writes a minimal config file to the test project root.
|
|
238
|
+
* Convenience wrapper around createMinimalConfig + fs.writeFileSync.
|
|
239
|
+
*
|
|
240
|
+
* @param testSetup - The E2eTestSetup object
|
|
241
|
+
* @param overrides - Partial config to override defaults
|
|
242
|
+
*/
|
|
243
|
+
export function writeMinimalConfig(testSetup, overrides) {
|
|
244
|
+
const config = createMinimalConfig(overrides);
|
|
245
|
+
fs.writeFileSync(getConfigPath(testSetup), JSON.stringify(config, null, 2));
|
|
246
|
+
}
|
|
247
|
+
/**
|
|
248
|
+
* Sets up a complete E2E test environment with isolated configuration.
|
|
249
|
+
* This is the recommended way to set up E2E tests as it:
|
|
250
|
+
* - Creates a unique project directory
|
|
251
|
+
* - Creates an isolated CLI config directory to prevent test interference
|
|
252
|
+
* - Pre-configures command executors with proper environment overrides
|
|
253
|
+
* - Provides a cleanup function for afterAll
|
|
254
|
+
*
|
|
255
|
+
* @example
|
|
256
|
+
* ```typescript
|
|
257
|
+
* let testSetup: E2eTestSetup;
|
|
258
|
+
*
|
|
259
|
+
* beforeAll(() => {
|
|
260
|
+
* testSetup = setupE2eTest({ testFolderName: 'myTests' });
|
|
261
|
+
* });
|
|
262
|
+
*
|
|
263
|
+
* afterAll(() => {
|
|
264
|
+
* testSetup.cleanup();
|
|
265
|
+
* });
|
|
266
|
+
*
|
|
267
|
+
* it('runs a command', () => {
|
|
268
|
+
* const result = testSetup.execute('logout', []);
|
|
269
|
+
* expect(result.stderr).toBe('');
|
|
270
|
+
* });
|
|
271
|
+
* ```
|
|
272
|
+
*
|
|
273
|
+
* @param config - Configuration options
|
|
274
|
+
* @param config.testFolderName - Unique name for the test folder
|
|
275
|
+
* @param config.tempBaseDir - Optional base directory for temp folders
|
|
276
|
+
* @param config.hostTemplateFolder - Optional host template to copy
|
|
277
|
+
* @param config.cliPath - Optional path to CLI entry point
|
|
278
|
+
* @returns E2eTestSetup object with all test infrastructure
|
|
279
|
+
*/
|
|
280
|
+
export function setupE2eTest(config) {
|
|
210
281
|
var _a;
|
|
211
|
-
const
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
282
|
+
const tempBaseDir = (_a = config.tempBaseDir) !== null && _a !== void 0 ? _a : DEFAULT_E2E_TEMP_BASE;
|
|
283
|
+
// Create the project root
|
|
284
|
+
const projectRoot = setupE2eTestProject({
|
|
285
|
+
tempBaseDir,
|
|
286
|
+
testFolderName: config.testFolderName,
|
|
287
|
+
hostTemplateFolder: config.hostTemplateFolder,
|
|
288
|
+
cliPath: config.cliPath,
|
|
289
|
+
});
|
|
290
|
+
// Create isolated config directory
|
|
291
|
+
const cliConfigDir = path.join(tempBaseDir, config.testFolderName, '.powerapps-cli');
|
|
292
|
+
if (!fs.existsSync(cliConfigDir)) {
|
|
293
|
+
fs.mkdirSync(cliConfigDir, { recursive: true });
|
|
294
|
+
}
|
|
295
|
+
const userSettingsPath = path.join(cliConfigDir, 'userSettings.json');
|
|
296
|
+
// Environment overrides for test isolation
|
|
297
|
+
const envOverrides = {
|
|
298
|
+
[POWERAPPS_CLI_CONFIG_DIR]: cliConfigDir,
|
|
224
299
|
};
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
300
|
+
// Create command executors
|
|
301
|
+
const execute = createExecuteCodeCommand({
|
|
302
|
+
workingDirectory: projectRoot,
|
|
303
|
+
envOverrides,
|
|
304
|
+
cliPath: config.cliPath,
|
|
305
|
+
});
|
|
306
|
+
// Cleanup function
|
|
307
|
+
const cleanup = () => {
|
|
308
|
+
cleanupE2eTestProject(projectRoot);
|
|
309
|
+
// Also clean up the isolated config dir if it's outside projectRoot
|
|
310
|
+
if (cliConfigDir && !cliConfigDir.startsWith(projectRoot) && fs.existsSync(cliConfigDir)) {
|
|
311
|
+
fs.rmSync(cliConfigDir, { recursive: true, force: true });
|
|
312
|
+
}
|
|
313
|
+
};
|
|
314
|
+
return {
|
|
315
|
+
projectRoot,
|
|
316
|
+
cliConfigDir,
|
|
317
|
+
userSettingsPath,
|
|
318
|
+
envOverrides,
|
|
319
|
+
execute,
|
|
320
|
+
cleanup,
|
|
228
321
|
};
|
|
229
322
|
}
|
|
230
|
-
|
|
231
|
-
|
|
323
|
+
/**
|
|
324
|
+
* Executes a callback with the power.config.json temporarily removed.
|
|
325
|
+
* Useful for testing error scenarios when config is missing.
|
|
326
|
+
* The config file is automatically restored after the callback completes (or throws).
|
|
327
|
+
*
|
|
328
|
+
* @example
|
|
329
|
+
* ```typescript
|
|
330
|
+
* it('errors when config is missing', () => {
|
|
331
|
+
* withoutConfig(testSetup, () => {
|
|
332
|
+
* const result = testSetup.executeAllowFailure('list-codeapps', []);
|
|
333
|
+
* expect(result.exitCode).not.toBe(0);
|
|
334
|
+
* });
|
|
335
|
+
* });
|
|
336
|
+
* ```
|
|
337
|
+
*
|
|
338
|
+
* @param testSetup - The E2eTestSetup object containing the project root
|
|
339
|
+
* @param callback - Function to execute while config is absent
|
|
340
|
+
* @returns The return value of the callback
|
|
341
|
+
*/
|
|
342
|
+
export function withoutConfig(testSetup, callback) {
|
|
343
|
+
const configPath = getConfigPath(testSetup);
|
|
344
|
+
const configExists = fs.existsSync(configPath);
|
|
345
|
+
let configBackup = null;
|
|
346
|
+
if (configExists) {
|
|
347
|
+
configBackup = fs.readFileSync(configPath, 'utf-8');
|
|
348
|
+
fs.unlinkSync(configPath);
|
|
349
|
+
}
|
|
350
|
+
try {
|
|
351
|
+
return callback();
|
|
352
|
+
}
|
|
353
|
+
finally {
|
|
354
|
+
if (configBackup !== null) {
|
|
355
|
+
fs.writeFileSync(configPath, configBackup);
|
|
356
|
+
}
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
/**
|
|
360
|
+
* Executes a callback with a custom power.config.json temporarily in place.
|
|
361
|
+
* Useful for testing error scenarios with corrupted or incomplete configs.
|
|
362
|
+
* The original config file is automatically restored after the callback completes (or throws).
|
|
363
|
+
*
|
|
364
|
+
* @example
|
|
365
|
+
* ```typescript
|
|
366
|
+
* it('errors when config is invalid', () => {
|
|
367
|
+
* withTemporaryConfig(testSetup, '{ invalid json }', () => {
|
|
368
|
+
* const result = testSetup.executeAllowFailure('list-codeapps', []);
|
|
369
|
+
* expect(result.exitCode).not.toBe(0);
|
|
370
|
+
* });
|
|
371
|
+
* });
|
|
372
|
+
* ```
|
|
373
|
+
*
|
|
374
|
+
* @param testSetup - The E2eTestSetup object containing the project root
|
|
375
|
+
* @param temporaryContent - Content to write as power.config.json during the callback
|
|
376
|
+
* @param callback - Function to execute with the temporary config
|
|
377
|
+
* @returns The return value of the callback
|
|
378
|
+
*/
|
|
379
|
+
export function withTemporaryConfig(testSetup, temporaryContent, callback) {
|
|
380
|
+
const configPath = getConfigPath(testSetup);
|
|
381
|
+
const configExists = fs.existsSync(configPath);
|
|
382
|
+
let configBackup = null;
|
|
383
|
+
if (configExists) {
|
|
384
|
+
configBackup = fs.readFileSync(configPath, 'utf-8');
|
|
385
|
+
}
|
|
386
|
+
// Write temporary config
|
|
387
|
+
const content = typeof temporaryContent === 'string' ? temporaryContent : JSON.stringify(temporaryContent, null, 2);
|
|
388
|
+
fs.writeFileSync(configPath, content);
|
|
389
|
+
try {
|
|
390
|
+
return callback();
|
|
391
|
+
}
|
|
392
|
+
finally {
|
|
393
|
+
if (configBackup !== null) {
|
|
394
|
+
fs.writeFileSync(configPath, configBackup);
|
|
395
|
+
}
|
|
396
|
+
else {
|
|
397
|
+
// Original didn't exist, remove the temp file
|
|
398
|
+
if (fs.existsSync(configPath)) {
|
|
399
|
+
fs.unlinkSync(configPath);
|
|
400
|
+
}
|
|
401
|
+
}
|
|
402
|
+
}
|
|
232
403
|
}
|
|
233
404
|
//# sourceMappingURL=testHelpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testHelpers.js","sourceRoot":"","sources":["../../../src/__tests__/helpers/testHelpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"testHelpers.js","sourceRoot":"","sources":["../../../src/__tests__/helpers/testHelpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArgumentProvider.d.ts","sourceRoot":"","sources":["../src/ArgumentProvider.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAS,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,4DAA4D,CAAC;AAMzF,OAAO,EAAE,OAAO,EAAU,MAAM,qEAAqE,CAAC;AAGtG,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAM5D,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACtC,UAAU,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC1C,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACtC,WAAW,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC3C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,IAAI,IAAI,CAAC;IAChB,8BAA8B,IAAI,IAAI,CAAC;IACvC,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC9D,yBAAyB,IAAI,uBAAuB,CAAC;IACrD,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED,qBAAa,gBAAiB,YAAW,iBAAiB;IAQtD,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,uBAAuB;IATjC,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,QAAQ,CAAiC;gBAGvC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,uBAAuB,EAAE,uBAAuB;IAwEnD,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAIrC,WAAW,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAI1C,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAIrC,UAAU,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAInC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ArgumentProvider.d.ts","sourceRoot":"","sources":["../src/ArgumentProvider.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAS,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,4DAA4D,CAAC;AAMzF,OAAO,EAAE,OAAO,EAAU,MAAM,qEAAqE,CAAC;AAGtG,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAM5D,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACtC,UAAU,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC1C,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACtC,WAAW,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC3C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,IAAI,IAAI,CAAC;IAChB,8BAA8B,IAAI,IAAI,CAAC;IACvC,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC9D,yBAAyB,IAAI,uBAAuB,CAAC;IACrD,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED,qBAAa,gBAAiB,YAAW,iBAAiB;IAQtD,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,uBAAuB;IATjC,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,QAAQ,CAAiC;gBAGvC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,uBAAuB,EAAE,uBAAuB;IAwEnD,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAIrC,WAAW,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAI1C,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAIrC,UAAU,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAInC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB9B,8BAA8B;IAU9B,OAAO,IAAI,IAAI;IAOT,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IA8BnE,yBAAyB,IAAI,uBAAuB;IAI3D;;;;;OAKG;IACI,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAIzC,gBAAgB,IAAI,MAAM,GAAG,SAAS;YAI/B,qBAAqB;IAsBnC;;;OAGG;IACH,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,YAAY;IAKpB,OAAO,CAAC,kBAAkB;CAI3B"}
|
|
@@ -174,6 +174,12 @@ var ArgumentProvider = /** @class */ (function () {
|
|
|
174
174
|
}
|
|
175
175
|
return [4 /*yield*/, this._getRequiredVariables()];
|
|
176
176
|
case 1:
|
|
177
|
+
_a.sent();
|
|
178
|
+
if (!this._region) {
|
|
179
|
+
throw new Error('Region is not set');
|
|
180
|
+
}
|
|
181
|
+
return [4 /*yield*/, this._authenticationProvider.initAsync(this._region)];
|
|
182
|
+
case 2:
|
|
177
183
|
_a.sent();
|
|
178
184
|
return [2 /*return*/];
|
|
179
185
|
}
|
|
@@ -252,7 +258,7 @@ var ArgumentProvider = /** @class */ (function () {
|
|
|
252
258
|
return __generator(this, function (_a) {
|
|
253
259
|
switch (_a.label) {
|
|
254
260
|
case 0:
|
|
255
|
-
if (!(this._verb !== 'telemetry')) return [3 /*break*/,
|
|
261
|
+
if (!(this._verb !== 'telemetry' && this._verb !== 'logout')) return [3 /*break*/, 2];
|
|
256
262
|
if (!!this._environmentId) return [3 /*break*/, 2];
|
|
257
263
|
return [4 /*yield*/, this.getOption('environmentId')];
|
|
258
264
|
case 1:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArgumentProvider.js","sourceRoot":"","sources":["../src/ArgumentProvider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ArgumentProvider.js","sourceRoot":"","sources":["../src/ArgumentProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,13 @@
|
|
|
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;
|
|
8
|
-
|
|
9
|
+
private _region;
|
|
10
|
+
constructor();
|
|
11
|
+
initAsync(region: Region): Promise<void>;
|
|
9
12
|
getAccessTokenForResource(resource: string): Promise<string>;
|
|
10
13
|
getUserTenantId(): string | undefined;
|
|
11
14
|
private _acquireTokenInternal;
|
|
@@ -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;;IAIvB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBxC,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMlE,eAAe,IAAI,MAAM,GAAG,SAAS;YAI9B,qBAAqB;IAiCnC,OAAO,CAAC,2BAA2B;CAepC"}
|
|
@@ -47,15 +47,17 @@ 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
52
|
function NodeMsalAuthenticationProvider() {
|
|
52
53
|
}
|
|
53
|
-
NodeMsalAuthenticationProvider.prototype.initAsync = function () {
|
|
54
|
+
NodeMsalAuthenticationProvider.prototype.initAsync = function (region) {
|
|
54
55
|
return __awaiter(this, void 0, void 0, function () {
|
|
55
56
|
var persistenceConfiguration, persistence, authConfig;
|
|
56
57
|
return __generator(this, function (_a) {
|
|
57
58
|
switch (_a.label) {
|
|
58
59
|
case 0:
|
|
60
|
+
this._region = region;
|
|
59
61
|
persistenceConfiguration = {
|
|
60
62
|
cachePath: Constants_1.AUTH_CACHE_DIRECTORY + '/msal_cache.json',
|
|
61
63
|
dataProtectionScope: msal_node_extensions_1.DataProtectionScope.CurrentUser,
|
|
@@ -68,6 +70,7 @@ var NodeMsalAuthenticationProvider = /** @class */ (function () {
|
|
|
68
70
|
persistence = _a.sent();
|
|
69
71
|
authConfig = {
|
|
70
72
|
auth: {
|
|
73
|
+
authority: (0, CliUtils_1.getAuthority)(this._region, this._tenantId),
|
|
71
74
|
clientId: '9cee029c-6210-4654-90bb-17e6e9d36617',
|
|
72
75
|
},
|
|
73
76
|
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":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* Copyright (C) Microsoft Corporation. All rights reserved.
|
|
3
3
|
*/
|
|
4
|
+
import { Region } from '@pa-client/powerapps-player-services/lib/Types/PlayerServices.types';
|
|
4
5
|
import { IAuthenticationProvider } from '../Types/Cli.types';
|
|
5
6
|
export declare class PacCliAuthenticationProvider implements IAuthenticationProvider {
|
|
6
7
|
private _tokenCache;
|
|
7
|
-
initAsync(): Promise<void>;
|
|
8
|
+
initAsync(region: Region): Promise<void>;
|
|
8
9
|
getAccessTokenForResource(resource: string): Promise<string>;
|
|
9
10
|
getUserTenantId(): string | undefined;
|
|
10
11
|
private _getAccessTokenFromResourceInternal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PacCliAuthenticationProvider.d.ts","sourceRoot":"","sources":["../../src/Authentication/PacCliAuthenticationProvider.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,qBAAa,4BAA6B,YAAW,uBAAuB;IAC1E,OAAO,CAAC,WAAW,CAA8B;IAEpC,SAAS,
|
|
1
|
+
{"version":3,"file":"PacCliAuthenticationProvider.d.ts","sourceRoot":"","sources":["../../src/Authentication/PacCliAuthenticationProvider.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,qEAAqE,CAAC;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,qBAAa,4BAA6B,YAAW,uBAAuB;IAC1E,OAAO,CAAC,WAAW,CAA8B;IAEpC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIlE,eAAe,IAAI,MAAM,GAAG,SAAS;YAI9B,mCAAmC;IAgBjD,OAAO,CAAC,aAAa;YAIP,UAAU;CAqBzB"}
|
|
@@ -68,7 +68,7 @@ var PacCliAuthenticationProvider = /** @class */ (function () {
|
|
|
68
68
|
function PacCliAuthenticationProvider() {
|
|
69
69
|
this._tokenCache = {};
|
|
70
70
|
}
|
|
71
|
-
PacCliAuthenticationProvider.prototype.initAsync = function () {
|
|
71
|
+
PacCliAuthenticationProvider.prototype.initAsync = function (region) {
|
|
72
72
|
return __awaiter(this, void 0, void 0, function () {
|
|
73
73
|
return __generator(this, function (_a) {
|
|
74
74
|
return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PacCliAuthenticationProvider.js","sourceRoot":"","sources":["../../src/Authentication/PacCliAuthenticationProvider.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"PacCliAuthenticationProvider.js","sourceRoot":"","sources":["../../src/Authentication/PacCliAuthenticationProvider.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIH,iDAAqC;AAErC;IAAA;QACU,gBAAW,GAA2B,EAAE,CAAC;IAuDnD,CAAC;IArDc,gDAAS,GAAtB,UAAuB,MAAc;;;;;;KAEpC;IAEY,gEAAyB,GAAtC,UAAuC,QAAgB;;;gBACrD,sBAAO,IAAI,CAAC,mCAAmC,CAAC,QAAQ,CAAC,EAAC;;;KAC3D;IAEM,sDAAe,GAAtB;QACE,OAAO,SAAS,CAAC;IACnB,CAAC;IAEa,0EAAmC,GAAjD,UAAkD,QAAgB;;;;;;wBAChE,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE;4BAC9B,sBAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAC;yBACnC;wBAED,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;wBACf,qBAAM,IAAI,CAAC,UAAU,EAAE,EAAA;;wBAA/B,KAAK,GAAG,SAAuB;wBAErC,IAAI,CAAC,KAAK,EAAE;4BACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;yBACtC;wBAED,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;wBACnC,sBAAO,KAAK,EAAC;;;;KACd;IAEO,oDAAa,GAArB,UAAsB,QAAgB;QACpC,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAEa,iDAAU,GAAxB;;;gBACE,sBAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;wBACjC,IAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;4BAClC,KAAK,EAAE,OAAO,CAAC,KAAK;4BACpB,MAAM,EAAE,OAAO,CAAC,MAAM;4BACtB,QAAQ,EAAE,KAAK;yBAChB,CAAC,CAAC;wBAEH,4DAA4D;wBAC5D,IAAM,OAAO,GAAG,UAAU,CAAC;4BACzB,EAAE,CAAC,KAAK,EAAE,CAAC;4BACX,MAAM,CAAC,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC,CAAC;wBAChF,CAAC,EAAE,KAAK,CAAC,CAAC;wBAEV,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,UAAC,IAAI;4BACnB,YAAY,CAAC,OAAO,CAAC,CAAC;4BACtB,EAAE,CAAC,KAAK,EAAE,CAAC;4BACX,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;wBACvB,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,EAAC;;;KACJ;IACH,mCAAC;AAAD,CAAC,AAxDD,IAwDC;AAxDY,oEAA4B"}
|
|
@@ -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,8 +11,9 @@ export declare class ServicePrincipalAuthenticationProvider implements IAuthenti
|
|
|
10
11
|
private _clientId;
|
|
11
12
|
private _clientSecret;
|
|
12
13
|
private _tenantId;
|
|
14
|
+
private _region;
|
|
13
15
|
constructor();
|
|
14
|
-
initAsync(): Promise<void>;
|
|
16
|
+
initAsync(region: Region): Promise<void>;
|
|
15
17
|
getAccessTokenForResource(resource: string): Promise<string>;
|
|
16
18
|
getUserTenantId(): string | undefined;
|
|
17
19
|
}
|
|
@@ -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;;IAavB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAaxC,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBlE,eAAe,IAAI,MAAM,GAAG,SAAS;CAG7C"}
|