From b6d21699dc26217a249b658cb4c796822756b261 Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Wed, 29 Apr 2020 12:12:26 +1000 Subject: [PATCH] Update Global.cs to use Properties If these are not properties and are instead just values then the order in which things are declared in this class matter else you'll end up with empty values. I know this is just demo code and in real life these values should be validated, etc... but it would make things a little more error tolerant to have them as properties to begin with. --- TaskWebApp/Utils/Globals.cs | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/TaskWebApp/Utils/Globals.cs b/TaskWebApp/Utils/Globals.cs index 0a9638f..b1be7f0 100644 --- a/TaskWebApp/Utils/Globals.cs +++ b/TaskWebApp/Utils/Globals.cs @@ -5,33 +5,33 @@ namespace TaskWebApp.Utils public static class Globals { // App config settings - public static string ClientId = ConfigurationManager.AppSettings["ida:ClientId"]; - public static string ClientSecret = ConfigurationManager.AppSettings["ida:ClientSecret"]; - public static string AadInstance = ConfigurationManager.AppSettings["ida:AadInstance"]; - public static string Tenant = ConfigurationManager.AppSettings["ida:Tenant"]; - public static string TenantId = ConfigurationManager.AppSettings["ida:TenantId"]; - public static string RedirectUri = ConfigurationManager.AppSettings["ida:RedirectUri"]; - public static string ServiceUrl = ConfigurationManager.AppSettings["api:TaskServiceUrl"]; + public static string ClientId => ConfigurationManager.AppSettings["ida:ClientId"]; + public static string ClientSecret => ConfigurationManager.AppSettings["ida:ClientSecret"]; + public static string AadInstance => ConfigurationManager.AppSettings["ida:AadInstance"]; + public static string Tenant => ConfigurationManager.AppSettings["ida:Tenant"]; + public static string TenantId => ConfigurationManager.AppSettings["ida:TenantId"]; + public static string RedirectUri => ConfigurationManager.AppSettings["ida:RedirectUri"]; + public static string ServiceUrl => ConfigurationManager.AppSettings["api:TaskServiceUrl"]; // B2C policy identifiers - public static string SignUpSignInPolicyId = ConfigurationManager.AppSettings["ida:SignUpSignInPolicyId"]; - public static string EditProfilePolicyId = ConfigurationManager.AppSettings["ida:EditProfilePolicyId"]; - public static string ResetPasswordPolicyId = ConfigurationManager.AppSettings["ida:ResetPasswordPolicyId"]; + public static string SignUpSignInPolicyId => ConfigurationManager.AppSettings["ida:SignUpSignInPolicyId"]; + public static string EditProfilePolicyId => ConfigurationManager.AppSettings["ida:EditProfilePolicyId"]; + public static string ResetPasswordPolicyId => ConfigurationManager.AppSettings["ida:ResetPasswordPolicyId"]; - public static string DefaultPolicy = SignUpSignInPolicyId; + public static string DefaultPolicy => SignUpSignInPolicyId; // API Scopes - public static string ApiIdentifier = ConfigurationManager.AppSettings["api:ApiIdentifier"]; - public static string ReadTasksScope = ApiIdentifier + ConfigurationManager.AppSettings["api:ReadScope"]; - public static string WriteTasksScope = ApiIdentifier + ConfigurationManager.AppSettings["api:WriteScope"]; - public static string[] Scopes = new string[] { ReadTasksScope, WriteTasksScope }; + public static string ApiIdentifier => ConfigurationManager.AppSettings["api:ApiIdentifier"]; + public static string ReadTasksScope => ApiIdentifier + ConfigurationManager.AppSettings["api:ReadScope"]; + public static string WriteTasksScope => ApiIdentifier + ConfigurationManager.AppSettings["api:WriteScope"]; + public static string[] Scopes => new string[] { ReadTasksScope, WriteTasksScope }; // OWIN auth middleware constants public const string ObjectIdElement = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"; // Authorities - public static string B2CAuthority = string.Format(AadInstance, Tenant, DefaultPolicy); - public static string WellKnownMetadata = $"{AadInstance}/v2.0/.well-known/openid-configuration"; + public static string B2CAuthority => string.Format(AadInstance, Tenant, DefaultPolicy); + public static string WellKnownMetadata => $"{AadInstance}/v2.0/.well-known/openid-configuration"; } -} \ No newline at end of file +}