From a492c0c0da0b9dcbf2d7ea14227331b1f58618ea Mon Sep 17 00:00:00 2001
From: Jayendra <t.jayendra98@gmail.com>
Date: Sat, 7 Dec 2019 09:11:45 +0530
Subject: [PATCH] Added methods of AdminService2Impl in PermissionInterceptor

---
 .../permissions/PermissionsInterceptor.java       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/biz/nynja/account/permissions/PermissionsInterceptor.java b/src/main/java/biz/nynja/account/permissions/PermissionsInterceptor.java
index 63c7b1d..b66e9fb 100644
--- a/src/main/java/biz/nynja/account/permissions/PermissionsInterceptor.java
+++ b/src/main/java/biz/nynja/account/permissions/PermissionsInterceptor.java
@@ -10,6 +10,7 @@ import java.util.Base64;
 import java.util.Optional;
 import java.util.UUID;
 
+import biz.nynja.account.services.AdminService2Impl;
 import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,6 +53,9 @@ public class PermissionsInterceptor implements ServerInterceptor {
     private static final Class<AccountServiceImpl> SERVICE_CLASS = AccountServiceImpl.class;
     private static final Class<AdminServiceImpl> ADMIN_SERVICE_CLASS = AdminServiceImpl.class;
 
+    // Added by Jayendra
+    private static final Class<AdminService2Impl> ADMIN_SERVICE2_CLASS = AdminService2Impl.class;
+
     public static final Metadata.Key<String> ACCESS_TOKEN_METADATA = Metadata.Key.of("Authorization",
             ASCII_STRING_MARSHALLER);
     public static final Context.Key<String> ACCESS_TOKEN_CTX = Context.key("accessToken");
@@ -160,7 +164,8 @@ public class PermissionsInterceptor implements ServerInterceptor {
         // Get the rpc method called
         Method[] allMethods = SERVICE_CLASS.getDeclaredMethods();
         Method[] adminMethods = ADMIN_SERVICE_CLASS.getDeclaredMethods();
-        
+        Method[] admin2Methods = ADMIN_SERVICE2_CLASS.getDeclaredMethods();
+
         for (Method method : allMethods) {
             if (method.getName().equals(rpc)) {
                 return method;
@@ -172,7 +177,13 @@ public class PermissionsInterceptor implements ServerInterceptor {
                 return method;
             }
         }
-        
+
+        for (Method method : admin2Methods) {
+            if (method.getName().equals(rpc)) {
+                return method;
+            }
+        }
+
         return null;
     }
 
-- 
GitLab