UI: Delete config section when disconnecting account

obsproject · Jun 24, 2023 · 91096b9 · 91096b9
1 parent 6c5fdc1
commit 91096b9
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 0 deletions.
diff --git a/UI/auth-base.cpp b/UI/auth-base.cpp
@@ -85,3 +85,20 @@ void Auth::Save()
 	auth->SaveInternal();
 	config_save_safe(main->Config(), "tmp", nullptr);
 }
+
+void Auth::Delete()
+{
+	OBSBasic *main = OBSBasic::Get();
+	Auth *auth = main->auth.get();
+	if (!auth) {
+		if (config_has_user_value(main->Config(), "Auth", "Type")) {
+			config_remove_value(main->Config(), "Auth", "Type");
+			config_save_safe(main->Config(), "tmp", nullptr);
+		}
+		return;
+	}
+
+	config_remove_value(main->Config(), "Auth", "type");
+	auth->DeleteInternal();
+	config_save_safe(main->Config(), "tmp", nullptr);
+}
diff --git a/UI/auth-base.hpp b/UI/auth-base.hpp
@@ -10,6 +10,7 @@ class Auth : public QObject {
 protected:
 	virtual void SaveInternal() = 0;
 	virtual bool LoadInternal() = 0;
+	virtual void DeleteInternal() = 0;
 
 	bool firstLoad = true;
 
@@ -56,6 +57,7 @@ class Auth : public QObject {
 	static bool External(const std::string &service);
 	static void Load();
 	static void Save();
+	static void Delete();
 
 protected:
 	static void RegisterAuth(const Def &d, create_cb create);

diff --git a/UI/auth-oauth.cpp b/UI/auth-oauth.cpp
@@ -263,6 +263,18 @@ bool OAuth::LoadInternal()
 	return implicit ? !token.empty() : !refresh_token.empty();
 }
 
+void OAuth::DeleteInternal()
+{
+	OBSBasic *main = OBSBasic::Get();
+
+	/* Delete keychain item (if it exists) */
+	os_keychain_delete(
+		config_get_string(main->Config(), service(), "KeychainItem"));
+
+	/* Delete OAuth config section */
+	config_remove_section(main->Config(), service());
+}
+
 bool OAuth::TokenExpired()
 {
 	if (token.empty())

diff --git a/UI/auth-oauth.hpp b/UI/auth-oauth.hpp
@@ -59,6 +59,7 @@ class OAuth : public Auth {
 
 	virtual void SaveInternal() override;
 	virtual bool LoadInternal() override;
+	virtual void DeleteInternal() override;
 
 	virtual bool RetryLogin() = 0;
 	bool TokenExpired();

diff --git a/UI/window-basic-auto-config.cpp b/UI/window-basic-auto-config.cpp
@@ -527,6 +527,9 @@ void AutoConfigStreamPage::on_disconnectAccount_clicked()
 
 	OBSBasic *main = OBSBasic::Get();
 
+	if (auth)
+		auth->Delete();
+
 	main->auth.reset();
 	auth.reset();
 

diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
@@ -792,6 +792,9 @@ void OBSBasicSettings::on_disconnectAccount_clicked()
 		return;
 	}
 
+	if (auth)
+		auth->Delete();
+
 	main->auth.reset();
 	auth.reset();
 	main->SetBroadcastFlowEnabled(false);