From ea860d1bc1d42cdda5ef825cfd85b995e846b6bb Mon Sep 17 00:00:00 2001
From: usbharu <harujisaku@gmail.com>
Date: Tue, 21 Nov 2023 11:16:35 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20OAuth2=E3=81=AE=E3=82=B9?=
 =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=97=E3=81=AE=E5=87=A6=E7=90=86=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E3=82=92=E5=A4=89=E6=9B=B4"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/config/SecurityConfig.kt      |  2 +-
 .../mastodon/service/app/AppApiService.kt     | 82 +------------------
 2 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt b/src/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt
index 3dd57dd5..a5762bb1 100644
--- a/src/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/application/config/SecurityConfig.kt
@@ -182,7 +182,7 @@ class SecurityConfig {
             ).anonymous()
             it.requestMatchers(builder.pattern("/change-password")).authenticated()
             it.requestMatchers(builder.pattern("/api/v1/accounts/verify_credentials"))
-                .hasAnyAuthority("SCOPE_read:accounts")
+                .hasAnyAuthority("SCOPE_read", "SCOPE_read:accounts")
             it.anyRequest().permitAll()
         }
         http.oauth2ResourceServer {
diff --git a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/app/AppApiService.kt b/src/main/kotlin/dev/usbharu/hideout/mastodon/service/app/AppApiService.kt
index 58423b68..6d7d463e 100644
--- a/src/main/kotlin/dev/usbharu/hideout/mastodon/service/app/AppApiService.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/mastodon/service/app/AppApiService.kt
@@ -28,7 +28,6 @@ class AppApiServiceImpl(
     private val passwordEncoder: PasswordEncoder,
     private val transaction: Transaction
 ) : AppApiService {
-
     override suspend fun createApp(appsRequest: AppsRequest): Application {
         return transaction.transaction {
             val id = UUID.randomUUID().toString()
@@ -66,84 +65,5 @@ class AppApiServiceImpl(
         }
     }
 
-    private fun parseScope(string: String): Set<String> {
-        return string.split(" ")
-            .flatMap {
-                when (it) {
-                    "read" -> READ_SCOPES
-                    "write" -> WRITE_SCOPES
-                    "follow" -> FOLLOW_SCOPES
-                    "admin" -> ADMIN_SCOPES
-                    "admin:write" -> ADMIN_WRITE_SCOPES
-                    "admin:read" -> ADMIN_READ_SCOPES
-                    else -> listOfNotNull(it.takeIf { ALL_SCOPES.contains(it) })
-                }
-            }
-            .toSet()
-    }
-
-    companion object {
-        private val READ_SCOPES = listOf(
-            "read:accounts",
-            "read:blocks",
-            "read:bookmarks",
-            "read:favourites",
-            "read:filters",
-            "read:follows",
-            "read:lists",
-            "read:mutes",
-            "read:notifications",
-            "read:search",
-            "read:statuses"
-        )
-
-        private val WRITE_SCOPES = listOf(
-            "write:accounts",
-            "write:blocks",
-            "write:bookmarks",
-            "write:conversations",
-            "write:favourites",
-            "write:filters",
-            "write:follows",
-            "write:lists",
-            "write:media",
-            "write:mutes",
-            "write:notifications",
-            "write:reports",
-            "write:statuses"
-        )
-
-        private val FOLLOW_SCOPES = listOf(
-            "read:blocks",
-            "write:blocks",
-            "read:follows",
-            "write:follows",
-            "read:mutes",
-            "write:mutes"
-        )
-
-        private val ADMIN_READ_SCOPES = listOf(
-            "admin:read:accounts",
-            "admin:read:reports",
-            "admin:read:domain_allows",
-            "admin:read:domain_blocks",
-            "admin:read:ip_blocks",
-            "admin:read:email_domain_blocks",
-            "admin:read:canonical_email_blocks"
-        )
-
-        private val ADMIN_WRITE_SCOPES = listOf(
-            "admin:write:accounts",
-            "admin:write:reports",
-            "admin:write:domain_allows",
-            "admin:write:domain_blocks",
-            "admin:write:ip_blocks",
-            "admin:write:email_domain_blocks",
-            "admin:write:canonical_email_blocks"
-        )
-
-        private val ADMIN_SCOPES = ADMIN_READ_SCOPES + ADMIN_WRITE_SCOPES
-
-        private val ALL_SCOPES = READ_SCOPES + WRITE_SCOPES + FOLLOW_SCOPES + ADMIN_SCOPES
-    }
+    private fun parseScope(string: String): Set<String> = string.split(" ").toSet()
 }