diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java b/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java index 01214bc5c46d4a33ea7514ea2edcbdccfa691099..bfe12ea15cd875a091ea47f00c6d885d2f3aee91 100644 --- a/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java +++ b/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java @@ -155,7 +155,7 @@ public class PubsubEndpoint { private String querySubscriptionAndUpdateCache(String notificationId) throws Exception { Map<String,String> hmap = headers.getHeaders(); - String auth_header = hmap.get("Authorization"); + String auth_header = hmap.get("authorization"); System.out.println("Notification token before creating subscription service= "+auth_header); ISubscriptionService service = subscriptionFactory.create(headers); diff --git a/provider/notification-aws/pom.xml b/provider/notification-aws/pom.xml index f4f41141f3d47e798a017340b173cc179e7088e3..f7e76b744d4b699bceb908c9cafbdd12c9a5ef4c 100644 --- a/provider/notification-aws/pom.xml +++ b/provider/notification-aws/pom.xml @@ -50,7 +50,7 @@ <dependency> <groupId>org.opengroup.osdu.core.aws</groupId> <artifactId>os-core-lib-aws</artifactId> - <version>0.3.14-oauth-feat-deshruch-oauth-changes-SNAPSHOT</version> + <version>0.3.12-SNAPSHOT</version> </dependency> <!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-secretsmanager --> diff --git a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java index 6f9dfbc2c6d121cabca3d720e79a5046e7d487a9..2ef26c3f5254c4ac270f9f8c59ce168b45659095 100644 --- a/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java +++ b/provider/notification-aws/src/main/java/org/opengroup/osdu/notification/provider/aws/impl/ServiceAccountJwtAwsClientImpl.java @@ -129,6 +129,7 @@ public class ServiceAccountJwtAwsClientImpl implements IServiceAccountJwtClient headers.put("Content-Type", "application/x-www-form-urlencoded"); IHttpClient httpClient = new HttpClient(); String url = tokenUrl+"?grant_type=client_credentials&client_id="+client_credentials_clientid+"&scope="+awsOauthCustomScope; + System.out.println("Token url="+url); HttpRequest rq = HttpRequest.post().url(url).headers(headers).build(); diff --git a/testing/notification-test-aws/pom.xml b/testing/notification-test-aws/pom.xml index 50ef297b5a13aa5367599e225d62c106b0bab7b5..6b180e62eba58e20cf0eff968fff417d964541ec 100644 --- a/testing/notification-test-aws/pom.xml +++ b/testing/notification-test-aws/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.opengroup.osdu.core.aws</groupId> <artifactId>os-core-lib-aws</artifactId> - <version>0.3.14-oauth-feat-deshruch-oauth-changes-SNAPSHOT</version> + <version>0.3.12-SNAPSHOT</version> </dependency> <dependency> <groupId>com.amazonaws</groupId>