From 1c0807a5138e897c82d7c64128f655dcf4e23224 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Sat, 23 Apr 2016 00:07:12 +0530
Subject: [PATCH] added userstore null check for permission scope validator

---
 .../validators/PermissionBasedScopeValidator.java     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
index cb8d59fb5c..04fc9996cd 100644
--- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
+++ b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
@@ -85,9 +85,14 @@ public class PermissionBasedScopeValidator extends OAuth2ScopeValidator {
                 int tenantId = OAuthExtUtils.getTenantId(authzUser.getTenantDomain());
                 UserRealm userRealm = OAuthExtensionsDataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId);
                 if (userRealm != null && userRealm.getAuthorizationManager() != null) {
-                    status = userRealm.getAuthorizationManager()
-                                      .isUserAuthorized(userStore +"/"+ username, permission.getPath(),
-                                                        PermissionMethod.UI_EXECUTE);
+                    if (userStore != null) {
+                        status = userRealm.getAuthorizationManager()
+                                .isUserAuthorized(userStore + "/" + username, permission.getPath(),
+                                                  PermissionMethod.UI_EXECUTE);
+                    } else {
+                        status = userRealm.getAuthorizationManager()
+                                .isUserAuthorized(username, permission.getPath(), PermissionMethod.UI_EXECUTE);
+                    }
                 }
             }
         } catch (PermissionManagementException e) {