From bdb01a0098a6fca849565b608357838470d7b0da Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 13 Jul 2021 22:33:18 +0530 Subject: [PATCH] bug fixing --- .../mgt/core/config/permission/AnnotationProcessor.java | 2 +- .../src/main/resources/jwt.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/AnnotationProcessor.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/AnnotationProcessor.java index e60b14eee9..6c680babaa 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/AnnotationProcessor.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/AnnotationProcessor.java @@ -240,7 +240,7 @@ public class AnnotationProcessor { subCtx = makeContextURLReady(resourceRootContext) + makeContextURLReady(subCtx); } permission.setUrl(replaceDynamicPathVariables(subCtx)); - permission.setUrlPattern(permission.getUrl().replace("*", "[a-zA-Z0-9-_]+")); + permission.setUrlPattern(permission.getUrl().replace("*", "[a-zA-Z0-9-_.]+")); String httpMethod; for (int i = 0; i < annotations.length; i++) { httpMethod = getHTTPMethodAnnotation(annotations[i]); diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/jwt.properties b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/jwt.properties index 0c9641fa2d..be3fa54494 100644 --- a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/jwt.properties +++ b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/jwt.properties @@ -17,13 +17,13 @@ # #issuer of the JWT -iss=wso2.org/products/iot +iss=https://localhost:9443/oauth2/token TokenEndpoint=https://${iot.gateway.host}:${iot.gateway.https.port}/token?tenantDomain=carbon.super #audience of JWT claim #comma seperated values -aud=devicemgt +aud=https://localhost:9443/oauth2/token #expiration time of JWT (number of minutes from the current time) exp=1000