Adds ~appFolder token. Closes #156

Author: waldekmastykarz

msgraph-developer-proxy-abstractions/IProxyConfiguration.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 using System.Runtime.Serialization;
@@ -22,4 +22,5 @@ public interface IProxyConfiguration {
     IEnumerable<int> WatchPids { get; }
     IEnumerable<string> WatchProcessNames { get; }
     int Rate { get; }
+    string ConfigFile { get; }
 }

msgraph-developer-proxy-abstractions/ProxyUtils.cs

@@ -18,11 +18,11 @@ public static bool IsGraphBetaRequest(Request request) =>
         request.RequestUri.AbsolutePath.Contains("/beta/", StringComparison.OrdinalIgnoreCase);
 
     /// <summary>
-    /// Utiliy to build HTTP respopnse headers consistent with Microsoft Graph
+    /// Utility to build HTTP response headers consistent with Microsoft Graph
     /// </summary>
     /// <param name="request">The http request for which response headers are being constructed</param>
     /// <param name="requestId">string a guid representing the a unique identifier for the request</param>
-    /// <param name="requestDate">string represetation of the date and time the request was made</param>
+    /// <param name="requestDate">string representation of the date and time the request was made</param>
     /// <returns>IList<HttpHeader> with defaults consistent with Microsoft Graph. Automatically adds CORS headers when the Origin header is present</returns>
     public static IList<HttpHeader> BuildGraphResponseHeaders(Request request, string requestId, string requestDate) {
         var headers = new List<HttpHeader>
@@ -40,4 +40,14 @@ public static IList<HttpHeader> BuildGraphResponseHeaders(Request request, strin
         }
         return headers;
     }
+
+    public static string ReplacePathTokens(string? path) {
+        if (string.IsNullOrEmpty(path)) {
+            return path ?? string.Empty;
+        }
+
+        // doesn't end with a path separator
+        var appFolder = Path.GetDirectoryName(AppContext.BaseDirectory);
+        return path.Replace("~appFolder", appFolder, StringComparison.OrdinalIgnoreCase);
+    }
 }

msgraph-developer-proxy-plugins/MockResponses/MockResponsePlugin.cs

