Merge pull request #192 from ruks/master

Add null check
wso2 · Jul 6, 2018 · cde41f6 · cde41f6
2 parents 5467709 + 0bd3b72
commit cde41f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/components/micro-gateway-core/src/main/ballerina/gateway/filters/authn_filter.bal b/components/micro-gateway-core/src/main/ballerina/gateway/filters/authn_filter.bal
@@ -144,8 +144,8 @@ public type AuthnFilter object {
                                     authenticationContext.stopOnQuotaReach = <boolean>apiKeyValidationDto.stopOnQuotaReach;
                                     authenticationContext.isContentAwareTierPresent = <boolean> apiKeyValidationDto
                                     .contentAware;
-                                    authenticationContext.callerToken = apiKeyValidationDto.endUserToken;
-                                    if(authenticationContext.callerToken != "") {
+                                    printDebug(KEY_AUTHN_FILTER, "Caller token: " + authenticationContext.callerToken);
+                                    if(authenticationContext.callerToken != "" && authenticationContext.callerToken != null) {
                                         string jwtheaderName = getConfigValue(JWT_CONFIG_INSTANCE_ID, JWT_HEADER,
                                             JWT_HEADER_NAME);
                                         request.setHeader(jwtheaderName, authenticationContext.callerToken);

diff --git a/components/micro-gateway-core/src/main/ballerina/gateway/filters/subscription_filter.bal b/components/micro-gateway-core/src/main/ballerina/gateway/filters/subscription_filter.bal
@@ -63,7 +63,7 @@ public type SubscriptionFilter object {
                                     authenticationContext.tier = subscription.subscriptionTier.toString();
                                     authenticationContext.apiKey = jwtToken;
                                     authenticationContext.username = decodedPayload.sub.toString();
-                                    authenticationContext.callerToken = jwtToken    ;
+                                    authenticationContext.callerToken = jwtToken;
                                     authenticationContext.applicationId = decodedPayload.application.id.toString();
                                     authenticationContext.applicationName = decodedPayload.application.name.toString();
                                     authenticationContext.applicationTier = decodedPayload.application.tier.toString();

diff --git a/components/micro-gateway-core/src/main/ballerina/gateway/oauthn_handler.bal b/components/micro-gateway-core/src/main/ballerina/gateway/oauthn_handler.bal
@@ -177,6 +177,7 @@ public function OAuthAuthProvider::invokeKeyValidation(APIRequestMetaDataDto api
     string accessToken = apiRequestMetaDataDto.accessToken;
     boolean authorized = false;
     json keyValidationInfoJson = self.doKeyValidation(apiRequestMetaDataDto);
+    printTrace(KEY_OAUTH_PROVIDER, "key Validation json " + keyValidationInfoJson.toString());
     match <string>keyValidationInfoJson.authorized {
         string authorizeValue => {
             boolean auth = <boolean>authorizeValue;