azure/login
1
0
Fork 0
mirror of https://github.com/azure/login.git synced 2026-03-15 09:20:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflict attempt #1.

Browse Source
This commit is contained in:
Arjun Gupta
2020-12-28 16:29:52 +05:30
parent de36370b39 aa362ff93f
commit 9584e50c92
15 changed files with 604 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/PowerShell/ServicePrincipalLogin.js
View File

@@ -25,13 +25,21 @@ const PowerShellToolRunner_1 = __importDefault(require("./Utilities/PowerShellTo
const ScriptBuilder_1 = __importDefault(require("./Utilities/ScriptBuilder"));
const Constants_1 = __importDefault(require("./Constants"));
class ServicePrincipalLogin {
<<<<<<< HEAD
constructor(servicePrincipalId, servicePrincipalKey, tenantId, subscriptionId, environment, resourceManagerEndpointUrl) {
=======
constructor(servicePrincipalId, servicePrincipalKey, tenantId, subscriptionId, allowNoSubscriptionsLogin) {
>>>>>>> master
this.servicePrincipalId = servicePrincipalId;
this.servicePrincipalKey = servicePrincipalKey;
this.tenantId = tenantId;
this.subscriptionId = subscriptionId;
<<<<<<< HEAD
this.environment = environment;
this.resourceManagerEndpointUrl = resourceManagerEndpointUrl;
=======
this.allowNoSubscriptionsLogin = allowNoSubscriptionsLogin;
>>>>>>> master
}
initialize() {
return __awaiter(this, void 0, void 0, function* () {
@@ -55,9 +63,15 @@ class ServicePrincipalLogin {
servicePrincipalId: this.servicePrincipalId,
servicePrincipalKey: this.servicePrincipalKey,
subscriptionId: this.subscriptionId,
<<<<<<< HEAD
environment: this.environment,
scopeLevel: ServicePrincipalLogin.scopeLevel,
resourceManagerEndpointUrl: this.resourceManagerEndpointUrl,
=======
environment: ServicePrincipalLogin.environment,
scopeLevel: ServicePrincipalLogin.scopeLevel,
allowNoSubscriptionsLogin: this.allowNoSubscriptionsLogin
>>>>>>> master
};
const script = new ScriptBuilder_1.default().getAzPSLoginScript(ServicePrincipalLogin.scheme, this.tenantId, args);
yield PowerShellToolRunner_1.default.init();