@@ -29,6 +29,7 @@ public class MockResponsePlugin : BaseProxyPlugin {
     private readonly Option<bool?> _noMocks;
     private readonly Option<string?> _mocksFile;
     public override string Name => nameof(MockResponsePlugin);
+    private IProxyConfiguration? _proxyConfiguration;
 
     public MockResponsePlugin() {
         _noMocks = new Option<bool?>("--no-mocks", "Disable loading mock requests");
@@ -51,6 +52,8 @@ public override void Register(IPluginEvents pluginEvents,
         pluginEvents.Init += OnInit;
         pluginEvents.OptionsLoaded += OnOptionsLoaded;
         pluginEvents.BeforeRequest += OnRequest;
+
+        _proxyConfiguration = context.Configuration;
     }
 
     private void OnInit(object? sender, InitArgs e) {
@@ -76,6 +79,9 @@ private void OnOptionsLoaded(object? sender, OptionsLoadedArgs e) {
         if (mocksFile is not null) {
             _configuration.MocksFile = mocksFile;
         }
+
+        _configuration.MocksFile = Path.GetFullPath(ProxyUtils.ReplacePathTokens(_configuration.MocksFile), Path.GetDirectoryName(_proxyConfiguration?.ConfigFile ?? string.Empty) ?? string.Empty);
+
         // load the responses from the configured mocks file
         _loader?.InitResponsesWatcher();
     }
@@ -147,7 +153,7 @@ private void ProcessMockResponse(SessionEventArgs e, MockResponse matchingRespon
                 // if we can read the file, we can immediately send the response and
                 // skip the rest of the logic in this method
                 // remove the surrounding quotes and the @-token
-                var filePath = Path.Combine(Directory.GetCurrentDirectory(), bodyString.Trim('"').Substring(1));
+                var filePath = Path.Combine(Path.GetDirectoryName(_configuration.MocksFile) ?? "", ProxyUtils.ReplacePathTokens(bodyString.Trim('"').Substring(1)));
                 if (!File.Exists(filePath)) {
                     _logger?.LogError($"File {filePath} not found. Serving file path in the mock response");
                     body = bodyString;

msgraph-developer-proxy-plugins/MockResponses/MockResponsesLoader.cs

@@ -20,7 +20,7 @@ public MockResponsesLoader(ILogger logger, MockResponseConfiguration configurati
 
     public void LoadResponses() {
         if (!File.Exists(_responsesFilePath)) {
-            _logger.LogWarn($"File {_configuration.MocksFile} not found in the current directory. No mocks will be provided");
+            _logger.LogWarn($"File {_configuration.MocksFile} not found. No mocks will be provided");
             _configuration.Responses = Array.Empty<MockResponse>();
             return;
         }

msgraph-developer-proxy-plugins/RandomErrors/GenericRandomErrorPlugin.cs

@@ -98,7 +98,7 @@ private void UpdateProxyResponse(ProxyRequestArgs ev, GenericErrorResponse error
             // if we can read the file, we can immediately send the response and
             // skip the rest of the logic in this method
             // remove the surrounding quotes and the @-token
-            var filePath = Path.Combine(Directory.GetCurrentDirectory(), body.Trim('"').Substring(1));
+            var filePath = Path.Combine(Path.GetDirectoryName(_configuration.ErrorsFile) ?? "", ProxyUtils.ReplacePathTokens(body.Trim('"').Substring(1)));
             if (!File.Exists(filePath)) {
                 _logger?.LogError($"File {filePath} not found. Serving file path in the mock response");
                 session.GenericResponse(body, statusCode, headers);
@@ -122,7 +122,11 @@ public override void Register(IPluginEvents pluginEvents,
                          IConfigurationSection? configSection = null) {
         base.Register(pluginEvents, context, urlsToWatch, configSection);
 
+        _proxyConfiguration = context.Configuration;
+
         configSection?.Bind(_configuration);
+        _configuration.ErrorsFile = Path.GetFullPath(ProxyUtils.ReplacePathTokens(_configuration.ErrorsFile ?? string.Empty), Path.GetDirectoryName(_proxyConfiguration?.ConfigFile ?? string.Empty) ?? string.Empty);
+
         _loader = new GenericErrorResponsesLoader(_logger!, _configuration);
 
         pluginEvents.Init += OnInit;

msgraph-developer-proxy/PluginLoader.cs

@@ -27,12 +27,12 @@ public PluginLoaderResult LoadPlugins(IPluginEvents pluginEvents, IProxyContext
         PluginConfig config = PluginConfig;
         List<UrlToWatch> globallyWatchedUrls = PluginConfig.UrlsToWatch.Select(ConvertToRegex).ToList();
         ISet<UrlToWatch> defaultUrlsToWatch = globallyWatchedUrls.ToHashSet();
-        string? rootDirectory = Path.GetDirectoryName(AppContext.BaseDirectory);
-        if (!string.IsNullOrEmpty(rootDirectory)) {
+        string? configFileDirectory = Path.GetDirectoryName(Path.GetFullPath(ProxyUtils.ReplacePathTokens(ProxyHost.ConfigFile)));
+        if (!string.IsNullOrEmpty(configFileDirectory)) {
             foreach (PluginReference h in config.Plugins) {
                 if (!h.Enabled) continue;
                 // Load Handler Assembly if enabled
-                string pluginLocation = Path.GetFullPath(Path.Combine(rootDirectory, h.PluginPath.Replace('\\', Path.DirectorySeparatorChar)));
+                string pluginLocation = Path.GetFullPath(Path.Combine(configFileDirectory, ProxyUtils.ReplacePathTokens(h.PluginPath.Replace('\\', Path.DirectorySeparatorChar))));
                 PluginLoadContext pluginLoadContext = new PluginLoadContext(pluginLocation);
                 _logger.LogDebug($"Loading from: {pluginLocation}");
                 Assembly assembly = pluginLoadContext.LoadFromAssemblyName(new AssemblyName(Path.GetFileNameWithoutExtension(pluginLocation)));
@@ -48,6 +48,7 @@ public PluginLoaderResult LoadPlugins(IPluginEvents pluginEvents, IProxyContext
                 plugins.Add(plugin);
             }
         }
+
         return plugins.Count > 0
             ? new PluginLoaderResult(globallyWatchedUrls.ToHashSet(), plugins)
             : throw new InvalidDataException("No plugins were loaded");

msgraph-developer-proxy/ProxyConfiguration.cs

@@ -21,5 +21,6 @@ public class ProxyConfiguration: IProxyConfiguration {
     public IEnumerable<string> WatchProcessNames { get; set; } = new List<string>();
     [JsonPropertyName("rate")]
     public int Rate { get; set; } = 50;
+    public string ConfigFile { get; set; } = "appsettings.json";
 }
 

msgraph-developer-proxy/ProxyContext.cs

@@ -8,7 +8,6 @@ namespace Microsoft.Graph.DeveloperProxy;
 internal class ProxyContext : IProxyContext
 {
   public ILogger Logger { get; }
-
   public IProxyConfiguration Configuration { get; }
 
   public ProxyContext(ILogger logger, IProxyConfiguration configuration)

msgraph-developer-proxy/ProxyHost.cs

@@ -29,7 +29,7 @@ public static string ConfigFile {
                 _configFileOption.AddAlias("-c");
                 _configFileOption.ArgumentHelpName = "configFile";
                 _configFileOption.AddValidator(input => {
-                    var filePath = input.Tokens.First().Value;
+                    var filePath = ProxyUtils.ReplacePathTokens(input.Tokens.First().Value);
                     if (String.IsNullOrEmpty(filePath)) {
                         return;
                     }
@@ -46,6 +46,8 @@ public static string ConfigFile {
                 _configFile = configFile;
             }
 
+            _configFile = Path.GetFullPath(ProxyUtils.ReplacePathTokens(_configFile));
+
             _configFileResolved = true;
 
             return _configFile;
@@ -84,6 +86,8 @@ public ProxyHost() {
                 input.ErrorMessage = $"{value} is not a valid failure rate. Specify a number between 0 and 100";
             }
         });
+
+        ProxyCommandHandler.Configuration.ConfigFile = ConfigFile;
     }
 
     public RootCommand GetRootCommand() {