Move base64_encode to Utilities.h

Author: MichaelElmore1

CSAPI/CSAPI.vcxproj

@@ -197,6 +197,7 @@
     <ClInclude Include="SystemsAPI.h" />
     <ClInclude Include="Util\JsonUtils.h" />
     <ClInclude Include="Util\TimeUtils.h" />
+    <ClInclude Include="Util\Utilities.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

CSAPI/CSAPI.vcxproj.filters

@@ -222,5 +222,8 @@
     <ClInclude Include="Util\TimeUtils.h">
       <Filter>Header Files\Util</Filter>
     </ClInclude>
+    <ClInclude Include="Util\Utilities.h">
+      <Filter>Header Files\Util</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

CSAPI/ConnectedSystemsAPI.h

@@ -6,6 +6,7 @@
 #include "ObservationsAPI.h"
 #include "SystemsAPI.h"
 #include "ControlStreamsAPI.h"
+#include "Util/Utilities.h"
 
 namespace ConnectedSystemsAPI {
 	/// <summary>
@@ -43,7 +44,7 @@ namespace ConnectedSystemsAPI {
 		/// <param name="username">Username for Basic authentication</param>
 		/// <param name="password">Password for Basic authentication</param>
 		ConSysAPI(const std::string& apiRoot, const std::string& username, const std::string& password)
-			: ConSysAPI(apiRoot, base64_encode(username + ":" + password), true) {
+			: ConSysAPI(apiRoot, Utilities::base64_encode(username + ":" + password), true) {
 		}
 
 		// Overload to accept C-style string literals to avoid list-initialization narrowing issues
@@ -63,35 +64,5 @@ namespace ConnectedSystemsAPI {
 		DataStreamsAPI& getDataStreamsAPI() { return dataStreamsAPI; }
 		ObservationsAPI& getObservationsAPI() { return observationsAPI; }
 		ControlStreamsAPI& getControlStreamsAPI() { return controlStreamsAPI; }
-	private:
-		static std::string base64_encode(const std::string& in) {
-			static const char base64_chars[] =
-				"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-				"abcdefghijklmnopqrstuvwxyz"
-				"0123456789+/";
-
-			std::string out;
-			out.reserve(((in.size() + 2) / 3) * 4);
-
-			unsigned int val = 0;
-			int valb = -6;
-
-			for (unsigned char c : in) {
-				val = (val << 8) + c;
-				valb += 8;
-				while (valb >= 0) {
-					out.push_back(base64_chars[(val >> valb) & 0x3F]);
-					valb -= 6;
-				}
-			}
-
-			if (valb > -6)
-				out.push_back(base64_chars[((val << 8) >> (valb + 8)) & 0x3F]);
-
-			while (out.size() % 4)
-				out.push_back('=');
-
-			return out;
-		}
 	};
 }

CSAPI/Util/Utilities.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <string>
+
+namespace ConnectedSystemsAPI::Utilities {
+	inline std::string base64_encode(const std::string& in) {
+		static const char base64_chars[] =
+			"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+			"abcdefghijklmnopqrstuvwxyz"
+			"0123456789+/";
+
+		std::string out;
+		out.reserve(((in.size() + 2) / 3) * 4);
+
+		unsigned int val = 0;
+		int valb = -6;
+
+		for (unsigned char c : in) {
+			val = (val << 8) + c;
+			valb += 8;
+			while (valb >= 0) {
+				out.push_back(base64_chars[(val >> valb) & 0x3F]);
+				valb -= 6;
+			}
+		}
+
+		if (valb > -6)
+			out.push_back(base64_chars[((val << 8) >> (valb + 8)) & 0x3F]);
+
+		while (out.size() % 4)
+			out.push_back('=');
+
+		return out;
+	}
+}