From 962bbe2e2118cc6079ca2fe3b8e59b5690762711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raymond=20Aug=C3=A9?= Date: Wed, 9 Nov 2022 15:49:51 -0500 Subject: [PATCH] LPS-169029 Add the oauth2 audience to the init configmaps generated by OAuth2ProviderApplication factories --- ...2ProviderApplicationHeadlessServerConfigurationFactory.java | 3 +++ ...OAuth2ProviderApplicationUserAgentConfigurationFactory.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/modules/apps/oauth2-provider/oauth2-provider-service/src/main/java/com/liferay/oauth2/provider/internal/configuration/OAuth2ProviderApplicationHeadlessServerConfigurationFactory.java b/modules/apps/oauth2-provider/oauth2-provider-service/src/main/java/com/liferay/oauth2/provider/internal/configuration/OAuth2ProviderApplicationHeadlessServerConfigurationFactory.java index 7e71a0fae9b567..8d7362e99825b6 100644 --- a/modules/apps/oauth2-provider/oauth2-provider-service/src/main/java/com/liferay/oauth2/provider/internal/configuration/OAuth2ProviderApplicationHeadlessServerConfigurationFactory.java +++ b/modules/apps/oauth2-provider/oauth2-provider-service/src/main/java/com/liferay/oauth2/provider/internal/configuration/OAuth2ProviderApplicationHeadlessServerConfigurationFactory.java @@ -90,6 +90,9 @@ protected void activate(Map properties) throws Exception { HashMapBuilder.put( externalReferenceCode + ".oauth2.authorization.uri", serviceAddress.concat("/o/oauth2/authorize") + ).put( + externalReferenceCode + ".oauth2.headless.server.audience", + oAuth2Application.getHomePageURL() ).put( externalReferenceCode + ".oauth2.headless.server.client.id", oAuth2Application.getClientId() diff --git a/modules/apps/oauth2-provider/oauth2-provider-service/src/main/java/com/liferay/oauth2/provider/internal/configuration/OAuth2ProviderApplicationUserAgentConfigurationFactory.java b/modules/apps/oauth2-provider/oauth2-provider-service/src/main/java/com/liferay/oauth2/provider/internal/configuration/OAuth2ProviderApplicationUserAgentConfigurationFactory.java index f13d25a77f3073..2531f54b806428 100644 --- a/modules/apps/oauth2-provider/oauth2-provider-service/src/main/java/com/liferay/oauth2/provider/internal/configuration/OAuth2ProviderApplicationUserAgentConfigurationFactory.java +++ b/modules/apps/oauth2-provider/oauth2-provider-service/src/main/java/com/liferay/oauth2/provider/internal/configuration/OAuth2ProviderApplicationUserAgentConfigurationFactory.java @@ -103,6 +103,9 @@ protected void activate(Map properties) throws Exception { ).put( externalReferenceCode + ".oauth2.token.uri", serviceAddress.concat("/o/oauth2/token") + ).put( + externalReferenceCode + ".oauth2.user.agent.audience", + oAuth2Application.getHomePageURL() ).put( externalReferenceCode + ".oauth2.user.agent.client.id", oAuth2Application.getClientId()