Update Authorizer.Is to return IsResponse

README.md

@@ -451,7 +451,7 @@ authClient
 ### Methods
 ```typescript
 // Is
-// (method) Authorizer.Is(params: IsRequest, options?: CallOptions): Promise<boolean>
+// (method) Authorizer.Is(params: IsRequest, options?: CallOptions): Promise<IsResponse>
 await authClient
   .Is({
     identityContext: {

src/authorizer/index.ts

@@ -3,15 +3,27 @@ import { readFileSync } from "fs";
 import {
   Authorizer as AuthorizerClient,
   DecisionTreeRequestSchema,
+  file_aserto_authorizer_v2_authorizer,
   IsRequestSchema,
+  IsResponse,
   QueryRequestSchema,
 } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/authorizer_pb";
 import {
   DecisionTreeRequest as DecisionTreeRequest$,
   IsRequest as IsRequest$,
   QueryRequest as QueryRequest$,
 } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/authorizer_pb";
-import { create, JsonObject } from "@bufbuild/protobuf";
+import {
+  create,
+  DescEnum,
+  DescExtension,
+  DescFile,
+  DescMessage,
+  DescService,
+  JsonObject,
+  Registry,
+} from "@bufbuild/protobuf";
+import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
 import {
   CallOptions,
   Client,
@@ -21,15 +33,30 @@ import {
 import { createGrpcTransport } from "@connectrpc/connect-node";
 
 import { handleError, setHeader, traceMessage } from "../util/connect";
+import { TopazRegistry } from "../util/serializer";
 import {
   DecisionTreeRequest,
+  file_aserto_authorizer_v2_api_decision_logs,
+  file_aserto_authorizer_v2_api_identity_context,
+  file_aserto_authorizer_v2_api_module,
+  file_aserto_authorizer_v2_api_policy_context,
+  file_aserto_authorizer_v2_api_policy_instance,
   IsRequest,
   ListPoliciesRequest,
   Module,
   QueryRequest,
 } from "./types";
 
 type AuthorizerConfig = {
+  additionalDescriptors?: (
+    | DescEnum
+    | DescExtension
+    | DescFile
+    | DescMessage
+    | DescService
+    | Registry
+  )[];
+} & {
   authorizerServiceUrl?: string;
   tenantId?: string;
   authorizerApiKey?: string;
@@ -47,6 +74,7 @@ type Path = {
 };
 export class Authorizer {
   AuthClient: Client<typeof AuthorizerClient>;
+  registry: TopazRegistry;
   constructor(config: AuthorizerConfig) {
     const baseServiceHeaders: Interceptor = (next) => async (req) => {
       config.token && setHeader(req, "authorization", `${config.token}`);
@@ -79,9 +107,19 @@ export class Authorizer {
     });
 
     this.AuthClient = createClient(AuthorizerClient, baseGrpcTransport);
+    this.registry = new TopazRegistry(
+      file_aserto_authorizer_v2_api_decision_logs,
+      file_aserto_authorizer_v2_api_identity_context,
+      file_aserto_authorizer_v2_api_module,
+      file_aserto_authorizer_v2_api_policy_instance,
+      file_aserto_authorizer_v2_api_policy_context,
+      file_aserto_authorizer_v2_authorizer,
+      file_google_protobuf_timestamp,
+      ...(config.additionalDescriptors || []),
+    );
   }
 
-  async Is(params: IsRequest, options?: CallOptions): Promise<boolean> {
+  async Is(params: IsRequest, options?: CallOptions): Promise<IsResponse> {
     try {
       const request: IsRequest$ = create(IsRequestSchema, {
         ...params,
@@ -90,10 +128,9 @@ export class Authorizer {
           instanceLabel: params.policyInstance?.name,
         },
       });
-      const response = await this.AuthClient.is(request, options);
 
-      const allowed = response.decisions[0]?.is;
-      return !!allowed;
+      const response = await this.AuthClient.is(request, options);
+      return this.registry.serializeResponse(response);
     } catch (error) {
       throw handleError(error, "Is");
     }

src/authorizer/types.ts

@@ -1,4 +1,5 @@
 import { IdentityContext as IdentityContext$ } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/identity_context_pb";
+import { Module as Module$ } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/module_pb";
 import { PolicyContext as PolicyContext$ } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/policy_context_pb";
 import { PolicyInstance as PolicyInstance$ } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/policy_instance_pb";
 import {
@@ -20,12 +21,12 @@ export {
   DecisionPolicySchema,
   DecisionUser,
   DecisionUserSchema,
+  file_aserto_authorizer_v2_api_decision_logs,
 } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/decision_logs_pb";
 export * from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/identity_context_pb";
 export * from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/module_pb";
 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";
-import { Module as Module$ } from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/api/module_pb";
 export * from "@aserto/node-authorizer/src/gen/cjs/aserto/authorizer/v2/authorizer_pb";
 
 export type DecisionTreeRequest = Omit<

src/directory/index.ts

@@ -3,13 +3,16 @@ import { readFileSync } from "fs";
 import {
   Exporter,
   ExportRequestSchema,
+  file_aserto_directory_exporter_v3_exporter,
 } from "@aserto/node-directory/src/gen/cjs/aserto/directory/exporter/v3/exporter_pb";
 import {
+  file_aserto_directory_importer_v3_importer,
   Importer,
   ImportRequest,
   ImportRequestSchema,
 } from "@aserto/node-directory/src/gen/cjs/aserto/directory/importer/v3/importer_pb";
 import {
+  file_aserto_directory_model_v3_model,
   MetadataSchema,
   Model,
   SetManifestRequestSchema,
@@ -22,6 +25,7 @@ import {
 import {
   CheckRequestSchema,
   ChecksRequestSchema,
+  file_aserto_directory_reader_v3_reader,
   GetGraphRequestSchema,
   GetObjectManyRequestSchema,
   GetObjectRequestSchema,
@@ -32,11 +36,13 @@ import {
 import {
   DeleteObjectRequestSchema,
   DeleteRelationRequestSchema,
+  file_aserto_directory_writer_v3_writer,
   SetObjectRequestSchema,
   SetRelationRequestSchema,
   Writer,
 } from "@aserto/node-directory/src/gen/cjs/aserto/directory/writer/v3/writer_pb";
 import { create, JsonObject, Message } from "@bufbuild/protobuf";
+import { file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
 import {
   CallOptions,
   Client,
@@ -53,14 +59,14 @@ import {
   setHeader,
   traceMessage,
 } from "../util/connect";
+import { TopazRegistry } from "../util/serializer";
 import {
   nullExporterProxy,
   nullImporterProxy,
   nullModelProxy,
   nullReaderProxy,
   nullWriterProxy,
 } from "./null";
-import { DsRegistry } from "./serializer";
 import {
   CheckRequest,
   CheckResponse,
@@ -74,6 +80,7 @@ import {
   DirectoryConfig,
   ExportOptions,
   ExportResponse,
+  file_aserto_directory_common_v3_common,
   GetGraphRequest,
   GetGraphResponse,
   GetManifestRequest,
@@ -137,7 +144,7 @@ export class Directory {
   ImporterClient: Client<typeof Importer>;
   ExporterClient: Client<typeof Exporter>;
   ModelClient: Client<typeof Model>;
-  registry: DsRegistry;
+  registry: TopazRegistry;
 
   CreateTransport: (
     config: ServiceConfig | undefined,
@@ -282,7 +289,16 @@ export class Directory {
       : nullModelProxy();
 
     this.CreateTransport = createTransport;
-    this.registry = new DsRegistry(...(config.additionalDescriptors || []));
+    this.registry = new TopazRegistry(
+      file_aserto_directory_common_v3_common,
+      file_aserto_directory_reader_v3_reader,
+      file_aserto_directory_writer_v3_writer,
+      file_aserto_directory_exporter_v3_exporter,
+      file_aserto_directory_importer_v3_importer,
+      file_aserto_directory_model_v3_model,
+      file_google_protobuf_timestamp,
+      ...(config.additionalDescriptors || []),
+    );
   }
 
   async check(
@@ -653,7 +669,15 @@ export async function readAsyncIterable<T>(
 export async function serializeAsyncIterable<T extends Message>(
   gen: AsyncIterable<T>,
 ): Promise<T[]> {
-  const registry = new DsRegistry();
+  const registry = new TopazRegistry(
+    file_aserto_directory_common_v3_common,
+    file_aserto_directory_reader_v3_reader,
+    file_aserto_directory_writer_v3_writer,
+    file_aserto_directory_exporter_v3_exporter,
+    file_aserto_directory_importer_v3_importer,
+    file_aserto_directory_model_v3_model,
+    file_google_protobuf_timestamp,
+  );
   const out: T[] = [];
   for await (const x of gen) {
     out.push(registry.serializeResponse<T>(x));

src/index.ts

@@ -6,7 +6,6 @@ import {
   readAsyncIterable,
   serializeAsyncIterable,
 } from "./directory";
-import { DsRegistry } from "./directory/serializer";
 import { Opcode } from "./directory/types";
 import { handleError } from "./util/connect";
 import {
@@ -15,12 +14,12 @@ import {
   LOG_LEVELS,
   setLogEventEmitter,
 } from "./util/log";
+import { TopazRegistry } from "./util/serializer";
 
 export {
   Authorizer,
   createImportRequest,
   Directory,
-  DsRegistry,
   getLogEventEmitter,
   handleError,
   ImportMsgCase,
@@ -30,6 +29,7 @@ export {
   readAsyncIterable,
   serializeAsyncIterable,
   setLogEventEmitter,
+  TopazRegistry,
 };
 
 export * from "./authorizer/types";

src/util/serializer.ts

@@ -0,0 +1,49 @@
+import {
+  createRegistry,
+  DescEnum,
+  DescExtension,
+  DescFile,
+  DescMessage,
+  DescService,
+  Message,
+  MessageShape,
+  Registry,
+  toJson,
+} from "@bufbuild/protobuf";
+import { GenMessage } from "@bufbuild/protobuf/codegenv1";
+
+import { InvalidSchemaError } from "../util/errors";
+
+class TopazRegistry {
+  registry: Registry;
+
+  constructor(
+    ...input: (
+      | DescEnum
+      | DescExtension
+      | DescFile
+      | DescMessage
+      | DescService
+      | Registry
+    )[]
+  ) {
+    this.registry = createRegistry(...input);
+  }
+
+  serializeResponse<T extends Message>(
+    response: MessageShape<GenMessage<T>>,
+  ): T {
+    const schema = this.registry.getMessage(response.$typeName);
+    if (!schema) {
+      throw new InvalidSchemaError(
+        `schema not registered for type: [${response.$typeName}]`,
+      );
+    }
+    return toJson(schema, response, {
+      alwaysEmitImplicit: true,
+      registry: this.registry,
+    }) as unknown as T;
+  }
+}
+
+export { TopazRegistry };