Add warrant object literal

package.json

@@ -35,13 +35,13 @@
         "axios": "^0.21.2"
     },
     "devDependencies": {
-        "@warrantdev/warrant-node": "^3.0.0",
         "clean-webpack-plugin": "^4.0.0-alpha.0",
         "mocha": "^10.2.0",
         "ts-loader": "^9.2.3",
         "typescript": "^4.3.4",
         "webpack": "^5.41.1",
         "webpack-cli": "^4.7.2",
-        "xmlhttprequest": "^1.8.0"
+        "xmlhttprequest": "^1.8.0",
+        "@warrantdev/warrant-node": "^3.2.0"
     }
 }

src/WarrantClient.ts

@@ -10,6 +10,7 @@ import Check, {
 } from "./types/Check";
 import Permission from "./types/Permission";
 import ApiClient from "./HttpClient";
+import { isWarrantObject } from "./types/WarrantObject";
 
 export default class WarrantClient {
     private readonly config: Config;
@@ -29,8 +30,8 @@ export default class WarrantClient {
             data: {
                 op: CheckOp.AnyOf,
                 warrants: [{
-                    objectType: check.object.getObjectType(),
-                    objectId: check.object.getObjectId(),
+                    objectType: isWarrantObject(check.object) ? check.object.getObjectType() : check.object.objectType,
+                    objectId: isWarrantObject(check.object) ? check.object.getObjectId() : check.object.objectId,
                     relation: check.relation,
                     context: check.context,
                 }],
@@ -47,8 +48,8 @@ export default class WarrantClient {
             data: {
                 op: check.op,
                 warrants: check.warrants.map((warrant: CheckWarrant) => ({
-                    objectType: warrant.object.getObjectType(),
-                    objectId: warrant.object.getObjectId(),
+                    objectType: isWarrantObject(warrant.object) ? warrant.object.getObjectType() : warrant.object.objectType,
+                    objectId: isWarrantObject(warrant.object) ? warrant.object.getObjectId() : warrant.object.objectId,
                     relation: warrant.relation,
                     context: warrant.context,
                 })),

src/types/Check.ts

@@ -1,13 +1,13 @@
 import Context from "./Context";
-import WarrantObject from "./WarrantObject";
+import WarrantObject, { WarrantObjectLiteral } from "./WarrantObject";
 
 export enum CheckOp {
     AllOf = "allOf",
     AnyOf = "anyOf",
 }
 
 export interface CheckWarrant {
-    object: WarrantObject;
+    object: WarrantObject | WarrantObjectLiteral;
     relation: string;
     context?: Context;
 }

src/types/WarrantObject.ts

@@ -2,3 +2,12 @@ export default interface WarrantObject {
     getObjectType(): string;
     getObjectId(): string;
 }
+
+export interface WarrantObjectLiteral {
+    objectType: string;
+    objectId: string;
+}
+
+export function isWarrantObject(object: any): object is WarrantObject {
+    return object.getObjectType !== undefined && object.getObjectId !== undefined;
+}

test/LiveTest.spec.js

@@ -40,14 +40,20 @@ describe.skip('Live Test', function () {
 
     it('check', async function () {
         let authorized = await this.warrant.check({
-            object: this.role,
+            object: {
+                objectType: this.role.getObjectType(),
+                objectId: this.role.roleId,
+            },
             relation: "member",
             subject: this.user,
         });
         assert(authorized);
 
         authorized = await this.warrant.check({
-            object: this.role,
+            object: {
+                objectType: this.role.getObjectType(),
+                objectId: this.role.roleId,
+            },
             relation: "owner",
             subject: this.user,
         });