Change the framework to look for the SifFramework.config file in the current path first and the application folder second.

rafidzal · rafidzal · commit c1c966186ff3 · 2017-04-11T11:27:21.000+08:00
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Settings/ConfigFileBasedFrameworkSettings.cs b/Code/Sif3Framework/Sif.Framework/Model/Settings/ConfigFileBasedFrameworkSettings.cs
@@ -1,5 +1,5 @@
 ﻿/*
- * Copyright 2016 Systemic Pty Ltd
+ * Copyright 2017 Systemic Pty Ltd
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,9 @@
 using Sif.Framework.Model.Infrastructure;
 using System;
 using System.Configuration;
+using System.IO;
+using System.Reflection;
+using System.Web.Hosting;
 
 namespace Sif.Framework.Model.Settings
 {
@@ -44,11 +47,11 @@ protected bool GetBooleanSetting(string key, bool defaultValue)
 
                 try
                 {
-                    value = Boolean.Parse(setting.Value);
+                    value = bool.Parse(setting.Value);
                 }
                 catch (FormatException)
                 {
-                    string message = String.Format("The valid values for the {0} setting are \"true\" or \"false\". The value \"{1}\" is not valid.", setting.Key, setting.Value);
+                    string message = $"The valid values for the {setting.Key} setting are \"true\" or \"false\". The value \"{setting.Value}\" is not valid.";
                     throw new ConfigurationErrorsException(message);
                 }
 
@@ -73,11 +76,11 @@ protected int GetIntegerSetting(string key, int defaultValue)
 
                 try
                 {
-                    value = Int32.Parse(setting.Value);
+                    value = int.Parse(setting.Value);
                 }
                 catch (FormatException)
                 {
-                    string message = String.Format("The value \"{1}\" is not a valid integer for the {0} setting.", setting.Key, setting.Value);
+                    string message = $"The value \"{setting.Value}\" is not a valid integer for the {setting.Key} setting.";
                     throw new ConfigurationErrorsException(message);
                 }
 
@@ -120,7 +123,7 @@ protected string GetStringSetting(string key)
         /// </summary>
         protected ConfigFileBasedFrameworkSettings()
         {
-            string configurationFilePath = System.Web.Hosting.HostingEnvironment.MapPath("~/SifFramework.config");
+            string configurationFilePath = HostingEnvironment.MapPath("~/SifFramework.config");
 
             if (configurationFilePath == null)
             {
@@ -133,14 +136,21 @@ protected ConfigFileBasedFrameworkSettings()
 
             if (!configuration.HasFile)
             {
-                string message = String.Format("Missing configuration file {0}.", configurationFilePath);
+                string fullPath = Assembly.GetExecutingAssembly().Location;
+                exeConfigurationFileMap.ExeConfigFilename = Path.GetDirectoryName(fullPath) + "\\SifFramework.config";
+                configuration = ConfigurationManager.OpenMappedExeConfiguration(exeConfigurationFileMap, ConfigurationUserLevel.None);
+            }
+
+            if (!configuration.HasFile)
+            {
+                string message = $"Missing configuration file {configurationFilePath}.";
                 throw new ConfigurationErrorsException(message);
             }
 
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.ApplicationKey"/>
+        /// <see cref="IFrameworkSettings.ApplicationKey"/>
         /// </summary>
         public string ApplicationKey
         {
@@ -153,7 +163,7 @@ public string ApplicationKey
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.AuthenticationMethod"/>
+        /// <see cref="IFrameworkSettings.AuthenticationMethod"/>
         /// </summary>
         public string AuthenticationMethod
         {
@@ -166,7 +176,7 @@ public string AuthenticationMethod
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.CompressPayload"/>
+        /// <see cref="IFrameworkSettings.CompressPayload"/>
         /// </summary>
         public bool CompressPayload
         {
@@ -179,7 +189,7 @@ public bool CompressPayload
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.ConsumerName"/>
+        /// <see cref="IFrameworkSettings.ConsumerName"/>
         /// </summary>
         public string ConsumerName
         {
@@ -192,7 +202,7 @@ public string ConsumerName
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.DataModelNamespace"/>
+        /// <see cref="IFrameworkSettings.DataModelNamespace"/>
         /// </summary>
         public string DataModelNamespace
         {
@@ -205,7 +215,7 @@ public string DataModelNamespace
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.InfrastructureNamespace"/>
+        /// <see cref="IFrameworkSettings.InfrastructureNamespace"/>
         /// </summary>
         public string InfrastructureNamespace
         {
@@ -218,7 +228,7 @@ public string InfrastructureNamespace
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.DeleteOnUnregister"/>
+        /// <see cref="IFrameworkSettings.DeleteOnUnregister"/>
         /// </summary>
         public bool DeleteOnUnregister
         {
@@ -231,7 +241,7 @@ public bool DeleteOnUnregister
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.EnvironmentType"/>
+        /// <see cref="IFrameworkSettings.EnvironmentType"/>
         /// </summary>
         public EnvironmentType EnvironmentType
         {
@@ -254,7 +264,7 @@ public EnvironmentType EnvironmentType
                     }
                     else
                     {
-                        string message = String.Format("The valid values for the {0} setting are \"BROKERED\" or \"DIRECT\". The value \"{1}\" is not valid.", setting.Key, setting.Value);
+                        string message = $"The valid values for the {setting.Key} setting are \"BROKERED\" or \"DIRECT\". The value \"{setting.Value}\" is not valid.";
                         throw new ConfigurationErrorsException(message);
                     }
 
@@ -266,7 +276,7 @@ public EnvironmentType EnvironmentType
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.EnvironmentUrl"/>
+        /// <see cref="IFrameworkSettings.EnvironmentUrl"/>
         /// </summary>
         public string EnvironmentUrl
         {
@@ -279,7 +289,7 @@ public string EnvironmentUrl
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.InstanceId"/>
+        /// <see cref="IFrameworkSettings.InstanceId"/>
         /// </summary>
         public string InstanceId
         {
@@ -292,7 +302,7 @@ public string InstanceId
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.NavigationPageSize"/>
+        /// <see cref="IFrameworkSettings.NavigationPageSize"/>
         /// </summary>
         public int NavigationPageSize
         {
@@ -305,7 +315,7 @@ public int NavigationPageSize
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.SharedSecret"/>
+        /// <see cref="IFrameworkSettings.SharedSecret"/>
         /// </summary>
         public string SharedSecret
         {
@@ -318,7 +328,7 @@ public string SharedSecret
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.SolutionId"/>
+        /// <see cref="IFrameworkSettings.SolutionId"/>
         /// </summary>
         public string SolutionId
         {
@@ -331,7 +341,7 @@ public string SolutionId
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.SupportedInfrastructureVersion"/>
+        /// <see cref="IFrameworkSettings.SupportedInfrastructureVersion"/>
         /// </summary>
         public string SupportedInfrastructureVersion
         {
@@ -344,7 +354,7 @@ public string SupportedInfrastructureVersion
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.UserToken"/>
+        /// <see cref="IFrameworkSettings.UserToken"/>
         /// </summary>
         public string UserToken
         {
@@ -390,5 +400,7 @@ public int JobTimeoutFrequency
         {
             get { return GetIntegerSetting(SettingsPrefix + ".job.timeout.frequency", 60); }
         }
+
     }
+
 }
diff --git a/Code/Sif3Framework/Sif.Framework/Service/Sessions/ConfigFileBasedSessionService.cs b/Code/Sif3Framework/Sif.Framework/Service/Sessions/ConfigFileBasedSessionService.cs
@@ -1,5 +1,5 @@
 ﻿/*
- * Copyright 2015 Systemic Pty Ltd
+ * Copyright 2017 Systemic Pty Ltd
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,9 @@
 using Sif.Framework.Model.Settings;
 using System;
 using System.Configuration;
+using System.IO;
+using System.Reflection;
+using System.Web.Hosting;
 
 namespace Sif.Framework.Service.Sessions
 {
@@ -43,7 +46,7 @@ abstract class ConfigFileBasedSessionService : ISessionService
         /// </summary>
         public ConfigFileBasedSessionService()
         {
-            string configurationFilePath = System.Web.Hosting.HostingEnvironment.MapPath("~/SifFramework.config");
+            string configurationFilePath = HostingEnvironment.MapPath("~/SifFramework.config");
 
             if (configurationFilePath == null)
             {
@@ -56,30 +59,37 @@ public ConfigFileBasedSessionService()
 
             if (!Configuration.HasFile)
             {
-                string message = String.Format("Missing configuration file {0}.", configurationFilePath);
+                string fullPath = Assembly.GetExecutingAssembly().Location;
+                exeConfigurationFileMap.ExeConfigFilename = Path.GetDirectoryName(fullPath) + "\\SifFramework.config";
+                Configuration = ConfigurationManager.OpenMappedExeConfiguration(exeConfigurationFileMap, ConfigurationUserLevel.None);
+            }
+
+            if (!Configuration.HasFile)
+            {
+                string message = $"Missing configuration file {configurationFilePath}.";
                 throw new ConfigurationErrorsException(message);
             }
 
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Service.Sessions.ISessionService.HasSession(System.String, System.String, System.String, System.String)"/>
+        /// <see cref="ISessionService.HasSession(string, string, string, string)"/>
         /// </summary>
         public bool HasSession(string applicationKey, string solutionId = null, string userToken = null, string instanceId = null)
         {
             return (RetrieveSessionToken(applicationKey, solutionId, userToken, instanceId) == null ? false : true);
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Service.Sessions.ISessionService.HasSession(System.String)"/>
+        /// <see cref="ISessionService.HasSession(string)"/>
         /// </summary>
         public bool HasSession(string sessionToken)
         {
             return (SessionsSection.Sessions[sessionToken] == null ? false : true);
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Service.Sessions.ISessionService.RemoveSession(System.String)"/>
+        /// <see cref="ISessionService.RemoveSession(string)"/>
         /// </summary>
         public void RemoveSession(string sessionToken)
         {
@@ -94,7 +104,7 @@ public void RemoveSession(string sessionToken)
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Service.Sessions.ISessionService.RetrieveEnvironmentUrl(System.String, System.String, System.String, System.String)"/>
+        /// <see cref="ISessionService.RetrieveEnvironmentUrl(string, string, string, string)"/>
         /// </summary>
         public string RetrieveEnvironmentUrl(string applicationKey, string solutionId = null, string userToken = null, string instanceId = null)
         {
@@ -103,10 +113,10 @@ public string RetrieveEnvironmentUrl(string applicationKey, string solutionId =
             foreach (SessionElement session in SessionsSection.Sessions)
             {
 
-                if (String.Equals(applicationKey, session.ApplicationKey) &&
-                    (solutionId == null ? String.IsNullOrWhiteSpace(session.SolutionId) : solutionId.Equals(session.SolutionId)) &&
-                    (userToken == null ? String.IsNullOrWhiteSpace(session.UserToken) : userToken.Equals(session.UserToken)) &&
-                    (instanceId == null ? String.IsNullOrWhiteSpace(session.InstanceId) : instanceId.Equals(session.InstanceId)))
+                if (string.Equals(applicationKey, session.ApplicationKey) &&
+                    (solutionId == null ? string.IsNullOrWhiteSpace(session.SolutionId) : solutionId.Equals(session.SolutionId)) &&
+                    (userToken == null ? string.IsNullOrWhiteSpace(session.UserToken) : userToken.Equals(session.UserToken)) &&
+                    (instanceId == null ? string.IsNullOrWhiteSpace(session.InstanceId) : instanceId.Equals(session.InstanceId)))
                 {
                     environmentUrl = session.EnvironmentUrl;
                     break;
@@ -118,7 +128,7 @@ public string RetrieveEnvironmentUrl(string applicationKey, string solutionId =
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Service.Sessions.ISessionService.RetrieveSessionToken(System.String, System.String, System.String, System.String)"/>
+        /// <see cref="ISessionService.RetrieveSessionToken(string, string, string, string)"/>
         /// </summary>
         public string RetrieveSessionToken(string applicationKey, string solutionId = null, string userToken = null, string instanceId = null)
         {
@@ -127,10 +137,10 @@ public string RetrieveSessionToken(string applicationKey, string solutionId = nu
             foreach (SessionElement session in SessionsSection.Sessions)
             {
 
-                if (String.Equals(applicationKey, session.ApplicationKey) &&
-                    (solutionId == null ? String.IsNullOrWhiteSpace(session.SolutionId) : solutionId.Equals(session.SolutionId)) &&
-                    (userToken == null ? String.IsNullOrWhiteSpace(session.UserToken) : userToken.Equals(session.UserToken)) &&
-                    (instanceId == null ? String.IsNullOrWhiteSpace(session.InstanceId) : instanceId.Equals(session.InstanceId)))
+                if (string.Equals(applicationKey, session.ApplicationKey) &&
+                    (solutionId == null ? string.IsNullOrWhiteSpace(session.SolutionId) : solutionId.Equals(session.SolutionId)) &&
+                    (userToken == null ? string.IsNullOrWhiteSpace(session.UserToken) : userToken.Equals(session.UserToken)) &&
+                    (instanceId == null ? string.IsNullOrWhiteSpace(session.InstanceId) : instanceId.Equals(session.InstanceId)))
                 {
                     sessionToken = session.SessionToken;
                     break;
@@ -142,14 +152,14 @@ public string RetrieveSessionToken(string applicationKey, string solutionId = nu
         }
 
         /// <summary>
-        /// <see cref="Sif.Framework.Service.Sessions.ISessionService.StoreSession(System.String, System.String, System.String, System.String, System.String, System.String)"/>
+        /// <see cref="ISessionService.StoreSession(string, string, string, string, string, string)"/>
         /// </summary>
         public void StoreSession(string applicationKey, string sessionToken, string environmentUrl, string solutionId = null, string userToken = null, string instanceId = null)
         {
 
             if (HasSession(applicationKey, solutionId, userToken, instanceId))
             {
-                string message = String.Format("Session with the following credentials already exists - [applicationKey={0}]{1}{2}{3}.",
+                string message = string.Format("Session with the following credentials already exists - [applicationKey={0}]{1}{2}{3}.",
                     applicationKey,
                     (solutionId == null ? "" : "[solutionId=" + solutionId + "]"),
                     (userToken == null ? "" : "[userToken=" + userToken + "]"),
@@ -159,7 +169,7 @@ public void StoreSession(string applicationKey, string sessionToken, string envi
 
             if (HasSession(sessionToken))
             {
-                string message = String.Format("Session already exists with a session token of {0}.", sessionToken);
+                string message = string.Format("Session already exists with a session token of {0}.", sessionToken);
                 throw new ConfigurationErrorsException(message);
             }
 
diff --git a/SharedLibs/Sif.Framework 3.2.0/Sif.Framework.dll b/SharedLibs/Sif.Framework 3.2.0/Sif.Framework.dll

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2016 Systemic Pty Ltd`
	`2`	`+ * Copyright 2017 Systemic Pty Ltd`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -17,6 +17,9 @@`
`17`	`17`	`using Sif.Framework.Model.Infrastructure;`
`18`	`18`	`using System;`
`19`	`19`	`using System.Configuration;`
	`20`	`+using System.IO;`
	`21`	`+using System.Reflection;`
	`22`	`+using System.Web.Hosting;`
`20`	`23`
`21`	`24`	`namespace Sif.Framework.Model.Settings`
`22`	`25`	`{`
`@@ -44,11 +47,11 @@ protected bool GetBooleanSetting(string key, bool defaultValue)`
`44`	`47`
`45`	`48`	`try`
`46`	`49`	`{`
`47`		`- value = Boolean.Parse(setting.Value);`
	`50`	`+ value = bool.Parse(setting.Value);`
`48`	`51`	`}`
`49`	`52`	`catch (FormatException)`
`50`	`53`	`{`
`51`		`- string message = String.Format("The valid values for the {0} setting are \"true\" or \"false\". The value \"{1}\" is not valid.", setting.Key, setting.Value);`
	`54`	`+ string message = $"The valid values for the {setting.Key} setting are \"true\" or \"false\". The value \"{setting.Value}\" is not valid.";`
`52`	`55`	`throw new ConfigurationErrorsException(message);`
`53`	`56`	`}`
`54`	`57`
`@@ -73,11 +76,11 @@ protected int GetIntegerSetting(string key, int defaultValue)`
`73`	`76`
`74`	`77`	`try`
`75`	`78`	`{`
`76`		`- value = Int32.Parse(setting.Value);`
	`79`	`+ value = int.Parse(setting.Value);`
`77`	`80`	`}`
`78`	`81`	`catch (FormatException)`
`79`	`82`	`{`
`80`		`- string message = String.Format("The value \"{1}\" is not a valid integer for the {0} setting.", setting.Key, setting.Value);`
	`83`	`+ string message = $"The value \"{setting.Value}\" is not a valid integer for the {setting.Key} setting.";`
`81`	`84`	`throw new ConfigurationErrorsException(message);`
`82`	`85`	`}`
`83`	`86`
`@@ -120,7 +123,7 @@ protected string GetStringSetting(string key)`
`120`	`123`	`/// </summary>`
`121`	`124`	`protected ConfigFileBasedFrameworkSettings()`
`122`	`125`	`{`
`123`		`- string configurationFilePath = System.Web.Hosting.HostingEnvironment.MapPath("~/SifFramework.config");`
	`126`	`+ string configurationFilePath = HostingEnvironment.MapPath("~/SifFramework.config");`
`124`	`127`
`125`	`128`	`if (configurationFilePath == null)`
`126`	`129`	`{`
`@@ -133,14 +136,21 @@ protected ConfigFileBasedFrameworkSettings()`
`133`	`136`
`134`	`137`	`if (!configuration.HasFile)`
`135`	`138`	`{`
`136`		`- string message = String.Format("Missing configuration file {0}.", configurationFilePath);`
	`139`	`+ string fullPath = Assembly.GetExecutingAssembly().Location;`
	`140`	`+ exeConfigurationFileMap.ExeConfigFilename = Path.GetDirectoryName(fullPath) + "\\SifFramework.config";`
	`141`	`+ configuration = ConfigurationManager.OpenMappedExeConfiguration(exeConfigurationFileMap, ConfigurationUserLevel.None);`
	`142`	`+ }`
	`143`	`+`
	`144`	`+ if (!configuration.HasFile)`
	`145`	`+ {`
	`146`	`+ string message = $"Missing configuration file {configurationFilePath}.";`
`137`	`147`	`throw new ConfigurationErrorsException(message);`
`138`	`148`	`}`
`139`	`149`
`140`	`150`	`}`
`141`	`151`
`142`	`152`	`/// <summary>`
`143`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.ApplicationKey"/>`
	`153`	`+ /// <see cref="IFrameworkSettings.ApplicationKey"/>`
`144`	`154`	`/// </summary>`
`145`	`155`	`public string ApplicationKey`
`146`	`156`	`{`
`@@ -153,7 +163,7 @@ public string ApplicationKey`
`153`	`163`	`}`
`154`	`164`
`155`	`165`	`/// <summary>`
`156`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.AuthenticationMethod"/>`
	`166`	`+ /// <see cref="IFrameworkSettings.AuthenticationMethod"/>`
`157`	`167`	`/// </summary>`
`158`	`168`	`public string AuthenticationMethod`
`159`	`169`	`{`
`@@ -166,7 +176,7 @@ public string AuthenticationMethod`
`166`	`176`	`}`
`167`	`177`
`168`	`178`	`/// <summary>`
`169`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.CompressPayload"/>`
	`179`	`+ /// <see cref="IFrameworkSettings.CompressPayload"/>`
`170`	`180`	`/// </summary>`
`171`	`181`	`public bool CompressPayload`
`172`	`182`	`{`
`@@ -179,7 +189,7 @@ public bool CompressPayload`
`179`	`189`	`}`
`180`	`190`
`181`	`191`	`/// <summary>`
`182`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.ConsumerName"/>`
	`192`	`+ /// <see cref="IFrameworkSettings.ConsumerName"/>`
`183`	`193`	`/// </summary>`
`184`	`194`	`public string ConsumerName`
`185`	`195`	`{`
`@@ -192,7 +202,7 @@ public string ConsumerName`
`192`	`202`	`}`
`193`	`203`
`194`	`204`	`/// <summary>`
`195`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.DataModelNamespace"/>`
	`205`	`+ /// <see cref="IFrameworkSettings.DataModelNamespace"/>`
`196`	`206`	`/// </summary>`
`197`	`207`	`public string DataModelNamespace`
`198`	`208`	`{`
`@@ -205,7 +215,7 @@ public string DataModelNamespace`
`205`	`215`	`}`
`206`	`216`
`207`	`217`	`/// <summary>`
`208`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.InfrastructureNamespace"/>`
	`218`	`+ /// <see cref="IFrameworkSettings.InfrastructureNamespace"/>`
`209`	`219`	`/// </summary>`
`210`	`220`	`public string InfrastructureNamespace`
`211`	`221`	`{`
`@@ -218,7 +228,7 @@ public string InfrastructureNamespace`
`218`	`228`	`}`
`219`	`229`
`220`	`230`	`/// <summary>`
`221`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.DeleteOnUnregister"/>`
	`231`	`+ /// <see cref="IFrameworkSettings.DeleteOnUnregister"/>`
`222`	`232`	`/// </summary>`
`223`	`233`	`public bool DeleteOnUnregister`
`224`	`234`	`{`
`@@ -231,7 +241,7 @@ public bool DeleteOnUnregister`
`231`	`241`	`}`
`232`	`242`
`233`	`243`	`/// <summary>`
`234`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.EnvironmentType"/>`
	`244`	`+ /// <see cref="IFrameworkSettings.EnvironmentType"/>`
`235`	`245`	`/// </summary>`
`236`	`246`	`public EnvironmentType EnvironmentType`
`237`	`247`	`{`
`@@ -254,7 +264,7 @@ public EnvironmentType EnvironmentType`
`254`	`264`	`}`
`255`	`265`	`else`
`256`	`266`	`{`
`257`		`- string message = String.Format("The valid values for the {0} setting are \"BROKERED\" or \"DIRECT\". The value \"{1}\" is not valid.", setting.Key, setting.Value);`
	`267`	`+ string message = $"The valid values for the {setting.Key} setting are \"BROKERED\" or \"DIRECT\". The value \"{setting.Value}\" is not valid.";`
`258`	`268`	`throw new ConfigurationErrorsException(message);`
`259`	`269`	`}`
`260`	`270`
`@@ -266,7 +276,7 @@ public EnvironmentType EnvironmentType`
`266`	`276`	`}`
`267`	`277`
`268`	`278`	`/// <summary>`
`269`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.EnvironmentUrl"/>`
	`279`	`+ /// <see cref="IFrameworkSettings.EnvironmentUrl"/>`
`270`	`280`	`/// </summary>`
`271`	`281`	`public string EnvironmentUrl`
`272`	`282`	`{`
`@@ -279,7 +289,7 @@ public string EnvironmentUrl`
`279`	`289`	`}`
`280`	`290`
`281`	`291`	`/// <summary>`
`282`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.InstanceId"/>`
	`292`	`+ /// <see cref="IFrameworkSettings.InstanceId"/>`
`283`	`293`	`/// </summary>`
`284`	`294`	`public string InstanceId`
`285`	`295`	`{`
`@@ -292,7 +302,7 @@ public string InstanceId`
`292`	`302`	`}`
`293`	`303`
`294`	`304`	`/// <summary>`
`295`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.NavigationPageSize"/>`
	`305`	`+ /// <see cref="IFrameworkSettings.NavigationPageSize"/>`
`296`	`306`	`/// </summary>`
`297`	`307`	`public int NavigationPageSize`
`298`	`308`	`{`
`@@ -305,7 +315,7 @@ public int NavigationPageSize`
`305`	`315`	`}`
`306`	`316`
`307`	`317`	`/// <summary>`
`308`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.SharedSecret"/>`
	`318`	`+ /// <see cref="IFrameworkSettings.SharedSecret"/>`
`309`	`319`	`/// </summary>`
`310`	`320`	`public string SharedSecret`
`311`	`321`	`{`
`@@ -318,7 +328,7 @@ public string SharedSecret`
`318`	`328`	`}`
`319`	`329`
`320`	`330`	`/// <summary>`
`321`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.SolutionId"/>`
	`331`	`+ /// <see cref="IFrameworkSettings.SolutionId"/>`
`322`	`332`	`/// </summary>`
`323`	`333`	`public string SolutionId`
`324`	`334`	`{`
`@@ -331,7 +341,7 @@ public string SolutionId`
`331`	`341`	`}`
`332`	`342`
`333`	`343`	`/// <summary>`
`334`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.SupportedInfrastructureVersion"/>`
	`344`	`+ /// <see cref="IFrameworkSettings.SupportedInfrastructureVersion"/>`
`335`	`345`	`/// </summary>`
`336`	`346`	`public string SupportedInfrastructureVersion`
`337`	`347`	`{`
`@@ -344,7 +354,7 @@ public string SupportedInfrastructureVersion`
`344`	`354`	`}`
`345`	`355`
`346`	`356`	`/// <summary>`
`347`		`- /// <see cref="Sif.Framework.Model.Settings.IFrameworkSettings.UserToken"/>`
	`357`	`+ /// <see cref="IFrameworkSettings.UserToken"/>`
`348`	`358`	`/// </summary>`
`349`	`359`	`public string UserToken`
`350`	`360`	`{`
`@@ -390,5 +400,7 @@ public int JobTimeoutFrequency`
`390`	`400`	`{`
`391`	`401`	`get { return GetIntegerSetting(SettingsPrefix + ".job.timeout.frequency", 60); }`
`392`	`402`	`}`
	`403`	`+`
`393`	`404`	`}`
	`405`	`+`
`394`	`406`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2015 Systemic Pty Ltd`
	`2`	`+ * Copyright 2017 Systemic Pty Ltd`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -17,6 +17,9 @@`
`17`	`17`	`using Sif.Framework.Model.Settings;`
`18`	`18`	`using System;`
`19`	`19`	`using System.Configuration;`
	`20`	`+using System.IO;`
	`21`	`+using System.Reflection;`
	`22`	`+using System.Web.Hosting;`
`20`	`23`
`21`	`24`	`namespace Sif.Framework.Service.Sessions`
`22`	`25`	`{`
`@@ -43,7 +46,7 @@ abstract class ConfigFileBasedSessionService : ISessionService`
`43`	`46`	`/// </summary>`
`44`	`47`	`public ConfigFileBasedSessionService()`
`45`	`48`	`{`
`46`		`- string configurationFilePath = System.Web.Hosting.HostingEnvironment.MapPath("~/SifFramework.config");`
	`49`	`+ string configurationFilePath = HostingEnvironment.MapPath("~/SifFramework.config");`
`47`	`50`
`48`	`51`	`if (configurationFilePath == null)`
`49`	`52`	`{`
`@@ -56,30 +59,37 @@ public ConfigFileBasedSessionService()`
`56`	`59`
`57`	`60`	`if (!Configuration.HasFile)`
`58`	`61`	`{`
`59`		`- string message = String.Format("Missing configuration file {0}.", configurationFilePath);`
	`62`	`+ string fullPath = Assembly.GetExecutingAssembly().Location;`
	`63`	`+ exeConfigurationFileMap.ExeConfigFilename = Path.GetDirectoryName(fullPath) + "\\SifFramework.config";`
	`64`	`+ Configuration = ConfigurationManager.OpenMappedExeConfiguration(exeConfigurationFileMap, ConfigurationUserLevel.None);`
	`65`	`+ }`
	`66`	`+`
	`67`	`+ if (!Configuration.HasFile)`
	`68`	`+ {`
	`69`	`+ string message = $"Missing configuration file {configurationFilePath}.";`
`60`	`70`	`throw new ConfigurationErrorsException(message);`
`61`	`71`	`}`
`62`	`72`
`63`	`73`	`}`
`64`	`74`
`65`	`75`	`/// <summary>`
`66`		`- /// <see cref="Sif.Framework.Service.Sessions.ISessionService.HasSession(System.String, System.String, System.String, System.String)"/>`
	`76`	`+ /// <see cref="ISessionService.HasSession(string, string, string, string)"/>`
`67`	`77`	`/// </summary>`
`68`	`78`	`public bool HasSession(string applicationKey, string solutionId = null, string userToken = null, string instanceId = null)`
`69`	`79`	`{`
`70`	`80`	`return (RetrieveSessionToken(applicationKey, solutionId, userToken, instanceId) == null ? false : true);`
`71`	`81`	`}`
`72`	`82`
`73`	`83`	`/// <summary>`
`74`		`- /// <see cref="Sif.Framework.Service.Sessions.ISessionService.HasSession(System.String)"/>`
	`84`	`+ /// <see cref="ISessionService.HasSession(string)"/>`
`75`	`85`	`/// </summary>`
`76`	`86`	`public bool HasSession(string sessionToken)`
`77`	`87`	`{`
`78`	`88`	`return (SessionsSection.Sessions[sessionToken] == null ? false : true);`
`79`	`89`	`}`
`80`	`90`
`81`	`91`	`/// <summary>`
`82`		`- /// <see cref="Sif.Framework.Service.Sessions.ISessionService.RemoveSession(System.String)"/>`
	`92`	`+ /// <see cref="ISessionService.RemoveSession(string)"/>`
`83`	`93`	`/// </summary>`
`84`	`94`	`public void RemoveSession(string sessionToken)`
`85`	`95`	`{`
`@@ -94,7 +104,7 @@ public void RemoveSession(string sessionToken)`
`94`	`104`	`}`
`95`	`105`
`96`	`106`	`/// <summary>`
`97`		`- /// <see cref="Sif.Framework.Service.Sessions.ISessionService.RetrieveEnvironmentUrl(System.String, System.String, System.String, System.String)"/>`
	`107`	`+ /// <see cref="ISessionService.RetrieveEnvironmentUrl(string, string, string, string)"/>`
`98`	`108`	`/// </summary>`
`99`	`109`	`public string RetrieveEnvironmentUrl(string applicationKey, string solutionId = null, string userToken = null, string instanceId = null)`
`100`	`110`	`{`
`@@ -103,10 +113,10 @@ public string RetrieveEnvironmentUrl(string applicationKey, string solutionId =`
`103`	`113`	`foreach (SessionElement session in SessionsSection.Sessions)`
`104`	`114`	`{`
`105`	`115`
`106`		`- if (String.Equals(applicationKey, session.ApplicationKey) &&`
`107`		`- (solutionId == null ? String.IsNullOrWhiteSpace(session.SolutionId) : solutionId.Equals(session.SolutionId)) &&`
`108`		`- (userToken == null ? String.IsNullOrWhiteSpace(session.UserToken) : userToken.Equals(session.UserToken)) &&`
`109`		`- (instanceId == null ? String.IsNullOrWhiteSpace(session.InstanceId) : instanceId.Equals(session.InstanceId)))`
	`116`	`+ if (string.Equals(applicationKey, session.ApplicationKey) &&`
	`117`	`+ (solutionId == null ? string.IsNullOrWhiteSpace(session.SolutionId) : solutionId.Equals(session.SolutionId)) &&`
	`118`	`+ (userToken == null ? string.IsNullOrWhiteSpace(session.UserToken) : userToken.Equals(session.UserToken)) &&`
	`119`	`+ (instanceId == null ? string.IsNullOrWhiteSpace(session.InstanceId) : instanceId.Equals(session.InstanceId)))`
`110`	`120`	`{`
`111`	`121`	`environmentUrl = session.EnvironmentUrl;`
`112`	`122`	`break;`
`@@ -118,7 +128,7 @@ public string RetrieveEnvironmentUrl(string applicationKey, string solutionId =`
`118`	`128`	`}`
`119`	`129`
`120`	`130`	`/// <summary>`
`121`		`- /// <see cref="Sif.Framework.Service.Sessions.ISessionService.RetrieveSessionToken(System.String, System.String, System.String, System.String)"/>`
	`131`	`+ /// <see cref="ISessionService.RetrieveSessionToken(string, string, string, string)"/>`
`122`	`132`	`/// </summary>`
`123`	`133`	`public string RetrieveSessionToken(string applicationKey, string solutionId = null, string userToken = null, string instanceId = null)`
`124`	`134`	`{`
`@@ -127,10 +137,10 @@ public string RetrieveSessionToken(string applicationKey, string solutionId = nu`
`127`	`137`	`foreach (SessionElement session in SessionsSection.Sessions)`
`128`	`138`	`{`
`129`	`139`
`130`		`- if (String.Equals(applicationKey, session.ApplicationKey) &&`
`131`		`- (solutionId == null ? String.IsNullOrWhiteSpace(session.SolutionId) : solutionId.Equals(session.SolutionId)) &&`
`132`		`- (userToken == null ? String.IsNullOrWhiteSpace(session.UserToken) : userToken.Equals(session.UserToken)) &&`
`133`		`- (instanceId == null ? String.IsNullOrWhiteSpace(session.InstanceId) : instanceId.Equals(session.InstanceId)))`
	`140`	`+ if (string.Equals(applicationKey, session.ApplicationKey) &&`
	`141`	`+ (solutionId == null ? string.IsNullOrWhiteSpace(session.SolutionId) : solutionId.Equals(session.SolutionId)) &&`
	`142`	`+ (userToken == null ? string.IsNullOrWhiteSpace(session.UserToken) : userToken.Equals(session.UserToken)) &&`
	`143`	`+ (instanceId == null ? string.IsNullOrWhiteSpace(session.InstanceId) : instanceId.Equals(session.InstanceId)))`
`134`	`144`	`{`
`135`	`145`	`sessionToken = session.SessionToken;`
`136`	`146`	`break;`
`@@ -142,14 +152,14 @@ public string RetrieveSessionToken(string applicationKey, string solutionId = nu`
`142`	`152`	`}`
`143`	`153`
`144`	`154`	`/// <summary>`
`145`		`- /// <see cref="Sif.Framework.Service.Sessions.ISessionService.StoreSession(System.String, System.String, System.String, System.String, System.String, System.String)"/>`
	`155`	`+ /// <see cref="ISessionService.StoreSession(string, string, string, string, string, string)"/>`
`146`	`156`	`/// </summary>`
`147`	`157`	`public void StoreSession(string applicationKey, string sessionToken, string environmentUrl, string solutionId = null, string userToken = null, string instanceId = null)`
`148`	`158`	`{`
`149`	`159`
`150`	`160`	`if (HasSession(applicationKey, solutionId, userToken, instanceId))`
`151`	`161`	`{`
`152`		`- string message = String.Format("Session with the following credentials already exists - [applicationKey={0}]{1}{2}{3}.",`
	`162`	`+ string message = string.Format("Session with the following credentials already exists - [applicationKey={0}]{1}{2}{3}.",`
`153`	`163`	`applicationKey,`
`154`	`164`	`(solutionId == null ? "" : "[solutionId=" + solutionId + "]"),`
`155`	`165`	`(userToken == null ? "" : "[userToken=" + userToken + "]"),`
`@@ -159,7 +169,7 @@ public void StoreSession(string applicationKey, string sessionToken, string envi`
`159`	`169`
`160`	`170`	`if (HasSession(sessionToken))`
`161`	`171`	`{`
`162`		`- string message = String.Format("Session already exists with a session token of {0}.", sessionToken);`
	`172`	`+ string message = string.Format("Session already exists with a session token of {0}.", sessionToken);`
`163`	`173`	`throw new ConfigurationErrorsException(message);`
`164`	`174`	`}`
`165`	`175`