fixup! 設定画面にMastodonアカウントの認証機能を実装

Author: upsilon

OpenTween/Setting/Panel/BasedPanel.cs

@@ -124,29 +124,28 @@ private async void buttonMastodonAuth_Click(object sender, EventArgs e)
             if (!Uri.TryCreate(instanceUriStr, UriKind.Absolute, out var instanceUri))
                 return;
 
-            var application = await Mastodon.RegisterClientAsync(instanceUri);
+            try
+            {
+                var application = await Mastodon.RegisterClientAsync(instanceUri);
 
-            var authorizeUri = Mastodon.GetAuthorizeUri(instanceUri, application.ClientId);
+                var authorizeUri = Mastodon.GetAuthorizeUri(instanceUri, application.ClientId);
 
-            var code = AuthDialog.DoAuth(this, authorizeUri);
-            if (string.IsNullOrEmpty(code))
-                return;
+                var code = AuthDialog.DoAuth(this, authorizeUri);
+                if (string.IsNullOrEmpty(code))
+                    return;
 
-            string accessToken;
-            try
-            {
-                accessToken = await Mastodon.GetAccessTokenAsync(instanceUri, application.ClientId, application.ClientSecret, code);
+                var accessToken = await Mastodon.GetAccessTokenAsync(instanceUri, application.ClientId, application.ClientSecret, code);
+
+                this.mastodonCredential = await Mastodon.VerifyCredentialAsync(instanceUri, accessToken);
+
+                this.RefreshMastodonCredential();
             }
             catch (WebApiException ex)
             {
                 var message = Properties.Resources.AuthorizeButton_Click2 + Environment.NewLine + ex.Message;
                 MessageBox.Show(this, message, "Authenticate", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
-
-            this.mastodonCredential = await Mastodon.VerifyCredentialAsync(instanceUri, accessToken);
-
-            this.RefreshMastodonCredential();
         }
     }
 }