From 42c59c20dad3c229fcfba8197b4b83a6af99f2c1 Mon Sep 17 00:00:00 2001
From: Jayendra <t.jayendra98@gmail.com>
Date: Fri, 6 Dec 2019 16:29:29 +0530
Subject: [PATCH] Removed validation of AccountService2 grpc endpoints from
 permission interceptor

---
 .../permissions/PermissionsInterceptor.java      | 16 ++--------------
 .../account/services/AdminService2Impl.java      |  2 --
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/main/java/biz/nynja/account/permissions/PermissionsInterceptor.java b/src/main/java/biz/nynja/account/permissions/PermissionsInterceptor.java
index f11e383..63c7b1d 100644
--- a/src/main/java/biz/nynja/account/permissions/PermissionsInterceptor.java
+++ b/src/main/java/biz/nynja/account/permissions/PermissionsInterceptor.java
@@ -10,7 +10,6 @@ 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;
@@ -53,9 +52,6 @@ public class PermissionsInterceptor implements ServerInterceptor {
     private static final Class<AccountServiceImpl> SERVICE_CLASS = AccountServiceImpl.class;
     private static final Class<AdminServiceImpl> ADMIN_SERVICE_CLASS = AdminServiceImpl.class;
 
-    // Code added by Jayendra to Authrozie AdminService2Impl Endpoints
-    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");
@@ -164,15 +160,7 @@ public class PermissionsInterceptor implements ServerInterceptor {
         // Get the rpc method called
         Method[] allMethods = SERVICE_CLASS.getDeclaredMethods();
         Method[] adminMethods = ADMIN_SERVICE_CLASS.getDeclaredMethods();
-        // Added by Jayendra
-        Method[] admin2Methods = ADMIN_SERVICE2_CLASS.getDeclaredMethods();
-
-        for (Method method : admin2Methods) {
-            if (method.getName().equals(rpc)) {
-                return method;
-            }
-        }
-
+        
         for (Method method : allMethods) {
             if (method.getName().equals(rpc)) {
                 return method;
@@ -184,7 +172,7 @@ public class PermissionsInterceptor implements ServerInterceptor {
                 return method;
             }
         }
-
+        
         return null;
     }
 
diff --git a/src/main/java/biz/nynja/account/services/AdminService2Impl.java b/src/main/java/biz/nynja/account/services/AdminService2Impl.java
index 2c08217..a810653 100644
--- a/src/main/java/biz/nynja/account/services/AdminService2Impl.java
+++ b/src/main/java/biz/nynja/account/services/AdminService2Impl.java
@@ -522,8 +522,6 @@ public class AdminService2Impl extends AdminAccountService2Grpc.AdminAccountServ
     }
 
     @Override
-    @PerformPermissionCheck
-    @Permitted(role = RoleConstants.ACCOUNT_ADMIN)
     public void searchByFirstname(SearchByFirstNameRequest request,
                                   StreamObserver<AccountsResponse> responseObserver) {
 
-- 
GitLab