-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36375 from jmartisk/graphql-client-oidc
OIDC client integration for GraphQL clients
- Loading branch information
Showing
22 changed files
with
636 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <parent> | ||
| <artifactId>quarkus-oidc-client-graphql-parent</artifactId> | ||
| <groupId>io.quarkus</groupId> | ||
| <version>999-SNAPSHOT</version> | ||
| <relativePath>../</relativePath> | ||
| </parent> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <artifactId>quarkus-oidc-client-graphql-deployment</artifactId> | ||
| <name>Quarkus - OpenID Connect Client GraphQL integration - Deployment</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-core-deployment</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-arc-deployment</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-oidc-client-graphql</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-oidc-client-deployment</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-smallrye-graphql-client-deployment</artifactId> | ||
| </dependency> | ||
| <!-- Test dependencies --> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-junit5-internal</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.rest-assured</groupId> | ||
| <artifactId>rest-assured</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-test-keycloak-server</artifactId> | ||
| <scope>test</scope> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-oidc-deployment</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-smallrye-graphql-deployment</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-resteasy-reactive-deployment</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <testResources> | ||
| <testResource> | ||
| <directory>src/test/resources</directory> | ||
| <filtering>true</filtering> | ||
| </testResource> | ||
| </testResources> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <configuration> | ||
| <annotationProcessorPaths> | ||
| <path> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-extension-processor</artifactId> | ||
| <version>${project.version}</version> | ||
| </path> | ||
| </annotationProcessorPaths> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <configuration> | ||
| <skip>true</skip> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <profiles> | ||
| <profile> | ||
| <id>test-keycloak</id> | ||
| <activation> | ||
| <property> | ||
| <name>test-containers</name> | ||
| </property> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <configuration> | ||
| <skip>false</skip> | ||
| <systemPropertyVariables> | ||
| <keycloak.docker.image>${keycloak.docker.legacy.image}</keycloak.docker.image> | ||
| <keycloak.use.https>false</keycloak.use.https> | ||
| </systemPropertyVariables> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
| </project> |
57 changes: 57 additions & 0 deletions
57
...t/src/main/java/io/quarkus/oidc/client/graphql/OidcGraphQLClientIntegrationProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package io.quarkus.oidc.client.graphql; | ||
|
|
||
| import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import org.jboss.jandex.AnnotationInstance; | ||
| import org.jboss.jandex.AnnotationValue; | ||
| import org.jboss.jandex.ClassInfo; | ||
| import org.jboss.jandex.DotName; | ||
|
|
||
| import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem; | ||
| import io.quarkus.arc.deployment.BeanContainerBuildItem; | ||
| import io.quarkus.deployment.Feature; | ||
| import io.quarkus.deployment.annotations.BuildProducer; | ||
| import io.quarkus.deployment.annotations.BuildStep; | ||
| import io.quarkus.deployment.annotations.Record; | ||
| import io.quarkus.deployment.builditem.FeatureBuildItem; | ||
| import io.quarkus.oidc.client.graphql.runtime.OidcClientGraphQLConfig; | ||
| import io.quarkus.oidc.client.graphql.runtime.OidcGraphQLClientIntegrationRecorder; | ||
|
|
||
| public class OidcGraphQLClientIntegrationProcessor { | ||
|
|
||
| private static final DotName GRAPHQL_CLIENT_API = DotName | ||
| .createSimple("io.smallrye.graphql.client.typesafe.api.GraphQLClientApi"); | ||
|
|
||
| private static final String OIDC_CLIENT_FILTER = "io.quarkus.oidc.client.filter.OidcClientFilter"; | ||
|
|
||
| @BuildStep | ||
| void feature(BuildProducer<FeatureBuildItem> featureProducer) { | ||
| featureProducer.produce(new FeatureBuildItem(Feature.OIDC_CLIENT_GRAPHQL_CLIENT_INTEGRATION)); | ||
| } | ||
|
|
||
| @BuildStep | ||
| @Record(RUNTIME_INIT) | ||
| void initialize(BeanContainerBuildItem containerBuildItem, | ||
| OidcGraphQLClientIntegrationRecorder recorder, | ||
| OidcClientGraphQLConfig config, | ||
| BeanArchiveIndexBuildItem index) { | ||
| Map<String, String> configKeysToOidcClients = new HashMap<>(); | ||
| for (AnnotationInstance annotation : index.getIndex().getAnnotations(GRAPHQL_CLIENT_API)) { | ||
| ClassInfo clazz = annotation.target().asClass(); | ||
| AnnotationInstance oidcClient = clazz.annotation(OIDC_CLIENT_FILTER); | ||
| if (oidcClient != null) { | ||
| String oidcClientName = oidcClient.valueWithDefault(index.getIndex(), "value").asString(); | ||
| AnnotationValue configKeyValue = annotation.value("configKey"); | ||
| String configKey = configKeyValue != null ? configKeyValue.asString() : null; | ||
| String actualConfigKey = (configKey != null && !configKey.equals("")) ? configKey : clazz.name().toString(); | ||
| if (oidcClientName != null && !oidcClientName.isEmpty()) { | ||
| configKeysToOidcClients.put(actualConfigKey, oidcClientName); | ||
| } | ||
| } | ||
| } | ||
| recorder.enhanceGraphQLClientConfigurationWithOidc(configKeysToOidcClients, config.clientName.orElse(null)); | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
...loyment/src/test/java/io/quarkus/oidc/client/graphql/AnnotationTypesafeGraphQLClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package io.quarkus.oidc.client.graphql; | ||
|
|
||
| import org.eclipse.microprofile.graphql.Query; | ||
|
|
||
| import io.quarkus.oidc.client.filter.OidcClientFilter; | ||
| import io.smallrye.graphql.client.typesafe.api.GraphQLClientApi; | ||
|
|
||
| @GraphQLClientApi(configKey = "typesafe-annotation") | ||
| @OidcClientFilter("annotation") | ||
| public interface AnnotationTypesafeGraphQLClient { | ||
|
|
||
| @Query | ||
| String principalName(); | ||
|
|
||
| } |
15 changes: 15 additions & 0 deletions
15
...deployment/src/test/java/io/quarkus/oidc/client/graphql/DefaultTypesafeGraphQLClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package io.quarkus.oidc.client.graphql; | ||
|
|
||
| import org.eclipse.microprofile.graphql.Query; | ||
|
|
||
| import io.quarkus.oidc.client.filter.OidcClientFilter; | ||
| import io.smallrye.graphql.client.typesafe.api.GraphQLClientApi; | ||
|
|
||
| @GraphQLClientApi(configKey = "typesafe-default") | ||
| @OidcClientFilter | ||
| public interface DefaultTypesafeGraphQLClient { | ||
|
|
||
| @Query | ||
| String principalName(); | ||
|
|
||
| } |
Oops, something went wrong.