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

Author: upsilon

OpenTween/Api/MastodonApi.cs

@@ -81,17 +81,31 @@ public Task<MastodonInstance> Instance()
             return this.Connection.GetAsync<MastodonInstance>(endpoint, null);
         }
 
-        public async Task<MastodonAccessToken> OAuthToken(string clientId, string clientSecret, string grantType,
-            string username, string password, string scope = null)
+        public Uri OAuthAuthorize(string clientId, string responseType, Uri redirectUri, string scope)
+        {
+            var endpoint = new Uri("/oauth/authorize", UriKind.Relative);
+            var param = new Dictionary<string, string>
+            {
+                ["client_id"] = clientId,
+                ["response_type"] = responseType,
+                ["redirect_uri"] = redirectUri.AbsoluteUri,
+                ["scope"] = scope,
+            };
+
+            return new Uri(new Uri(this.InstanceUri, endpoint), "?" + MyCommon.BuildQueryString(param));
+        }
+
+        public async Task<MastodonAccessToken> OAuthToken(string clientId, string clientSecret, Uri redirectUri,
+            string grantType, string code, string scope = null)
         {
             var endpoint = new Uri("/oauth/token", UriKind.Relative);
             var param = new Dictionary<string, string>
             {
                 ["client_id"] = clientId,
                 ["client_secret"] = clientSecret,
+                ["redirect_uri"] = redirectUri.AbsoluteUri,
                 ["grant_type"] = grantType,
-                ["username"] = username,
-                ["password"] = password,
+                ["code"] = code,
             };
 
             if (scope != null)

OpenTween/Mastodon.cs

@@ -72,13 +72,24 @@ public static async Task<MastodonRegisteredApp> RegisterClientAsync(Uri instance
             }
         }
 
+        public static Uri GetAuthorizeUri(Uri instanceUri, string clientId)
+        {
+            var redirectUri = new Uri("urn:ietf:wg:oauth:2.0:oob");
+            var scope = "read write follow";
+            using (var api = new MastodonApi(instanceUri))
+            {
+                return api.OAuthAuthorize(clientId, "code", redirectUri, scope);
+            }
+        }
+
         public static async Task<string> GetAccessTokenAsync(Uri instanceUri, string clientId, string clientSecret,
-            string username, string password)
+            string authorizationCode)
         {
             using (var api = new MastodonApi(instanceUri))
             {
+                var redirectUri = new Uri("urn:ietf:wg:oauth:2.0:oob");
                 var scope = "read write follow";
-                var token = await api.OAuthToken(clientId, clientSecret, "password", username, password, scope)
+                var token = await api.OAuthToken(clientId, clientSecret, redirectUri, "authorization_code", authorizationCode, scope)
                     .ConfigureAwait(false);
 
                 return token.AccessToken;

OpenTween/Setting/Panel/BasedPanel.cs

@@ -126,30 +126,25 @@ private async void buttonMastodonAuth_Click(object sender, EventArgs e)
 
             var application = await Mastodon.RegisterClientAsync(instanceUri);
 
-            using (var loginDialog = new LoginDialog())
-            {
-                string accessToken = null;
+            var authorizeUri = Mastodon.GetAuthorizeUri(instanceUri, application.ClientId);
 
-                loginDialog.LoginCallback = async () =>
-                {
-                    try
-                    {
-                        accessToken = await Mastodon.GetAccessTokenAsync(instanceUri,
-                            application.ClientId, application.ClientSecret, loginDialog.LoginName, loginDialog.Password);
-
-                        return true;
-                    }
-                    catch (WebApiException ex)
-                    {
-                        var message = $"認証に失敗しました: {ex.Message}";
-                        MessageBox.Show(loginDialog, message, ApplicationSettings.ApplicationName, MessageBoxButtons.OK, MessageBoxIcon.Error);
-                        return false;
-                    }
-                };
-                loginDialog.ShowDialog(this);
-
-                this.mastodonCredential = await Mastodon.VerifyCredentialAsync(instanceUri, accessToken);
+            var code = AuthDialog.DoAuth(this, authorizeUri);
+            if (string.IsNullOrEmpty(code))
+                return;
+
+            string accessToken;
+            try
+            {
+                accessToken = await Mastodon.GetAccessTokenAsync(instanceUri, application.ClientId, application.ClientSecret, code);
             }
+            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();
         }