feature/app-check/ReplacePlaceholders

FirebaseAdmin/FirebaseAdmin/AppCheck/AppCheckApiClient.cs

@@ -23,12 +23,12 @@ internal sealed class AppCheckApiClient : IDisposable
 
         internal AppCheckApiClient(Args args)
         {
-            string noProjectId = "Project ID is required to access app check service. Use a service account "
+            if (string.IsNullOrEmpty(args.ProjectId))
+            {
+                string noProjectId = "Project ID is required to access app check service. Use a service account "
                     + "credential or set the project ID explicitly via AppOptions. Alternatively "
                     + "you can set the project ID via the GOOGLE_CLOUD_PROJECT environment "
                     + "variable.";
-            if (string.IsNullOrEmpty(args.ProjectId))
-            {
                 throw new FirebaseAppCheckException(
                     ErrorCode.InvalidArgument,
                     noProjectId,
@@ -216,7 +216,7 @@ private string GetUrl(string appId)
                 { "appId", appId },
             };
 
-            return HttpUtils.FormatString(AppCheckUrlFormat, urlParams);
+            return StringUtils.ReplacePlaceholders(AppCheckUrlFormat, urlParams);
         }
 
         private int StringToMilliseconds(string duration)
@@ -244,7 +244,7 @@ private string GetVerifyTokenUrl()
                 { "projectId", this.projectId },
             };
 
-            return HttpUtils.FormatString(OneTimeUseTokenVerificationUrlFormat, urlParams);
+            return StringUtils.ReplacePlaceholders(OneTimeUseTokenVerificationUrlFormat, urlParams);
         }
 
         internal sealed class Args

FirebaseAdmin/FirebaseAdmin/Util/HttpUtils.cs

@@ -30,17 +30,6 @@ internal sealed class HttpUtils
 
         private HttpUtils() { }
 
-        public static string FormatString(string str, Dictionary<string, string> urlParams)
-        {
-            string formatted = str;
-            foreach (var key in urlParams.Keys)
-            {
-                formatted = Regex.Replace(formatted, $"{{{key}}}", urlParams[key]);
-            }
-
-            return formatted;
-        }
-
         internal static string EncodeQueryParams(IDictionary<string, object> queryParams)
         {
             var queryString = string.Empty;

FirebaseAdmin/FirebaseAdmin/Util/StringUtils.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace FirebaseAdmin.Util
+{
+    internal class StringUtils
+    {
+        public static string ReplacePlaceholders(string str, Dictionary<string, string> urlParams)
+        {
+            string formatted = str;
+            foreach (var key in urlParams.Keys)
+            {
+                formatted = Regex.Replace(formatted, $"{{{key}}}", urlParams[key]);
+            }
+
+            return formatted;
+        }
+    }
+}