July 2020 Intermediate Release 1

erwinvanhunen · erwinvanhunen · commit 713d3dc36ac6 · 2020-07-17T11:01:49.000+02:00
diff --git a/Commands/Base/PnPConnection.cs b/Commands/Base/PnPConnection.cs
@@ -237,7 +237,7 @@ internal GenericToken TryGetToken(TokenAudience tokenAudience, string[] orRoles
                                 var scopes = Scopes.Except(officeManagementApiScopes).ToArray();
                                 if (scopes.Length > 0)
                                 {
-                                    token = PSCredential == null ? GraphToken.AcquireApplicationTokenInteractive(DeviceLoginClientId, Scopes) : GraphToken.AcquireDelegatedTokenWithCredentials(DeviceLoginClientId, scopes, PSCredential.UserName, PSCredential.Password);
+                                    token = PSCredential == null ? GraphToken.AcquireApplicationTokenInteractive(DeviceLoginClientId, scopes) : GraphToken.AcquireDelegatedTokenWithCredentials(DeviceLoginClientId, scopes, PSCredential.UserName, PSCredential.Password);
                                 }
                                 else
                                 {
@@ -265,7 +265,7 @@ internal GenericToken TryGetToken(TokenAudience tokenAudience, string[] orRoles
                             // Take the remaining scopes and try requesting them from the Microsoft Graph API
                             if (scopes.Length > 0)
                             {
-                                token = PSCredential == null ? OfficeManagementApiToken.AcquireApplicationTokenInteractive(DeviceLoginClientId, Scopes) : OfficeManagementApiToken.AcquireDelegatedTokenWithCredentials(DeviceLoginClientId, scopes, PSCredential.UserName, PSCredential.Password);
+                                token = PSCredential == null ? OfficeManagementApiToken.AcquireApplicationTokenInteractive(DeviceLoginClientId, scopes) : OfficeManagementApiToken.AcquireDelegatedTokenWithCredentials(DeviceLoginClientId, scopes, PSCredential.UserName, PSCredential.Password);
                             }
                             else
                             {

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ internal GenericToken TryGetToken(TokenAudience tokenAudience, string[] orRoles`
`237`	`237`	`var scopes = Scopes.Except(officeManagementApiScopes).ToArray();`
`238`	`238`	`if (scopes.Length > 0)`
`239`	`239`	`{`
`240`		`- token = PSCredential == null ? GraphToken.AcquireApplicationTokenInteractive(DeviceLoginClientId, Scopes) : GraphToken.AcquireDelegatedTokenWithCredentials(DeviceLoginClientId, scopes, PSCredential.UserName, PSCredential.Password);`
	`240`	`+ token = PSCredential == null ? GraphToken.AcquireApplicationTokenInteractive(DeviceLoginClientId, scopes) : GraphToken.AcquireDelegatedTokenWithCredentials(DeviceLoginClientId, scopes, PSCredential.UserName, PSCredential.Password);`
`241`	`241`	`}`
`242`	`242`	`else`
`243`	`243`	`{`
`@@ -265,7 +265,7 @@ internal GenericToken TryGetToken(TokenAudience tokenAudience, string[] orRoles`
`265`	`265`	`// Take the remaining scopes and try requesting them from the Microsoft Graph API`
`266`	`266`	`if (scopes.Length > 0)`
`267`	`267`	`{`
`268`		`- token = PSCredential == null ? OfficeManagementApiToken.AcquireApplicationTokenInteractive(DeviceLoginClientId, Scopes) : OfficeManagementApiToken.AcquireDelegatedTokenWithCredentials(DeviceLoginClientId, scopes, PSCredential.UserName, PSCredential.Password);`
	`268`	`+ token = PSCredential == null ? OfficeManagementApiToken.AcquireApplicationTokenInteractive(DeviceLoginClientId, scopes) : OfficeManagementApiToken.AcquireDelegatedTokenWithCredentials(DeviceLoginClientId, scopes, PSCredential.UserName, PSCredential.Password);`
`269`	`269`	`}`
`270`	`270`	`else`
`271`	`271`	`{`