fix(discord): fixed discord provider

CONTRIBUTING.md

@@ -0,0 +1,54 @@
+Thank you for your interest in contributing to the Cloudeko Zenei Auth Service! We appreciate your willingness to help improve and enhance this project.
+
+**Setting Up Your Development Environment**
+
+1. **Prerequisites**
+
+    * **Java 21:** Ensure you have Java 21 installed. You can download it from [https://openjdk.org/](https://openjdk.org/).
+
+    * **Maven:**  Install Maven. Check the installation instructions at [https://maven.apache.org/](https://maven.apache.org/).
+
+2. **Generate Development Keys**
+
+    * **Execute the Script:** Run the script to create `dev-private-key.pem` and `dev-public-key.pem`.
+
+       ```bash
+       ./generate-dev-keys.sh
+       ```
+
+3. **Build and Run**
+
+    * **Build:**
+
+      ```bash
+      mvn clean install
+      ```
+
+    * **Run:**
+
+      ```bash
+      mvn quarkus:dev
+      ```
+
+**Making Contributions**
+
+1. **Fork the Repository**
+2. **Create a Branch**
+3. **Make Your Changes**
+4. **Commit Your Changes**
+5. **Push to Your Branch**
+6. **Open a Pull Request**
+
+**Code Style**
+
+* Please follow the existing code style and formatting.
+
+**Additional Notes**
+
+* Ensure your code is well-documented.
+* Write unit tests to accompany your changes.
+* If you're introducing a new feature or making a significant change, consider opening an issue for discussion beforehand.
+
+**We look forward to your contributions!**
+
+Feel free to ask if you have any questions.

core/src/main/java/dev/cloudeko/zenei/application/web/resource/ExternalResource.java

@@ -36,9 +36,9 @@ public Response login(@PathParam("provider") String provider) {
 
         final var uriBuilder = UriBuilder.fromUri(providerConfig.get().getAuthorizationEndpoint())
                 .queryParam("client_id", providerConfig.get().config().clientId())
-                .queryParam("redirect_uri", providerConfig.get().config().redirectUri())
+                .queryParam("redirect_uri", providerConfig.get().config().redirectUri().orElse(""))
                 .queryParam("response_type", "code")
-                .queryParam("scope", providerConfig.get().config().scope());
+                .queryParam("scope", providerConfig.get().config().scope().orElse(""));
 
         return Response.temporaryRedirect(uriBuilder.build()).build();
     }

core/src/main/java/dev/cloudeko/zenei/domain/feature/impl/LoginUserWithAuthorizationCodeImpl.java

@@ -54,8 +54,11 @@ public Token handle(String provider, String code) {
                 .baseUri(URI.create(externalProvider.getTokenEndpoint()))
                 .build(LoginOAuthClient.class);
 
-        final var accessToken = client.getAccessToken(externalProvider.config().clientId(),
-                externalProvider.config().clientSecret(), code, null);
+        final var accessToken = client.getAccessToken("authorization_code",
+                externalProvider.config().clientId(),
+                externalProvider.config().clientSecret(),
+                code,
+                externalProvider.config().redirectUri().orElseThrow());
 
         if (accessToken == null) {
             throw new IllegalArgumentException("Invalid authorization code");

core/src/main/resources/application-common.properties

@@ -0,0 +1,10 @@
+# Application configuration
+# Name of the Quarkus application. This can be used in various places, e.g., metrics.
+quarkus.application.name=cloudeko-zenei-auth-service
+# Path to a custom banner text file to be displayed on application startup.
+quarkus.banner.path=zenei_banner.txt
+
+# Database configuration
+# JDBC driver class for the database connection.
+quarkus.datasource.jdbc.driver=org.postgresql.Driver
+quarkus.hibernate-orm.database.generation=update

core/src/main/resources/application-dev.properties

@@ -0,0 +1,22 @@
+# In 'dev' profile, drop and recreate the database schema on each startup.
+quarkus.hibernate-orm.database.generation=drop-and-create
+
+# Mail configuration
+# Use a mock mailer for development, not sending actual emails.
+%dev.quarkus.mailer.mock=true
+
+# Zenei Configuration
+# Type of database used by the Zenei application.
+zenei.database.db-kind=postgresql
+# Location of the private key file for JWT signing.
+zenei.jwt.private.key.location=dev-private-key.pem
+# Location of the public key file for JWT verification.
+zenei.jwt.public.key.location=dev-public-key.pem
+# Issuer identifier to be included in generated JWTs.
+zenei.jwt.issuer=https://example.com/issuer
+
+# Default zenei admin user
+zenei.user.default.admin.username=admin
+zenei.user.default.admin.email=[email protected]
+zenei.user.default.admin.password=test
+zenei.user.default.admin.role=admin

core/src/main/resources/application-providers.properties

@@ -0,0 +1,19 @@
+# Github OAuth
+zenei.external.auth.providers.github.enabled=true
+zenei.external.auth.providers.github.client-id=<YOUR_CLIENT_ID>
+zenei.external.auth.providers.github.client-secret=<YOUR_CLIENT_SECRET>
+zenei.external.auth.providers.github.authorization-uri=https://github.com/login/oauth/authorize
+zenei.external.auth.providers.github.token-uri=https://github.com/login/oauth/access_token
+zenei.external.auth.providers.github.base-uri=https://api.github.com
+zenei.external.auth.providers.github.redirect-uri=http://localhost:8080/external/callback/github
+zenei.external.auth.providers.github.scope=user:email
+
+# Discord OAuth
+zenei.external.auth.providers.discord.enabled=true
+zenei.external.auth.providers.discord.client-id=<YOUR_CLIENT_ID>
+zenei.external.auth.providers.discord.client-secret=<YOUR_CLIENT_SECRET>
+zenei.external.auth.providers.discord.authorization-uri=https://discord.com/api/oauth2/authorize
+zenei.external.auth.providers.discord.token-uri=https://discord.com/api/oauth2/token
+zenei.external.auth.providers.discord.base-uri=https://discord.com/api
+zenei.external.auth.providers.discord.redirect-uri=http://localhost:8080/external/callback/discord
+zenei.external.auth.providers.discord.scope=identify email

core/src/main/resources/application-test.properties

@@ -0,0 +1,18 @@
+# In 'test' profile, drop and recreate the database schema on each startup.
+quarkus.hibernate-orm.database.generation=drop-and-create
+
+# Zenei Configuration
+# Type of database used by the Zenei application.
+zenei.database.db-kind=postgresql
+# Location of the private key file for JWT signing.
+zenei.jwt.private.key.location=dev-private-key.pem
+# Location of the public key file for JWT verification.
+zenei.jwt.public.key.location=dev-public-key.pem
+# Issuer identifier to be included in generated JWTs.
+zenei.jwt.issuer=https://example.com/issuer
+
+# Default zenei admin user
+zenei.user.default.admin.username=admin
+zenei.user.default.admin.email=[email protected]
+zenei.user.default.admin.password=test
+zenei.user.default.admin.role=admin

core/src/main/resources/application.properties

@@ -1,48 +1,2 @@
-# Application configuration
-# Name of the Quarkus application. This can be used in various places, e.g., metrics.
-quarkus.application.name=cloudeko-zenei-auth-service
-# Path to a custom banner text file to be displayed on application startup.
-quarkus.banner.path=zenei_banner.txt
-
-# Database configuration
-# JDBC driver class for the database connection.
-quarkus.datasource.jdbc.driver=org.postgresql.Driver
-# Hibernate ORM strategy for database schema generation.
-# 'update' will attempt to update the existing schema to match the entities.
-quarkus.hibernate-orm.database.generation=update
-# In 'dev' profile, drop and recreate the database schema on each startup.
-%dev.quarkus.hibernate-orm.database.generation=drop-and-create
-# In 'test' profile, drop and recreate the database schema on each startup.
-%test.quarkus.hibernate-orm.database.generation=drop-and-create
-
-# Mail configuration
-# Use a mock mailer for development, not sending actual emails.
-%dev.quarkus.mailer.mock=true
-# In 'prod' profile, disable the mock mailer and send real emails.
-%prod.quarkus.mailer.mock=false
-
-# Zenei Configuration
-# Type of database used by the Zenei application.
-zenei.database.db-kind=postgresql
-# Location of the private key file for JWT signing.
-zenei.jwt.private.key.location=dev-private-key.pem
-# Location of the public key file for JWT verification.
-zenei.jwt.public.key.location=dev-public-key.pem
-# Issuer identifier to be included in generated JWTs.
-zenei.jwt.issuer=https://example.com/issuer
-
-# Default zenei admin user
-zenei.user.default.admin.username=admin
-zenei.user.default.admin.email=[email protected]
-zenei.user.default.admin.password=test
-zenei.user.default.admin.role=admin
-
-# Github OAuth
-#zenei.external.auth.providers.github.enabled=false
-#zenei.external.auth.providers.github.client-id=<YOUR_CLIENT_ID>
-#zenei.external.auth.providers.github.client-secret=<YOUR_CLIENT_SECRET>
-#zenei.external.auth.providers.github.authorization-uri=https://github.com/login/oauth/authorize
-#zenei.external.auth.providers.github.token-uri=https://github.com/login/oauth/access_token
-#zenei.external.auth.providers.github.base-uri=https://api.github.com
-#zenei.external.auth.providers.github.redirect-uri=http://localhost:8080/external/callback/github
-#zenei.external.auth.providers.github.scope=user:email
+%dev.quarkus.config.locations=application-common.properties,application-providers.properties,application-dev.properties
+%test.quarkus.config.locations=application-common.properties,application-test.properties

core/src/test/java/dev/cloudeko/zenei/resource/MockDiscordAuthorizationServerTestResource.java

@@ -28,9 +28,11 @@ protected Map<String, String> providerSpecificStubsAndConfig(WireMockServer serv
 
             // Mock the Discord access token endpoint
             server.stubFor(WireMock.post(WireMock.urlPathEqualTo("/discord/login/oauth/access_token"))
-                    .withQueryParam("client_id", WireMock.matching(".*"))
-                    .withQueryParam("client_secret", WireMock.matching(".*"))
-                    .withQueryParam("code", WireMock.matching(".*"))
+                    .withFormParam("client_id", WireMock.matching(".*"))
+                    .withFormParam("client_secret", WireMock.matching(".*"))
+                    .withFormParam("code", WireMock.matching(".*"))
+                    .withFormParam("grant_type", WireMock.matching(".*"))
+                    .withFormParam("redirect_uri", WireMock.matching(".*"))
                     .willReturn(WireMock.aResponse()
                             .withHeader("Content-Type", "application/json")
                             .withBody(objectMapper.writeValueAsString(

core/src/test/java/dev/cloudeko/zenei/resource/MockGithubAuthorizationServerTestResource.java

@@ -30,9 +30,11 @@ protected Map<String, String> providerSpecificStubsAndConfig(WireMockServer serv
 
             // Mock the access token endpoint
             server.stubFor(WireMock.post(WireMock.urlPathEqualTo("/github/login/oauth/access_token"))
-                    .withQueryParam("client_id", WireMock.matching(".*"))
-                    .withQueryParam("client_secret", WireMock.matching(".*"))
-                    .withQueryParam("code", WireMock.matching(".*"))
+                    .withFormParam("client_id", WireMock.matching(".*"))
+                    .withFormParam("client_secret", WireMock.matching(".*"))
+                    .withFormParam("code", WireMock.matching(".*"))
+                    .withFormParam("grant_type", WireMock.matching(".*"))
+                    .withFormParam("redirect_uri", WireMock.matching(".*"))
                     .willReturn(WireMock.aResponse()
                             .withHeader("Content-Type", "application/json")
                             .withBody(objectMapper.writeValueAsString(

extensions/external-authentication/runtime/src/main/java/dev/cloudeko/zenei/extension/external/web/client/LoginOAuthClient.java

@@ -1,9 +1,6 @@
 package dev.cloudeko.zenei.extension.external.web.client;
 
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.MediaType;
 import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam;
 
@@ -12,9 +9,11 @@ public interface LoginOAuthClient {
 
     @POST
     @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
     @ClientHeaderParam(name = "Accept", value = MediaType.APPLICATION_JSON)
-    ExternalAccessToken getAccessToken(@QueryParam("client_id") String clientId,
-            @QueryParam("client_secret") String clientSecret,
-            @QueryParam("code") String code,
-            @QueryParam("redirect_uri") String redirectUri);
+    ExternalAccessToken getAccessToken(@FormParam("grant_type") String grantType,
+            @FormParam("client_id") String clientId,
+            @FormParam("client_secret") String clientSecret,
+            @FormParam("code") String code,
+            @FormParam("redirect_uri") String redirectUri);
 }

generate-dev-keys.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Generate a development private key
+openssl genpkey -algorithm RSA -out core/src/main/resources/dev-private-key.pem -pkeyopt rsa_keygen_bits:2048
+
+# Extract the public key from the private key
+openssl rsa -in core/src/main/resources/dev-private-key.pem -pubout -out core/src/main/resources/dev-public-key.pem