Make ResourcesHost sync (#3056)

Author: CarsonF

src/components/authorization/policy/executor/policy-dumper.ts

@@ -46,7 +46,7 @@ export class PolicyDumper {
     const book = xlsx.utils.book_new();
 
     const chalk = new Chalk({ level: 0 });
-    const resources = await this.selectResources();
+    const resources = this.selectResources();
     for (const role of Role) {
       const dumped = resources.flatMap((res) =>
         this.dumpRes(role, res, { props: true }),
@@ -74,7 +74,7 @@ export class PolicyDumper {
     resourcesIn: Many<ResourceLike & string>,
   ) {
     const roles = search(rolesIn, [...Role], 'role');
-    const map = await this.resources.getEnhancedMap();
+    const map = this.resources.getEnhancedMap();
     const resources = searchResources(resourcesIn, map);
 
     const data = roles.flatMap((role) =>
@@ -140,10 +140,10 @@ export class PolicyDumper {
     console.log(table.toString());
   }
 
-  private async selectResources(...filtered: AnyResource[]) {
+  private selectResources(...filtered: AnyResource[]) {
     const selectedResources = filtered.length
       ? filtered
-      : Object.values<AnyResource>(await this.resources.getEnhancedMap());
+      : Object.values<AnyResource>(this.resources.getEnhancedMap());
     return sortBy(selectedResources, (r) => r.name);
   }
 

src/components/authorization/policy/granters.factory.ts

@@ -39,7 +39,7 @@ export class GrantersFactory {
       ),
     );
 
-    const ResourceMap = await this.resourcesHost.getEnhancedMap();
+    const ResourceMap = this.resourcesHost.getEnhancedMap();
 
     const resGranter: ResourcesGranter = mapValues(
       ResourceMap,

src/components/authorization/policy/policy.factory.ts

@@ -108,11 +108,11 @@ export class PolicyFactory implements OnModuleInit {
       }
     }
 
-    await this.defaultInterfacesFromImplementationsIntersection(grants);
-    await this.defaultImplementationsFromInterfaces(grants);
-    await this.defaultRelationEdgesToResourceLevel(grants);
+    this.defaultInterfacesFromImplementationsIntersection(grants);
+    this.defaultImplementationsFromInterfaces(grants);
+    this.defaultRelationEdgesToResourceLevel(grants);
 
-    const powers = await this.determinePowers(grants);
+    const powers = this.determinePowers(grants);
 
     const name = startCase(discoveredClass.name.replace(/Policy$/, ''));
     const policy: Policy = { name, roles, grants, powers };
@@ -125,17 +125,13 @@ export class PolicyFactory implements OnModuleInit {
    * Declare permissions of missing interfaces based on the intersection of
    * the permissions of its implementations
    */
-  private async defaultInterfacesFromImplementationsIntersection(
+  private defaultInterfacesFromImplementationsIntersection(
     grantMap: WritableGrants,
   ) {
     const interfaceCandidates = new Set(
-      (
-        await Promise.all(
-          [...grantMap.keys()].map((res) =>
-            this.resourcesHost.getInterfaces(res),
-          ),
-        )
-      ).flat(),
+      [...grantMap.keys()]
+        .map((res) => this.resourcesHost.getInterfaces(res))
+        .flat(),
     );
 
     const allKeysOf = (list: Array<object | undefined>) =>
@@ -156,7 +152,7 @@ export class PolicyFactory implements OnModuleInit {
         continue;
       }
 
-      const impls = await this.resourcesHost.getImplementations(interfaceRes);
+      const impls = this.resourcesHost.getImplementations(interfaceRes);
 
       // Skip if policy doesn't specify all implementations of the interface
       if (!(impls.length > 0 && impls.every((impl) => grantMap.has(impl)))) {
@@ -213,18 +209,18 @@ export class PolicyFactory implements OnModuleInit {
     }
   }
 
-  private async defaultImplementationsFromInterfaces(grants: WritableGrants) {
+  private defaultImplementationsFromInterfaces(grants: WritableGrants) {
     for (const resource of grants.keys()) {
-      const impls = await this.resourcesHost.getImplementations(resource);
+      const impls = this.resourcesHost.getImplementations(resource);
       for (const impl of impls) {
         if (grants.has(impl)) {
           continue;
         }
         // If policy doesn't specify this implementation then use most specific
         // interface given.
-        const interfaceToApply = (
-          await this.resourcesHost.getInterfaces(impl)
-        ).find((i) => grants.has(i));
+        const interfaceToApply = this.resourcesHost
+          .getInterfaces(impl)
+          .find((i) => grants.has(i));
         const interfacePerms = interfaceToApply && grants.get(interfaceToApply);
         if (!interfacePerms) {
           // Safety check, but this shouldn't ever happen, since we only got
@@ -236,7 +232,7 @@ export class PolicyFactory implements OnModuleInit {
     }
   }
 
-  private async defaultRelationEdgesToResourceLevel(grants: WritableGrants) {
+  private defaultRelationEdgesToResourceLevel(grants: WritableGrants) {
     for (const [resource, { childRelations }] of grants.entries()) {
       for (const rel of resource.relations.values()) {
         const type = rel.resource;
@@ -297,7 +293,7 @@ export class PolicyFactory implements OnModuleInit {
     return mergeConditions(...conditions);
   }
 
-  private async determinePowers(grants: Grants) {
+  private determinePowers(grants: Grants) {
     const powers = new Set<Power>();
     const pushPower = (str: string) => {
       const power = `Create${str}`;
@@ -313,7 +309,7 @@ export class PolicyFactory implements OnModuleInit {
       }
       pushPower(res.name);
 
-      const implementations = await this.resourcesHost.getImplementations(res);
+      const implementations = this.resourcesHost.getImplementations(res);
       for (const implementation of implementations) {
         if (grants.has(implementation)) {
           // If policy specifies this implementation then defer to its entry.

src/components/comments/comment.service.ts

@@ -67,7 +67,7 @@ export class CommentService {
 
   async getPermissionsFromResource(resource: CommentableRef, session: Session) {
     const parent = await this.loadCommentable(resource);
-    const parentType = await this.resourcesHost.getByName(
+    const parentType = this.resourcesHost.getByName(
       // I'd like to type this prop as this but somehow blows everything up.
       parent.__typename as 'Commentable',
     );
@@ -93,7 +93,7 @@ export class CommentService {
       : parentNode;
 
     try {
-      await this.resourcesHost.verifyImplements(parent.__typename, Commentable);
+      this.resourcesHost.verifyImplements(parent.__typename, Commentable);
     } catch (e) {
       throw new NonCommentableType(e.message);
     }

src/components/file/media/events/can-update-event.ts

@@ -19,11 +19,11 @@ export class CanUpdateMediaUserMetadataEvent {
     @Optional() readonly allowUpdate: PollVoter<boolean>,
   ) {}
 
-  @Once() async getAttachedResource() {
+  @Once() getAttachedResource() {
     const attachedResName = this.resourceResolver.resolveTypeByBaseNode(
       this.media.attachedTo[0],
     );
-    const attachedResource = await this.resourceHost.getByName(attachedResName);
+    const attachedResource = this.resourceHost.getByName(attachedResName);
     return attachedResource;
   }
 }

src/components/post/post.service.ts

@@ -120,7 +120,7 @@ export class PostService {
 
   async getPermissionsFromPostable(resource: PostableRef, session: Session) {
     const parent = await this.loadPostable(resource);
-    const parentType = await this.resourcesHost.getByName(
+    const parentType = this.resourcesHost.getByName(
       parent.__typename as 'Postable',
     );
     return this.privileges.for(session, parentType, parent).forEdge('posts');
@@ -138,7 +138,7 @@ export class PostService {
       : parentNode;
 
     try {
-      await this.resourcesHost.verifyImplements(parent.__typename, Postable);
+      this.resourcesHost.verifyImplements(parent.__typename, Postable);
     } catch (e) {
       throw new NonPostableType(e.message);
     }

src/components/progress-report/media/handlers/update-media-metadata-check.handler.ts

@@ -12,7 +12,7 @@ export class ProgressReportUpdateMediaMetadataCheckHandler {
   ) {}
 
   async handle(event: CanUpdateMediaUserMetadataEvent) {
-    const attached = await event.getAttachedResource();
+    const attached = event.getAttachedResource();
     if (!attached.is(ReportMedia)) {
       return;
     }

src/components/search/search.service.ts

@@ -55,7 +55,7 @@ export class SearchService {
     // which is based on their first valid search label.
     const results = await this.repo.search({ ...input, type: types });
 
-    const ResourceMap = await this.resourceHost.getMap();
+    const ResourceMap = this.resourceHost.getMap();
 
     // Individually convert each result (id & type) to its search result
     // based on this.hydrators
@@ -94,9 +94,7 @@ export class SearchService {
               return null;
             }
 
-            const resource = await this.resourceHost.getByName(
-              hydrated.__typename,
-            );
+            const resource = this.resourceHost.getByName(hydrated.__typename);
             const perms = this.privileges.for(session, resource, hydrated).all;
             return matchedProps.some((key) =>
               // @ts-expect-error strict typing is hard for this dynamic use case.

src/core/edgedb/common.repository.ts

@@ -37,7 +37,7 @@ export class CommonRepository implements PublicOf<Neo4jCommonRepository> {
   ): Promise<readonly BaseNode[]> {
     const res = fqn
       ? typeof fqn === 'string'
-        ? await this.resources.getByEdgeDB(fqn)
+        ? this.resources.getByEdgeDB(fqn)
         : EnhancedResource.of(fqn)
       : undefined;
     const query = e.params({ ids: e.array(e.uuid) }, ({ ids }) =>
@@ -51,17 +51,14 @@ export class CommonRepository implements PublicOf<Neo4jCommonRepository> {
     );
     const nodes = await this.db.run(query, { ids });
 
-    return await Promise.all(
-      nodes.map(async (node): Promise<BaseNode> => {
-        const res = await this.resources.getByEdgeDB(node._typeFQN_);
-        return {
-          identity: node.id,
-          labels: [res.dbLabel],
-          properties: {
-            id: node.id,
-            createdAt: node.createdAt,
-          },
-        };
+    return nodes.map(
+      (node): BaseNode => ({
+        identity: node.id,
+        labels: [this.resources.getByEdgeDB(node._typeFQN_).dbLabel],
+        properties: {
+          id: node.id,
+          createdAt: node.createdAt,
+        },
       }),
     );
   }

src/core/edgedb/dto.repository.ts

@@ -147,7 +147,7 @@ export const RepoFor = <
      * failed insert, after we finish migration.
      */
     async isUnique(value: string, fqn?: string) {
-      const res = fqn ? await this.resources.getByEdgeDB(fqn) : resource;
+      const res = fqn ? this.resources.getByEdgeDB(fqn) : resource;
       const query = e.select(e.Mixin.Named, (obj) => ({
         filter: e.op(
           e.op(obj.name, '=', value),