Skip to content

GlobalService use GSEnvironmentClient response for AppId and RedirectUri #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

GlobalService use GSEnvironmentClient response for AppId and RedirectUri #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14fd25b
GlobalService use GSEnvironmentClient response for AppId and RedirectUri
albertospelta Apr 2, 2021
70ccf13
Merge branch 'master' into globalservice-client-auth
CattieCat Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Common/Commands.Common.Test/PowerBISettingsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,14 @@ private static void AssertValidCloudEnvironment(string cloudName, IPowerBIEnviro
{
var cloudEnvironment = cloudEnvironments.Environments.FirstOrDefault(c => c.CloudName.Equals(cloudName, StringComparison.OrdinalIgnoreCase));
var backendService = cloudEnvironment.Services.First(s => s.Name.Equals("powerbi-backend", StringComparison.OrdinalIgnoreCase));
var redirectApp = cloudEnvironment.Clients.First(s => s.Name.Equals("powerbi-gateway", StringComparison.OrdinalIgnoreCase));

Assert.AreEqual(cloudEnvironment.Services.First(s => s.Name.Equals("aad", StringComparison.OrdinalIgnoreCase)).Endpoint, environment.AzureADAuthority);
AssertValidEnvironmentSharedProperties(environment);
Assert.AreEqual(backendService.ResourceId, environment.AzureADResource);
Assert.AreEqual(backendService.Endpoint, environment.GlobalServiceEndpoint);
Assert.AreEqual(redirectApp.AppId, environment.AzureADClientId);
Assert.AreEqual(redirectApp.RedirectUri, environment.AzureADRedirectAddress);
}

private static void AssertValidEnvironmentSharedProperties(IPowerBIEnvironment environment)
Expand Down
8 changes: 1 addition & 7 deletions src/Common/Commands.Common/GSCloudEnvironments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class GSEnvironment
public IEnumerable<GSEnvironmentService> Services { get; set; }

[DataMember(Name = "clients")]
public IEnumerable<GSEnvironmentService> Clients { get; set; }
public IEnumerable<GSEnvironmentClient> Clients { get; set; }
}

[DataContract]
Expand All @@ -42,12 +42,6 @@ public class GSEnvironmentService

[DataMember(Name = "allowedDomains")]
public IEnumerable<string> AllowedDomains { get; set; }

[DataMember(Name = "appId")]
public string AppId { get; set; }

[DataMember(Name = "redirectUri")]
public string RedirectUri { get; set; }
}

[DataContract]
Expand Down