1 files changed, 51 insertions, 23 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index d70287ac83..030c778990 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -5922,34 +5922,62 @@ void LLAppViewer::metricsSend(bool enable_reporting)
 
 void LLAppViewer::initDiscordSocial()
 {
-        gDiscordClient = std::make_shared<discordpp::Client>();
-        gDiscordClient->SetStatusChangedCallback([](discordpp::Client::Status status, discordpp::Client::Error, int32_t) {
-            if (status == discordpp::Client::Status::Ready) {
-                discordpp::Activity activity;
-                activity.SetType(discordpp::ActivityTypes::Playing);
-                gDiscordClient->UpdateRichPresence(activity, [](discordpp::ClientResult) {});
-            }
+    gDiscordClient = std::make_shared<discordpp::Client>();
+    gDiscordClient->SetStatusChangedCallback([](discordpp::Client::Status status, discordpp::Client::Error, int32_t) {
+        if (status == discordpp::Client::Status::Ready)
+        {
+            discordpp::Activity activity;
+            activity.SetType(discordpp::ActivityTypes::Playing);
+            gDiscordClient->UpdateRichPresence(activity, [](discordpp::ClientResult) {});
+        }
+    });
+    if (gSavedSettings.getBOOL("EnableDiscord"))
+    {
+        gDiscordClient->UpdateToken(discordpp::AuthorizationTokenType::Bearer, gSecAPIHandler->loadCredential("Discord")->getAuthenticator()["token"].asString(), [](discordpp::ClientResult result) {
+            if (result.Successful())
+                gDiscordClient->Connect();
         });
+    }
 }
 
-void LLAppViewer::handleDiscordSocial()
+void LLAppViewer::handleDiscordSocial(bool enable)
 {
-    static const uint64_t DISCORD_APPLICATION_ID = 1393451183741599796;
-    discordpp::AuthorizationArgs discordAuthArgs{};
-    discordAuthArgs.SetClientId(DISCORD_APPLICATION_ID);
-    discordAuthArgs.SetScopes(discordpp::Client::GetDefaultPresenceScopes());
-    auto discordCodeVerifier = gDiscordClient->CreateAuthorizationCodeVerifier();
-    discordAuthArgs.SetCodeChallenge(discordCodeVerifier.Challenge());
-    gDiscordClient->Authorize(discordAuthArgs, [discordCodeVerifier](auto result, auto code, auto redirectUri) {
-        if (result.Successful()) {
-            gDiscordClient->GetToken(DISCORD_APPLICATION_ID, code, discordCodeVerifier.Verifier(), redirectUri, [](discordpp::ClientResult result, std::string accessToken, std::string, discordpp::AuthorizationTokenType, int32_t, std::string) {
-                gDiscordClient->UpdateToken(discordpp::AuthorizationTokenType::Bearer, accessToken, [](discordpp::ClientResult result) {
-                    if (result.Successful())
-                        gDiscordClient->Connect();
+    static const uint64_t APPLICATION_ID = 1393451183741599796;
+    if (enable)
+    {
+        discordpp::AuthorizationArgs args{};
+        args.SetClientId(APPLICATION_ID);
+        args.SetScopes(discordpp::Client::GetDefaultPresenceScopes());
+        auto codeVerifier = gDiscordClient->CreateAuthorizationCodeVerifier();
+        args.SetCodeChallenge(codeVerifier.Challenge());
+        gDiscordClient->Authorize(args, [codeVerifier](auto result, auto code, auto redirectUri) {
+            if (result.Successful())
+            {
+                gDiscordClient->GetToken(APPLICATION_ID, code, codeVerifier.Verifier(), redirectUri, [](discordpp::ClientResult result, std::string accessToken, std::string, discordpp::AuthorizationTokenType, int32_t, std::string) {
+                    gDiscordClient->UpdateToken(discordpp::AuthorizationTokenType::Bearer, accessToken, [](discordpp::ClientResult result) {
+                        if (result.Successful())
+                            gDiscordClient->Connect();
                     });
-            });
-        }
-    });
+                    LLSD authenticator = LLSD::emptyMap();
+                    authenticator["token"] = accessToken;
+                    gSecAPIHandler->saveCredential(gSecAPIHandler->createCredential("Discord", LLSD::emptyMap(), authenticator), true);
+                });
+            }
+            else
+            {
+                gSavedSettings.setBOOL("EnableDiscord", false);
+            }
+        });
+    }
+    else
+    {
+        gDiscordClient->RevokeToken(APPLICATION_ID, gSecAPIHandler->loadCredential("Discord")->getAuthenticator()["token"].asString(), [](discordpp::ClientResult result) {
+            if (result.Successful())
+                gDiscordClient->Disconnect();
+            auto cred = new LLCredential("Discord");
+            gSecAPIHandler->deleteCredential(cred);
+        });
+    }
 }
 
 #endif