From 14fd25bf66cb4e641de0784754dcb5c18be3dedb Mon Sep 17 00:00:00 2001
From: Alberto Spelta <alberto.spelta@gmail.com>
Date: Fri, 2 Apr 2021 22:49:39 +0200
Subject: [PATCH] GlobalService use GSEnvironmentClient response for AppId and
RedirectUri
---
src/Common/Commands.Common.Test/PowerBISettingsTests.cs | 3 +++
src/Common/Commands.Common/GSCloudEnvironments.cs | 8 +-------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/Common/Commands.Common.Test/PowerBISettingsTests.cs b/src/Common/Commands.Common.Test/PowerBISettingsTests.cs
index 8a7920c7..2060eca8 100644
--- a/src/Common/Commands.Common.Test/PowerBISettingsTests.cs
+++ b/src/Common/Commands.Common.Test/PowerBISettingsTests.cs
@@ -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)
diff --git a/src/Common/Commands.Common/GSCloudEnvironments.cs b/src/Common/Commands.Common/GSCloudEnvironments.cs
index 974dc339..0e05aa59 100644
--- a/src/Common/Commands.Common/GSCloudEnvironments.cs
+++ b/src/Common/Commands.Common/GSCloudEnvironments.cs
@@ -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]
@@ -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]