update authorizer

Author: gimmyxd

__tests__/authorizer/index.test.ts

@@ -391,7 +391,6 @@ describe("ListPolicies", () => {
     const result = await authorizer.ListPolicies({});
     expect(result).toEqual([
       {
-        $typeName: "aserto.authorizer.v2.api.Module",
         id: "1",
         packagePath: "a.b.c",
       },

__tests__/integration/index.test.ts

@@ -1733,7 +1733,7 @@ types:
           policyContext: policyContext(),
         });
 
-        expect(response).toEqual({
+        const expectedResult = {
           path: {
             "rebac.check": {
               allowed: false,
@@ -1745,7 +1745,102 @@ types:
             "todoApp.PUT.todos.__id": { allowed: false },
           },
           pathRoot: "",
+        };
+
+        expect(response).toEqual(expectedResult);
+        expect(JSON.parse(JSON.stringify(response))).toEqual(expectedResult);
+      });
+    });
+
+    describe("Is", () => {
+      it("returns the correct data structure", async () => {
+        const response = await authorizerClient.Is({
+          identityContext: await AnonymousIdentityMapper(),
+          policyInstance: policyInstance("todo", "todo"),
+          policyContext: policyContext("todoApp.GET.todos"),
+        });
+
+        const expectedResult = true;
+
+        expect(response).toEqual(expectedResult);
+        expect(JSON.parse(JSON.stringify(response))).toEqual(expectedResult);
+      });
+    });
+
+    describe("Query", () => {
+      it("returns the correct data structure", async () => {
+        const response = await authorizerClient.Query({
+          query: "x=data",
+          input: '{"foo": "bar"}',
+        });
+
+        const expectedResult = {
+          result: [
+            {
+              bindings: {
+                x: {
+                  rebac: { check: { allowed: false } },
+                  todoApp: {
+                    DELETE: { todos: { __id: { allowed: false } } },
+                    GET: {
+                      todos: { allowed: true },
+                      users: { __userID: { allowed: true } },
+                    },
+                    POST: { todos: { allowed: false } },
+                    PUT: { todos: { __id: { allowed: false } } },
+                    common: {},
+                  },
+                },
+              },
+              expressions: [
+                { location: { col: 1, row: 1 }, text: "x=data", value: true },
+              ],
+            },
+          ],
+        };
+
+        expect(response).toEqual(expectedResult);
+        expect(JSON.parse(JSON.stringify(response))).toEqual(expectedResult);
+      });
+    });
+
+    describe("ListPolicies", () => {
+      it("returns the correct data structure", async () => {
+        const response = await authorizerClient.ListPolicies({
+          policyInstance: {
+            name: "todo",
+          },
+          fieldMask: {
+            paths: ["id"],
+          },
         });
+
+        const expectedResult = [
+          {
+            id: "todo/github/workspace/content/src/policies/todoApp.DELETE.todos.__id.rego",
+          },
+          {
+            id: "todo/github/workspace/content/src/policies/todoApp.GET.todos.rego",
+          },
+          {
+            id: "todo/github/workspace/content/src/policies/todoApp.GET.users.__userID.rego",
+          },
+          {
+            id: "todo/github/workspace/content/src/policies/todoApp.POST.todos.rego",
+          },
+          {
+            id: "todo/github/workspace/content/src/policies/todoApp.PUT.todos.__id.rego",
+          },
+          {
+            id: "todo/github/workspace/content/src/policies/todoApp.common.rego",
+          },
+          { id: "todo/github/workspace/content/src/policies/rebac.check.rego" },
+        ];
+
+        expect(response).toEqual(expect.arrayContaining(expectedResult));
+        expect(JSON.parse(JSON.stringify(response))).toEqual(
+          expect.arrayContaining(expectedResult),
+        );
       });
     });
   });

lib/authorizer/index.ts

@@ -1,5 +1,4 @@
 import { readFileSync } from "fs";
-import { Module } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/module_pb";
 import {
   Authorizer as AuthorizerClient,
   DecisionTreeRequestSchema,
@@ -26,6 +25,7 @@ import {
   DecisionTreeRequest,
   IsRequest,
   ListPoliciesRequest,
+  Module,
   QueryRequest,
 } from "./types";
 
@@ -151,7 +151,10 @@ export class Authorizer {
     try {
       const response = await this.AuthClient.listPolicies(params, options);
 
-      return response.result;
+      return response.result.map((res) => {
+        const { $typeName: _t, ...result } = res;
+        return result;
+      });
     } catch (error) {
       throw handleError(error, "ListPolicies");
     }

lib/authorizer/types.ts

@@ -8,6 +8,7 @@ import {
   QueryOptions as QueryOptions$,
   QueryRequest as QueryRequest$,
 } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/authorizer_pb";
+import { FieldMask as FieldMask$ } from "@bufbuild/protobuf/wkt";
 
 import { Optional } from "../util/types";
 
@@ -16,6 +17,7 @@ export * from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/iden
 export * from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/policy_context_pb";
 export * from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/policy_instance_pb";
 export * from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/module_pb";
+import { Module as Module$ } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/module_pb";
 export {
   Decision as DecisionLog,
   DecisionSchema as DecisionLogSchema,
@@ -68,4 +70,13 @@ export type DecisionTreeRequest = Omit<
   identityContext?: IdentityContext;
 };
 
-export type ListPoliciesRequest = Omit<ListPoliciesRequest$, "$typeName">;
+export type FieldMask = Omit<FieldMask$, "$typeName">;
+export type ListPoliciesRequest = Omit<
+  ListPoliciesRequest$,
+  "$typeName" | "fieldMask" | "policyInstance"
+> & {
+  fieldMask?: FieldMask;
+  policyInstance?: PolicyInstance;
+};
+
+export type Module = Omit<Module$, "$typeName">;