@casual-simulation/aux-records 3.2.13 → 3.2.14-alpha.7890390188

package/Utils.js

@@ -338,6 +338,9 @@ export function getStatusCode(response) {
         else if (response.errorCode === 'comId_already_taken') {
             return 409;
         }
+        else if (response.errorCode === 'permission_not_found') {
+            return 404;
+        }
         else {
             return 400;
         }
@@ -420,14 +423,50 @@ export function isActiveSubscription(status) {
     return status === 'active' || status === 'trialing';
 }
 /**
- * Gets the list of markers that should be used, or the default list if none are provided.
+ * Gets the list of root markers that should be used, or the default list if none are provided.
  * @param markers
  */
-export function getMarkersOrDefault(markers) {
+export function getRootMarkersOrDefault(markers) {
     if (markers === null || markers === undefined || markers.length <= 0) {
         return [PUBLIC_READ_MARKER];
     }
-    return markers;
+    return markers.map(getRootMarker);
+}
+/**
+ * Gets the root marker from the given marker.
+ * Markers have two parts, the root and the path: "root:path".
+ * The root is the first part of the marker, and contains the security name of the marker. That is, the name of the marker that is used to retrieve permissions for the marker.
+ * The path is the second part of the marker, and contains the path that the marker is for. That is, extra information that can be used to organize marker data.
+ * @param marker The marker that should be parsed.
+ */
+export function getRootMarker(marker) {
+    if (!marker) {
+        return marker;
+    }
+    const indexOfColon = marker.indexOf(':');
+    if (indexOfColon < 0) {
+        return marker;
+    }
+    return marker.substring(0, indexOfColon);
+}
+/**
+ * Gets the path marker from the given marker.
+ * Markers have two parts, the root and the path: "root:path".
+ * The root is the first part of the marker, and contains the security name of the marker. That is, the name of the marker that is used to retrieve permissions for the marker.
+ * The path is the second part of the marker, and contains the path that the marker is for. That is, extra information that can be used to organize marker data.
+ *
+ * Returns an empty string if the marker does not contain a path.
+ * @param marker The marker that should be parsed.
+ */
+export function getPathMarker(marker) {
+    if (!marker) {
+        return '';
+    }
+    const indexOfColon = marker.indexOf(':');
+    if (indexOfColon < 0) {
+        return '';
+    }
+    return marker.substring(indexOfColon + 1);
 }
 /**
  * Handles axios errors and ensures they get logged properly.

package/Utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"Utils.js","sourceRoot":"","sources":["Utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Utils.js","sourceRoot":"","sources":["Utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@casual-simulation/aux-records",
-    "version": "3.2.13",
+    "version": "3.2.14-alpha.7890390188",
     "description": "Helpers and managers used by the CasualOS records system.",
     "keywords": [],
     "author": "Casual Simulation, Inc.",
@@ -37,7 +37,7 @@
         "access": "public"
     },
     "dependencies": {
-        "@casual-simulation/aux-common": "^3.2.12",
+        "@casual-simulation/aux-common": "^3.2.14-alpha.7890390188",
         "@casual-simulation/crypto": "^3.2.7",
         "@casual-simulation/fast-json-stable-stringify": "^3.1.11",
         "@casual-simulation/rate-limit-redis": "^3.2.7",
@@ -54,5 +54,5 @@
         "yjs": "13.6.8",
         "zod": "3.22.4"
     },
-    "gitHead": "552756631484a984db430ca842834a1a08935f38"
+    "gitHead": "b5e23a196adfb6d14d836c939601261f87b5cf20"
 }

package/websockets/InstRecordsStore.d.ts

@@ -239,4 +239,25 @@ export interface ListInstsStoreFailure {
     errorCode: ServerError | 'record_not_found';
     errorMessage: string;
 }
+/**
+ * Gets the ID for an inst with the given origin.
+ * @param recordName The name of the record for the simulation.
+ * @param inst The name of the inst for the simulation.
+ */
+export declare function formatInstId(recordName: string | null, inst: string): string;
+/**
+ * Parses the given inst ID into the record name and inst name.
+ * @param id The ID of the inst.
+ */
+export declare function parseInstId(id: string): {
+    recordName: string | null;
+    inst: string;
+};
+/**
+ * Normalizes the given isnt ID.
+ * Insts can belong to a record, so inst IDs have to formatted like: "{recordName}/{instName}""
+ * In previous versions, insts were only referenced by their name. This function is able to normalize those IDs so that they can be parsed correctly.
+ * @param id The ID that should be normalized.
+ */
+export declare function normalizeInstId(id: string): string;
 //# sourceMappingURL=InstRecordsStore.d.ts.map

package/websockets/InstRecordsStore.js

@@ -1,2 +1,44 @@
-export {};
+/**
+ * Gets the ID for an inst with the given origin.
+ * @param recordName The name of the record for the simulation.
+ * @param inst The name of the inst for the simulation.
+ */
+export function formatInstId(recordName, inst) {
+    return `${recordName !== null && recordName !== void 0 ? recordName : ''}/${inst}`;
+}
+/**
+ * Parses the given inst ID into the record name and inst name.
+ * @param id The ID of the inst.
+ */
+export function parseInstId(id) {
+    if (!id) {
+        return null;
+    }
+    const indexOfFirstSlash = id.indexOf('/');
+    if (indexOfFirstSlash < 0) {
+        return null;
+    }
+    const recordName = id.substring(0, indexOfFirstSlash);
+    const inst = id.substring(indexOfFirstSlash + 1);
+    return {
+        recordName: recordName ? recordName : null,
+        inst,
+    };
+}
+/**
+ * Normalizes the given isnt ID.
+ * Insts can belong to a record, so inst IDs have to formatted like: "{recordName}/{instName}""
+ * In previous versions, insts were only referenced by their name. This function is able to normalize those IDs so that they can be parsed correctly.
+ * @param id The ID that should be normalized.
+ */
+export function normalizeInstId(id) {
+    if (!id) {
+        return null;
+    }
+    const indexOfFirstSlash = id.indexOf('/');
+    if (indexOfFirstSlash < 0) {
+        return '/' + id;
+    }
+    return id;
+}
 //# sourceMappingURL=InstRecordsStore.js.map

package/websockets/InstRecordsStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"InstRecordsStore.js","sourceRoot":"","sources":["InstRecordsStore.ts"],"names":[],"mappings":""}
+{"version":3,"file":"InstRecordsStore.js","sourceRoot":"","sources":["InstRecordsStore.ts"],"names":[],"mappings":"AA2UA;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,UAAyB,EAAE,IAAY;IAChE,OAAO,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,IAAI,IAAI,EAAE,CAAC;AACzC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,EAAU;IAIlC,IAAI,CAAC,EAAE,EAAE;QACL,OAAO,IAAI,CAAC;KACf;IACD,MAAM,iBAAiB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,iBAAiB,GAAG,CAAC,EAAE;QACvB,OAAO,IAAI,CAAC;KACf;IACD,MAAM,UAAU,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC;IACjD,OAAO;QACH,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI;QAC1C,IAAI;KACP,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,EAAU;IACtC,IAAI,CAAC,EAAE,EAAE;QACL,OAAO,IAAI,CAAC;KACf;IACD,MAAM,iBAAiB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,iBAAiB,GAAG,CAAC,EAAE;QACvB,OAAO,GAAG,GAAG,EAAE,CAAC;KACnB;IAED,OAAO,EAAE,CAAC;AACd,CAAC"}

package/websockets/WebsocketController.d.ts

@@ -5,10 +5,10 @@ import { DeviceConnection, WebsocketConnectionStore } from './WebsocketConnectio
 import { AddUpdatesMessage, LoginMessage, SendActionMessage, TimeSyncRequestMessage, UploadHttpHeaders, WatchBranchMessage, WebsocketErrorInfo, WebsocketEvent } from '@casual-simulation/aux-common/websockets/WebsocketEvents';
 import { ConnectionInfo } from '@casual-simulation/aux-common/common/ConnectionInfo';
 import { AuthController } from '../AuthController';
-import { InstRecordsStore, InstWithSubscriptionInfo, SaveInstFailure } from './InstRecordsStore';
+import { InstRecord, InstRecordsStore, InstWithSubscriptionInfo, SaveInstFailure } from './InstRecordsStore';
 import { TemporaryInstRecordsStore } from './TemporaryInstRecordsStore';
 import { DenialReason, ServerError, NotSupportedError } from '@casual-simulation/aux-common';
-import { AuthorizationContext, AuthorizeDenied, ListedInstItem, PolicyController } from '../PolicyController';
+import { AuthorizationContext, AuthorizeSubjectFailure, ConstructAuthorizationContextFailure, PolicyController } from '../PolicyController';
 import { ConfigurationStore } from '../ConfigurationStore';
 import { FeaturesConfiguration } from '../SubscriptionConfiguration';
 import { MetricsStore } from '../MetricsStore';
@@ -142,7 +142,7 @@ export interface GetOrCreateInstSuccess {
 }
 export interface GetOrCreateInstFailure {
     success: false;
-    errorCode: AuthorizeDenied['errorCode'] | SaveInstFailure['errorCode'];
+    errorCode: ConstructAuthorizationContextFailure['errorCode'] | AuthorizeSubjectFailure['errorCode'] | SaveInstFailure['errorCode'];
     errorMessage: string;
     reason?: DenialReason;
 }
@@ -153,19 +153,19 @@ export interface GetBranchDataSuccess {
 }
 export interface GetBranchDataFailure {
     success: false;
-    errorCode: ServerError | 'inst_not_found' | AuthorizeDenied['errorCode'] | GetOrCreateInstFailure['errorCode'];
+    errorCode: ServerError | 'inst_not_found' | ConstructAuthorizationContextFailure['errorCode'] | AuthorizeSubjectFailure['errorCode'] | GetOrCreateInstFailure['errorCode'];
     errorMessage: string;
     reason?: DenialReason;
 }
 export type ListInstsResult = ListInstsSuccess | ListInstsFailure;
 export interface ListInstsSuccess {
     success: true;
-    insts: ListedInstItem[];
+    insts: InstRecord[];
     totalCount: number;
 }
 export interface ListInstsFailure {
     success: false;
-    errorCode: ServerError | 'record_not_found' | NotSupportedError | AuthorizeDenied['errorCode'] | GetOrCreateInstFailure['errorCode'];
+    errorCode: ServerError | 'record_not_found' | NotSupportedError | ConstructAuthorizationContextFailure['errorCode'] | AuthorizeSubjectFailure['errorCode'] | GetOrCreateInstFailure['errorCode'];
     errorMessage: string;
     reason?: DenialReason;
 }
@@ -175,7 +175,7 @@ export interface EraseInstSuccess {
 }
 export interface EraseInstFailure {
     success: false;
-    errorCode: ServerError | 'inst_not_found' | NotSupportedError | AuthorizeDenied['errorCode'] | GetOrCreateInstFailure['errorCode'];
+    errorCode: ServerError | 'inst_not_found' | NotSupportedError | ConstructAuthorizationContextFailure['errorCode'] | AuthorizeSubjectFailure['errorCode'] | GetOrCreateInstFailure['errorCode'];
     errorMessage: string;
     reason?: DenialReason;
 }

package/websockets/WebsocketController.js

@@ -25,10 +25,9 @@ import { fromByteArray, toByteArray } from 'base64-js';
 import { applyUpdate, mergeUpdates } from 'yjs';
 import { WebsocketEventTypes, } from '@casual-simulation/aux-common/websockets/WebsocketEvents';
 import { sumBy } from 'lodash';
-import { PRIVATE_MARKER, } from '@casual-simulation/aux-common';
+import { PRIVATE_MARKER, ACCOUNT_MARKER, } from '@casual-simulation/aux-common';
 import { SplitInstRecordsStore } from './SplitInstRecordsStore';
 import { v4 as uuid } from 'uuid';
-import { returnAuthorizationResult, } from '../PolicyController';
 import { getSubscriptionFeatures, } from '../SubscriptionConfiguration';
 /**
  * Defines a class that is able to serve causal repos in realtime.
@@ -364,15 +363,16 @@ export class WebsocketController {
                         return;
                     }
                     else if (event.recordName) {
-                        const authorizeResult = yield this._policies.authorizeRequestUsingContext(instResult.context, {
-                            action: 'inst.updateData',
-                            inst: event.inst,
-                            recordKeyOrRecordName: event.recordName,
-                            resourceMarkers: instResult.inst.markers,
+                        const authorizeResult = yield this._policies.authorizeUserAndInstances(instResult.context, {
+                            resourceKind: 'inst',
+                            resourceId: event.inst,
+                            action: 'updateData',
                             userId: connection.userId,
+                            markers: instResult.inst.markers,
+                            instances: [],
                         });
-                        if (authorizeResult.allowed === false) {
-                            yield this.sendError(connectionId, -1, Object.assign(Object.assign({}, returnAuthorizationResult(authorizeResult)), { recordName: event.recordName, inst: event.inst, branch: event.branch }));
+                        if (authorizeResult.success === false) {
+                            yield this.sendError(connectionId, -1, Object.assign(Object.assign({}, authorizeResult), { recordName: event.recordName, inst: event.inst, branch: event.branch }));
                             return;
                         }
                     }
@@ -412,28 +412,60 @@ export class WebsocketController {
                             yield this.sendError(connectionId, -1, Object.assign(Object.assign({}, contextResult), { recordName: event.recordName, inst: event.inst, branch: event.branch }));
                             return;
                         }
-                        const authorizeReadResult = yield this._policies.authorizeRequestUsingContext(contextResult.context, {
-                            action: 'inst.read',
-                            inst: event.inst,
-                            recordKeyOrRecordName: event.recordName,
-                            resourceMarkers: branch.linkedInst.markers,
+                        const authorizeResult = yield this._policies.authorizeUserAndInstancesForResources(contextResult.context, {
                             userId: connection.userId,
+                            instances: [],
+                            resources: [
+                                {
+                                    resourceKind: 'inst',
+                                    resourceId: event.inst,
+                                    action: 'read',
+                                    markers: branch.linkedInst.markers,
+                                },
+                                {
+                                    resourceKind: 'inst',
+                                    resourceId: event.inst,
+                                    action: 'updateData',
+                                    markers: branch.linkedInst.markers,
+                                },
+                            ],
                         });
-                        if (authorizeReadResult.allowed === false) {
-                            yield this.sendError(connectionId, -1, Object.assign(Object.assign({}, returnAuthorizationResult(authorizeReadResult)), { recordName: event.recordName, inst: event.inst, branch: event.branch }));
-                            return;
-                        }
-                        const authorizeUpdateResult = yield this._policies.authorizeRequestUsingContext(contextResult.context, {
-                            action: 'inst.updateData',
-                            inst: event.inst,
-                            recordKeyOrRecordName: event.recordName,
-                            resourceMarkers: branch.linkedInst.markers,
-                            userId: connection.userId,
-                        });
-                        if (authorizeUpdateResult.allowed === false) {
-                            yield this.sendError(connectionId, -1, Object.assign(Object.assign({}, returnAuthorizationResult(authorizeUpdateResult)), { recordName: event.recordName, inst: event.inst, branch: event.branch }));
+                        // const authorizeReadResult =
+                        //     await this._policies.authorizeRequestUsingContext(
+                        //         contextResult.context,
+                        //         {
+                        //             action: 'inst.read',
+                        //             inst: event.inst,
+                        //             recordKeyOrRecordName: event.recordName,
+                        //             resourceMarkers: branch.linkedInst.markers,
+                        //             userId: connection.userId,
+                        //         }
+                        //     );
+                        if (authorizeResult.success === false) {
+                            yield this.sendError(connectionId, -1, Object.assign(Object.assign({}, authorizeResult), { recordName: event.recordName, inst: event.inst, branch: event.branch }));
                             return;
                         }
+                        // const authorizeUpdateResult =
+                        //     await this._policies.authorizeUserAndInstances(
+                        //         contextResult.context,
+                        //         {
+                        //             resourceKind: 'inst',
+                        //             resourceId: event.inst,
+                        //             action: 'updateData',
+                        //             markers: branch.linkedInst.markers,
+                        //             userId: connection.userId,
+                        //             instances: [],
+                        //         }
+                        //     );
+                        // if (authorizeUpdateResult.success === false) {
+                        //     await this.sendError(connectionId, -1, {
+                        //         ...authorizeUpdateResult,
+                        //         recordName: event.recordName,
+                        //         inst: event.inst,
+                        //         branch: event.branch,
+                        //     });
+                        //     return;
+                        // }
                         yield this._connectionStore.saveAuthorizedInst(connectionId, event.recordName, event.inst, 'updateData');
                     }
                 }
@@ -581,15 +613,16 @@ export class WebsocketController {
                     });
                     return;
                 }
-                const authorizeResult = yield this._policies.authorizeRequestUsingContext(instResult.context, {
-                    action: 'inst.sendAction',
-                    recordKeyOrRecordName: event.recordName,
-                    inst: event.inst,
-                    resourceMarkers: instResult.inst.markers,
+                const authorizeResult = yield this._policies.authorizeUserAndInstances(instResult.context, {
+                    resourceKind: 'inst',
+                    resourceId: event.inst,
+                    action: 'sendAction',
+                    markers: instResult.inst.markers,
                     userId: currentConnection.userId,
+                    instances: [],
                 });
-                if (authorizeResult.allowed === false) {
-                    yield this.sendError(connectionId, -1, returnAuthorizationResult(authorizeResult));
+                if (authorizeResult.success === false) {
+                    yield this.sendError(connectionId, -1, authorizeResult);
                     return;
                 }
             }
@@ -747,10 +780,6 @@ export class WebsocketController {
                         totalCount: 0,
                     };
                 }
-                const instsResult = yield this._instStore.listInstsByRecord(recordName, startingInst);
-                if (!instsResult.success) {
-                    return instsResult;
-                }
                 const contextResult = yield this._policies.constructAuthorizationContext({
                     recordKeyOrRecordName: recordName,
                     userId,
@@ -759,17 +788,15 @@ export class WebsocketController {
                     return contextResult;
                 }
                 const context = contextResult.context;
-                const authorizeResult = yield this._policies.authorizeRequestUsingContext(context, {
-                    action: 'inst.list',
-                    recordKeyOrRecordName: recordName,
+                const authorizeResult = yield this._policies.authorizeUserAndInstances(context, {
+                    resourceKind: 'inst',
+                    action: 'list',
                     userId,
-                    insts: instsResult.insts.map((i) => ({
-                        inst: i.inst,
-                        markers: i.markers,
-                    })),
+                    markers: [PRIVATE_MARKER],
+                    instances: [],
                 });
-                if (authorizeResult.allowed === false) {
-                    return returnAuthorizationResult(authorizeResult);
+                if (authorizeResult.success === false) {
+                    return authorizeResult;
                 }
                 const metricsResult = yield this._metrics.getSubscriptionInstMetricsByRecordName(recordName);
                 const config = yield this._config.getSubscriptionConfiguration();
@@ -781,9 +808,13 @@ export class WebsocketController {
                         errorMessage: 'Insts are not allowed for this subscription.',
                     };
                 }
+                const instsResult = yield this._instStore.listInstsByRecord(recordName, startingInst);
+                if (!instsResult.success) {
+                    return instsResult;
+                }
                 return {
                     success: true,
-                    insts: authorizeResult.allowedInstItems,
+                    insts: instsResult.insts,
                     totalCount: instsResult.totalCount,
                 };
             }
@@ -874,15 +905,16 @@ export class WebsocketController {
                         success: true,
                     };
                 }
-                const authResult = yield this._policies.authorizeRequestUsingContext(context.context, {
-                    action: 'inst.delete',
-                    recordKeyOrRecordName: recordName,
-                    inst: inst,
+                const authResult = yield this._policies.authorizeUserAndInstances(context.context, {
+                    resourceKind: 'inst',
+                    resourceId: inst,
+                    action: 'delete',
+                    markers: storedInst.markers,
                     userId,
-                    resourceMarkers: storedInst.markers,
+                    instances: [],
                 });
-                if (authResult.allowed === false) {
-                    return returnAuthorizationResult(authResult);
+                if (authResult.success === false) {
+                    return authResult;
                 }
                 yield this._instStore.deleteInst(recordName, inst);
                 return {
@@ -1113,28 +1145,66 @@ export class WebsocketController {
                         }
                         context = contextResult.context;
                     }
-                    const authorizeCreateResult = yield this._policies.authorizeRequestUsingContext(context, {
-                        action: 'inst.create',
-                        recordKeyOrRecordName: recordName,
-                        inst: instName,
-                        userId,
-                        resourceMarkers: [PRIVATE_MARKER],
+                    const authorizationResult = yield this._policies.authorizeUserAndInstancesForResources(context, {
+                        userId: userId,
+                        instances: [],
+                        resources: [
+                            {
+                                resourceKind: 'inst',
+                                resourceId: instName,
+                                action: 'create',
+                                markers: [PRIVATE_MARKER],
+                            },
+                            {
+                                resourceKind: 'marker',
+                                resourceId: PRIVATE_MARKER,
+                                action: 'assign',
+                                markers: [ACCOUNT_MARKER],
+                            },
+                            {
+                                resourceKind: 'inst',
+                                resourceId: instName,
+                                action: 'read',
+                                markers: [PRIVATE_MARKER],
+                            },
+                        ],
                     });
-                    if (authorizeCreateResult.allowed === false) {
-                        console.log('[WebsocketController] Unable to authorize inst creation.', authorizeCreateResult);
-                        return returnAuthorizationResult(authorizeCreateResult);
-                    }
-                    const authorizeReadResult = yield this._policies.authorizeRequestUsingContext(context, {
-                        action: 'inst.read',
-                        recordKeyOrRecordName: recordName,
-                        inst: instName,
-                        userId,
-                        resourceMarkers: [PRIVATE_MARKER],
-                    });
-                    if (authorizeReadResult.allowed === false) {
-                        console.log('[WebsocketController] Unable to authorize inst creation.', authorizeReadResult);
-                        return returnAuthorizationResult(authorizeReadResult);
+                    if (authorizationResult.success === false) {
+                        console.log('[WebsocketController] Unable to authorize inst creation.', authorizationResult);
+                        return authorizationResult;
                     }
+                    // const authorizeCreateResult =
+                    //     await this._policies.authorizeUserAndInstances(context, {
+                    //         resourceKind: 'inst',
+                    //         resourceId: instName,
+                    //         action: 'create',
+                    //         markers: [PRIVATE_MARKER],
+                    //         userId,
+                    //         instances: [],
+                    //     });
+                    // if (authorizeCreateResult.success === false) {
+                    //     console.log(
+                    //         '[WebsocketController] Unable to authorize inst creation.',
+                    //         authorizeCreateResult
+                    //     );
+                    //     return authorizeCreateResult;
+                    // }
+                    // const authorizeReadResult =
+                    //     await this._policies.authorizeUserAndInstances(context, {
+                    //         resourceKind: 'inst',
+                    //         resourceId: instName,
+                    //         action: 'read',
+                    //         markers: [PRIVATE_MARKER],
+                    //         userId,
+                    //         instances: [],
+                    //     });
+                    // if (authorizeReadResult.success === false) {
+                    //     console.log(
+                    //         '[WebsocketController] Unable to authorize inst creation.',
+                    //         authorizeReadResult
+                    //     );
+                    //     return authorizeReadResult;
+                    // }
                     const instMetrics = yield this._metrics.getSubscriptionInstMetricsByRecordName(recordName);
                     features = getSubscriptionFeatures(config, instMetrics.subscriptionStatus, instMetrics.subscriptionId, instMetrics.subscriptionType);
                     if (!features.insts.allowed) {
@@ -1240,16 +1310,17 @@ export class WebsocketController {
                         }
                         context = contextResult.context;
                     }
-                    const authorizeResult = yield this._policies.authorizeRequestUsingContext(context, {
-                        action: 'inst.read',
-                        recordKeyOrRecordName: recordName,
-                        inst: instName,
+                    const authorizeResult = yield this._policies.authorizeUserAndInstances(context, {
+                        resourceKind: 'inst',
+                        resourceId: instName,
+                        action: 'read',
+                        markers: savedInst.markers,
                         userId,
-                        resourceMarkers: savedInst.markers,
+                        instances: [],
                     });
-                    if (authorizeResult.allowed === false) {
+                    if (authorizeResult.success === false) {
                         console.log('[WebsocketController] Unable to authorize inst read.', authorizeResult);
-                        return returnAuthorizationResult(authorizeResult);
+                        return authorizeResult;
                     }
                 }
                 return {