Tests - SystemCredentialsTests + Fixes

CMakeLists.txt

@@ -75,10 +75,10 @@ if(NOT SKIP_TESTS)
 	enable_testing()
 	add_executable(${PROJECT_NAME}_test
 		tests/eventtests.cpp
-		tests/keyringtests.cpp
 		tests/main.cpp
 		tests/networktests.cpp
 		tests/stringtests.cpp
+		tests/systemcredentialstests.cpp
 		tests/updatertests.cpp
 		tests/versiontests.cpp
 		tests/webtests.cpp)

include/keyring/credential.h

@@ -1,6 +1,7 @@
 #ifndef CREDENTIAL_H
 #define CREDENTIAL_H
 
+#include <iostream>
 #include <string>
 #include "passwordstrength.h"
 
@@ -98,6 +99,10 @@ namespace Nickvision::Aura::Keyring
 		 * @return True if this != compare
 		 */
 		bool operator!=(const Credential& compare) const;
+		/**
+		 * @brief Outputs the Credential object
+		 */
+		friend std::ostream& operator<<(std::ostream& os, const Credential& credential);
 
 	private:
 		int m_id;

src/keyring/credential.cpp

@@ -127,4 +127,14 @@ namespace Nickvision::Aura::Keyring
 		}
 		return (PasswordStrength)strength;
 	}
+
+	std::ostream& operator<<(std::ostream& os, const Credential& credential)
+	{
+		os << "[CRED: " << credential.getName() << "] " << std::endl;
+		os << "Uri: " << credential.getUri() << std::endl;
+		os << "Username: " << credential.getUsername() << std::endl;
+		os << "Password: " << credential.getPassword() << std::endl;
+		os << "Strength: " << (int)Credential::getPasswordStrength(credential.getPassword()) << std::endl;
+		return os;
+	}
 }

src/keyring/systemcredentials.cpp

@@ -22,9 +22,12 @@ namespace Nickvision::Aura::Keyring
 		{
 			if (cred->CredentialBlob)
 			{
-				Credential c{ cred->TargetName, cred->Comment, cred->UserName, LPCSTR(cred->CredentialBlob) };
+				std::string name{ cred->TargetName ? cred->TargetName : "" };
+				std::string url{ cred->Comment ? cred->Comment : "" };
+				std::string username{ cred->UserName ? cred->UserName : "" };
+				std::string password{ LPCSTR(cred->CredentialBlob) ? LPCSTR(cred->CredentialBlob) : "", cred->CredentialBlobSize };
 				CredFree(cred);
-				return c;
+				return { { name, url, username, password } };
 			}
 		}
 #else

tests/systemcredentialstests.cpp

@@ -0,0 +1,42 @@
+#include <gtest/gtest.h>
+#include "keyring/credential.h"
+#include "keyring/systemcredentials.h"
+
+using namespace Nickvision::Aura::Keyring;
+
+static const std::string randCredentialName{ "RandomAuraTestCredential1" };
+
+TEST(SystemCredentialsTests, AddRandCredential)
+{
+	std::optional<Credential> cred{ SystemCredentials::addCredential(randCredentialName) };
+	std::cout << cred.value() << std::endl;
+	ASSERT_TRUE(cred.has_value());
+	ASSERT_TRUE(cred.value().getName() == randCredentialName);
+	ASSERT_TRUE(!cred.value().getPassword().empty());
+}
+
+TEST(SystemCredentialsTests, FetchRandCredential)
+{
+	std::optional<Credential> cred{ SystemCredentials::getCredential(randCredentialName) };
+	std::cout << cred.value() << std::endl;
+	ASSERT_TRUE(cred.has_value());
+	ASSERT_TRUE(cred.value().getName() == randCredentialName);
+	ASSERT_TRUE(!cred.value().getPassword().empty());
+}
+
+TEST(SystemCredentialsTests, UpdateRandCredential)
+{
+	Credential updatedCred{ randCredentialName, "", "TEST", "abc123" };
+	ASSERT_TRUE(SystemCredentials::updateCredential(updatedCred));
+	std::optional<Credential> cred{ SystemCredentials::getCredential(randCredentialName) };
+	std::cout << cred.value() << std::endl;
+	ASSERT_TRUE(cred.has_value());
+	ASSERT_TRUE(cred.value().getName() == randCredentialName);
+	ASSERT_TRUE(cred.value().getUsername() == "TEST");
+	ASSERT_TRUE(cred.value().getPassword() == "abc123");
+}
+
+TEST(SystemCredentialsTest, DeleteRandCredential)
+{
+	ASSERT_TRUE(SystemCredentials::deleteCredential(randCredentialName));
+}