Merge pull request #48 from aserto-dev/query-identity-context

Take IdentityContext in AuthorizerClient.query

Author: ronenh

.gitignore

@@ -26,3 +26,4 @@ hs_err_pid*
 
 # IDE specific
 .idea/
+.factorypath

examples/authz-example/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.aserto</groupId>
             <artifactId>aserto-java</artifactId>
-            <version>0.31.1</version>
+            <version>0.31.4</version>
         </dependency>
     </dependencies>
 
@@ -51,4 +51,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

examples/directory-example/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.aserto</groupId>
             <artifactId>aserto-java</artifactId>
-            <version>0.31.1</version>
+            <version>0.31.4</version>
         </dependency>
     </dependencies>
 
@@ -51,4 +51,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.aserto</groupId>
     <artifactId>aserto-java</artifactId>
-    <version>0.31.3</version>
+    <version>0.31.4</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Java SDK to interact with aserto services</description>
@@ -50,12 +50,12 @@
         <dependency>
             <groupId>com.aserto</groupId>
             <artifactId>java-authorizer</artifactId>
-            <version>0.20.13</version>
+            <version>0.20.14</version>
         </dependency>
         <dependency>
             <groupId>com.aserto</groupId>
             <artifactId>java-directory</artifactId>
-            <version>0.31.4</version>
+            <version>0.31.5</version>
         </dependency>
 
         <!-- Used for unit testing -->

src/main/java/com/aserto/AuthorizerClient.java

@@ -12,10 +12,18 @@
 
 public interface AuthorizerClient {
     public List<Module> listPolicies(String policyName, String policyLabel);
+
     public Module getPolicy(String policyId);
+
     public List<Decision> is(IdentityCtx identityCtx, PolicyCtx policyCtx);
+
     public List<Decision> is(IdentityCtx identityCtx, PolicyCtx policyCtx, Map<String, Value> resourceCtx);
-    public Struct query(String query, PolicyCtx policyContext, Map<String, Value> values);
+
+    public Struct query(String query, PolicyCtx policyContext, Map<String, Value> resourceCtx);
+
+    public Struct query(String query, IdentityCtx identityCtx, PolicyCtx policyContext, Map<String, Value> resourceCtx);
+
     public Map<String, Value> decisionTree(IdentityCtx identityCtx, PolicyCtx policyCtx);
+
     public void close();
 }

src/main/java/com/aserto/authorizer/AuthzClient.java

@@ -19,6 +19,7 @@
 import com.aserto.authorizer.v2.QueryRequest;
 import com.aserto.authorizer.v2.QueryResponse;
 import com.aserto.authorizer.v2.api.IdentityContext;
+import com.aserto.authorizer.v2.api.IdentityType;
 import com.aserto.authorizer.v2.api.Module;
 import com.aserto.authorizer.v2.api.PolicyContext;
 import com.aserto.authorizer.v2.api.PolicyInstance;
@@ -32,6 +33,7 @@
 public class AuthzClient implements AuthorizerClient {
     private final AuthorizerGrpc.AuthorizerBlockingStub client;
     private final ManagedChannel channel;
+
     public AuthzClient(ManagedChannel channel) {
         client = AuthorizerGrpc.newBlockingStub(channel);
         this.channel = channel;
@@ -84,21 +86,29 @@ public List<Decision> is(IdentityCtx identityCtx, PolicyCtx policyCtx, Map<Strin
     }
 
     @Override
-    public Struct query(String query, PolicyCtx policyContext, Map<String, Value> values) {
+    public Struct query(String query, IdentityCtx identityCtx, PolicyCtx policyContext,
+            Map<String, Value> resourceCtx) {
         QueryRequest.Builder queryRequestBuilder = QueryRequest.newBuilder();
         queryRequestBuilder.setQuery(query);
 
+        IdentityContext identityContext = buildIdentityContext(identityCtx);
         PolicyInstance policy = buildPolicy(policyContext.getName());
-        Struct.Builder structBuilder = buildResourceContext(values);
+        Struct.Builder resourceContext = buildResourceContext(resourceCtx);
 
+        queryRequestBuilder.setIdentityContext(identityContext);
         queryRequestBuilder.setPolicyInstance(policy);
-        queryRequestBuilder.setResourceContext(structBuilder);
+        queryRequestBuilder.setResourceContext(resourceContext);
 
         QueryResponse queryResponse = client.query(queryRequestBuilder.build());
 
         return queryResponse.getResponse();
     }
 
+    @Override
+    public Struct query(String query, PolicyCtx policyContext, Map<String, Value> resourceCtx) {
+        return query(query, new IdentityCtx("", IdentityType.IDENTITY_TYPE_NONE), policyContext, resourceCtx);
+    }
+
     @Override
     public Map<String, Value> decisionTree(IdentityCtx identityCtx, PolicyCtx policyCtx) {
         DecisionTreeRequest.Builder decisionTreeBuilder = DecisionTreeRequest.newBuilder();
@@ -129,7 +139,7 @@ private PolicyInstance buildPolicy(String name) {
     }
 
     private IdentityContext buildIdentityContext(IdentityCtx identityContext) {
-        IdentityContext.Builder identityContextBuilder =  IdentityContext.newBuilder();
+        IdentityContext.Builder identityContextBuilder = IdentityContext.newBuilder();
         identityContextBuilder.setIdentity(identityContext.getIdentity());
         identityContextBuilder.setType(identityContext.getIdentityType());