Fixed various smaller issues

app/src/main/frontend/views/GameRequestView.tsx

@@ -35,9 +35,11 @@ export default function GameRequestView() {
     const gameRequests = useSnapshot(gameRequestState).gameRequests;
 
     const [areGameRequestsEnabled, setAreGameRequestsEnabled] = useState(false);
+    const [areGuestsAllowedToRequestGames, setAreGuestsAllowedToRequestGames] = useState(false);
 
     useEffect(() => {
         ConfigEndpoint.areGameRequestsEnabled().then(setAreGameRequestsEnabled);
+        ConfigEndpoint.areGuestsAllowedToRequestGames().then(setAreGuestsAllowedToRequestGames);
     }, []);
 
     const [searchTerm, setSearchTerm] = useState("");
@@ -168,7 +170,7 @@ export default function GameRequestView() {
                         color="primary"
                         startContent={<PlusCircle weight="fill"/>}
                         onPress={requestGameModal.onOpen}
-                        isDisabled={!areGameRequestsEnabled}>
+                        isDisabled={!areGameRequestsEnabled || (!auth.state.user && !areGuestsAllowedToRequestGames)}>
                     Request a Game
                 </Button>
             </div>

app/src/main/frontend/views/MainLayout.tsx

@@ -94,18 +94,16 @@ export default function MainLayout() {
                     </Tooltip>
                 </NavbarContent>}
                 <NavbarContent justify="end" className="items-center">
-                    {auth.state.user &&
+                    <NavbarItem>
-                        <NavbarItem>
+                        <Tooltip content="Request a game" placement="bottom">
-                            <Tooltip content="Request a game" placement="bottom">
+                            <Button color="primary"
-                                <Button color="primary"
+                                    isDisabled={window.location.pathname.startsWith("/requests")}
-                                        isDisabled={window.location.pathname.startsWith("/requests")}
+                                    onPress={() => navigate("/requests")}
-                                        onPress={() => navigate("/requests")}
+                                    startContent={<Disc weight="fill"/>}>
-                                        startContent={<Disc weight="fill"/>}>
+                                Requests
-                                    Requests
+                            </Button>
-                                </Button>
+                        </Tooltip>
-                            </Tooltip>
+                    </NavbarItem>
-                        </NavbarItem>
-                    }
                     {isAdmin(auth) &&
                         <NavbarItem>
                             <Tooltip content="View library scan results" placement="bottom">

app/src/main/kotlin/org/gameyfin/app/config/ConfigEndpoint.kt

@@ -59,4 +59,9 @@ class ConfigEndpoint(
     @DynamicPublicAccess
     @AnonymousAllowed
     fun areGameRequestsEnabled(): Boolean = configService.get(ConfigProperties.Requests.Games.Enabled) == true
+
+    @DynamicPublicAccess
+    @AnonymousAllowed
+    fun areGuestsAllowedToRequestGames(): Boolean =
+        configService.get(ConfigProperties.Requests.Games.AllowGuestsToRequestGames) == true
 }

app/src/main/kotlin/org/gameyfin/app/requests/GameRequestService.kt

@@ -91,7 +91,7 @@ class GameRequestService(
 
         // Check if guests are allowed to create requests
         if (config.get(ConfigProperties.Requests.Games.AllowGuestsToRequestGames) != true && currentUser == null) {
-            throw EndpointException("Only registered users can create game requests")
+            throw EndpointException("Only registered users can submit game requests")
         }
 
         // Check if user has too many open requests (0 means no limit per user)

app/src/main/kotlin/org/gameyfin/app/users/UserService.kt

@@ -99,7 +99,9 @@ class UserService(
 
         if (principal is OidcUser) {
             val oidcUser = org.gameyfin.app.users.entities.User(principal)
-            val userInfoDto = oidcUser.toExtendedUserInfoDto()
+            val user = userRepository.findByOidcProviderId(oidcUser.oidcProviderId!!)
+                ?: throw UsernameNotFoundException("Unknown OIDC user with provider ID '${oidcUser.oidcProviderId}'")
+            val userInfoDto = user.toExtendedUserInfoDto()
             userInfoDto.roles = roleService.extractGrantedAuthorities(principal.authorities)
                 .mapNotNull { Role.safeValueOf(it.authority) }
             return userInfoDto

app/src/main/kotlin/org/gameyfin/app/users/entities/User.kt

@@ -1,14 +1,15 @@
 package org.gameyfin.app.users.entities
 
-import org.gameyfin.app.games.entities.Image
 import jakarta.persistence.*
 import org.gameyfin.app.core.Role
 import org.gameyfin.app.core.security.EncryptionConverter
+import org.gameyfin.app.games.entities.Image
 import org.springframework.security.oauth2.core.oidc.user.OidcUser
 
 
 @Entity
 @Table(name = "users")
+@EntityListeners(UserEntityListener::class)
 class User(
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)

app/src/main/kotlin/org/gameyfin/app/users/entities/UserEntityListener.kt

@@ -0,0 +1,25 @@
+package org.gameyfin.app.users.entities
+
+import jakarta.persistence.EntityManager
+import jakarta.persistence.PreRemove
+import org.gameyfin.app.requests.entities.GameRequest
+import org.gameyfin.app.util.EntityManagerHolder
+
+class UserEntityListener {
+
+    @PreRemove
+    fun preRemove(user: User) {
+        val entityManager: EntityManager = EntityManagerHolder.getEntityManager()
+
+        // Remove user from all GameRequest voters and requester fields
+        val gameRequests = entityManager.createQuery(
+            "SELECT gr FROM GameRequest gr WHERE :user MEMBER OF gr.voters OR gr.requester = :user",
+            GameRequest::class.java
+        ).setParameter("user", user).resultList
+        for (gr in gameRequests) {
+            gr.voters.remove(user)
+            if (gr.requester == user) gr.requester = null
+            entityManager.merge(gr)
+        }
+    }
+}

app/src/main/kotlin/org/gameyfin/app/util/EntityManagerHolder.kt

@@ -0,0 +1,19 @@
+package org.gameyfin.app.util
+
+import jakarta.persistence.EntityManager
+import org.springframework.context.ApplicationContext
+import org.springframework.context.ApplicationContextAware
+import org.springframework.stereotype.Component
+
+@Component
+object EntityManagerHolder : ApplicationContextAware {
+    private var entityManager: EntityManager? = null
+
+    override fun setApplicationContext(context: ApplicationContext) {
+        entityManager = context.getBean(EntityManager::class.java)
+    }
+
+    fun getEntityManager(): EntityManager {
+        return entityManager ?: throw IllegalStateException("EntityManager not set")
+    }
+}