Fix schema permissions nesting (#25)

* fix(grpc-sdk,commons,database): schema permissions modelOptions nesting * fix(authentication,chat,cms,email,forms,push-notifications,storage,admin,config,schemas): schema permissions modelOptions nesting
ConduitPlatform · Feb 10, 2022 · a60337d · a60337d
1 parent 740348f
commit a60337d
Show file tree

Hide file tree

Showing 23 changed files with 40 additions and 38 deletions.
diff --git a/libraries/grpc-sdk/src/interfaces/Model.ts b/libraries/grpc-sdk/src/interfaces/Model.ts
@@ -36,13 +36,13 @@ export const ConduitModelOptionsPermModifyType = ['Everything', 'Nothing', 'Exte
 export interface ConduitModelOptions {
   timestamps?: boolean;
   _id?: boolean;
-  permissions?: {
-    extendable: boolean,
-    canCreate: boolean,
-    canModify: 'Everything' | 'Nothing' | 'ExtensionOnly',
-    canDelete: boolean,
-  },
   conduit?: {
     [field: string]: any,
+    permissions?: {
+      extendable: boolean,
+      canCreate: boolean,
+      canModify: 'Everything' | 'Nothing' | 'ExtensionOnly',
+      canDelete: boolean,
+    },
   };
 }
diff --git a/modules/authentication/src/models/AccessToken.schema.ts b/modules/authentication/src/models/AccessToken.schema.ts
@@ -37,7 +37,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class AccessToken extends ConduitActiveSchema<AccessToken> {

diff --git a/modules/authentication/src/models/RefreshToken.schema.ts b/modules/authentication/src/models/RefreshToken.schema.ts
@@ -41,7 +41,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class RefreshToken extends ConduitActiveSchema<RefreshToken> {

diff --git a/modules/authentication/src/models/Service.schema.ts b/modules/authentication/src/models/Service.schema.ts
@@ -33,7 +33,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 export class Service extends ConduitActiveSchema<Service> {
   private static _instance: Service;

diff --git a/modules/authentication/src/models/Token.schema.ts b/modules/authentication/src/models/Token.schema.ts
@@ -36,7 +36,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class Token extends ConduitActiveSchema<Token> {

diff --git a/modules/authentication/src/models/User.schema.ts b/modules/authentication/src/models/User.schema.ts
@@ -90,7 +90,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class User extends ConduitActiveSchema<User> {

diff --git a/modules/chat/src/models/ChatRoom.schema.ts b/modules/chat/src/models/ChatRoom.schema.ts
@@ -29,7 +29,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class ChatRoom extends ConduitActiveSchema<ChatRoom> {

diff --git a/modules/chat/src/models/Message.schema.ts b/modules/chat/src/models/Message.schema.ts
@@ -40,7 +40,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class ChatMessage extends ConduitActiveSchema<ChatMessage> {

diff --git a/modules/cms/src/admin/schema.admin.ts b/modules/cms/src/admin/schema.admin.ts
@@ -442,7 +442,8 @@ export class SchemaAdmin {
 
   private patchSchemaPerms(
     schema: _DeclaredSchema,
-    perms: ConduitModelOptions['permissions'],
+    // @ts-ignore
+    perms: ConduitModelOptions['conduit']['permissions'],
   ) {
     if (perms!.canModify && !(ConduitModelOptionsPermModifyType.includes(perms!.canModify))) {
       throw new GrpcError(

diff --git a/modules/cms/src/models/CustomEndpoints.schema.ts b/modules/cms/src/models/CustomEndpoints.schema.ts
@@ -66,7 +66,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class CustomEndpoints extends ConduitActiveSchema<CustomEndpoints> {

diff --git a/modules/database/src/adapters/DatabaseAdapter.ts b/modules/database/src/adapters/DatabaseAdapter.ts
@@ -90,14 +90,15 @@ export abstract class DatabaseAdapter<T extends SchemaAdapter<any>> {
       canCreate: true,
       canModify: 'Everything',
       canDelete: true,
-    };
+    } as const;
     if (!schema.schemaOptions.hasOwnProperty('conduit')) schema.schemaOptions.conduit = {};
     if (!schema.schemaOptions.conduit!.hasOwnProperty('permissions')) {
       schema.schemaOptions.conduit!.permissions = defaultPermissions;
     } else {
       Object.keys(defaultPermissions).forEach((perm) => {
-        if (!schema.schemaOptions.conduit!.permissions.hasOwnProperty(perm)) {
-          schema.schemaOptions.conduit!.permissions[perm] = defaultPermissions[perm as keyof typeof defaultPermissions];
+        if (!schema.schemaOptions.conduit!.permissions!.hasOwnProperty(perm)) {
+          // @ts-ignore
+          schema.schemaOptions.conduit!.permissions![perm] = defaultPermissions[perm as keyof typeof defaultPermissions];
         }
       });
     }

diff --git a/modules/database/src/permissions/index.ts b/modules/database/src/permissions/index.ts
@@ -7,7 +7,7 @@ export async function canExtend(moduleName: string, schema: SchemaAdapter<any>)
   }
   return (
     schema.originalSchema.ownerModule === moduleName ||
-    schema.originalSchema.schemaOptions.conduit!.permissions.extendable
+    schema.originalSchema.schemaOptions.conduit!.permissions!.extendable
   )
 }
 
@@ -19,7 +19,7 @@ export async function canCreate(moduleName: string, schema: SchemaAdapter<any>)
   }
   return (
     schema.originalSchema.ownerModule === moduleName ||
-    schema.originalSchema.schemaOptions.conduit!.permissions.extendable
+    schema.originalSchema.schemaOptions.conduit!.permissions!.extendable
   )
 }
 
@@ -31,7 +31,7 @@ export async function canModify(moduleName: string, schema: SchemaAdapter<any>)
   }
   return (
     schema.originalSchema.ownerModule === moduleName ||
-    (schema.originalSchema.schemaOptions.conduit!.permissions.canModify === 'Everything')
+    (schema.originalSchema.schemaOptions.conduit!.permissions!.canModify === 'Everything')
     // TODO: Handle 'ExtensionOnly' once we get extensions
   );
 }
@@ -44,6 +44,6 @@ export async function canDelete(moduleName: string, schema: SchemaAdapter<any>)
   }
   return (
     schema.originalSchema.ownerModule === moduleName ||
-    schema.originalSchema.schemaOptions.conduit!.permissions.canDelete
+    schema.originalSchema.schemaOptions.conduit!.permissions!.canDelete
   );
 }
diff --git a/modules/email/src/models/EmailTemplate.schema.ts b/modules/email/src/models/EmailTemplate.schema.ts
@@ -43,7 +43,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class EmailTemplate extends ConduitActiveSchema<EmailTemplate> {

diff --git a/modules/forms/src/models/Forms.schema.ts b/modules/forms/src/models/Forms.schema.ts
@@ -41,7 +41,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class Forms extends ConduitActiveSchema<Forms> {

diff --git a/modules/forms/src/models/Replies.schema.ts b/modules/forms/src/models/Replies.schema.ts
@@ -34,7 +34,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class FormReplies extends ConduitActiveSchema<FormReplies> {

diff --git a/modules/push-notifications/src/models/NotificationToken.schema.ts b/modules/push-notifications/src/models/NotificationToken.schema.ts
@@ -35,7 +35,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class NotificationToken extends ConduitActiveSchema<NotificationToken> {

diff --git a/modules/storage/src/models/Container.schema.ts b/modules/storage/src/models/Container.schema.ts
@@ -28,7 +28,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class _StorageContainer extends ConduitActiveSchema<_StorageContainer> {

diff --git a/modules/storage/src/models/File.schema.ts b/modules/storage/src/models/File.schema.ts
@@ -37,7 +37,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class File extends ConduitActiveSchema<File> {

diff --git a/modules/storage/src/models/Folder.schema.ts b/modules/storage/src/models/Folder.schema.ts
@@ -32,7 +32,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class _StorageFolder extends ConduitActiveSchema<_StorageFolder> {

diff --git a/packages/admin/src/models/Admin.schema.ts b/packages/admin/src/models/Admin.schema.ts
@@ -27,7 +27,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class Admin extends ConduitActiveSchema<Admin> {

diff --git a/packages/commons/src/interfaces/Model.ts b/packages/commons/src/interfaces/Model.ts
@@ -36,13 +36,13 @@ export const ConduitModelOptionsPermModifyType = ['Everything', 'Nothing', 'Exte
 export interface ConduitModelOptions {
   timestamps?: boolean;
   _id?: boolean;
-  permissions?: {
-    extendable: boolean,
-    canCreate: boolean,
-    canModify: 'Everything' | 'Nothing' | 'ExtensionOnly',
-    canDelete: boolean,
-  },
   conduit?: {
     [field: string]: any,
+    permissions?: {
+      extendable: boolean,
+      canCreate: boolean,
+      canModify: 'Everything' | 'Nothing' | 'ExtensionOnly',
+      canDelete: boolean,
+    },
   };
 }
diff --git a/packages/config/src/models/Config.schema.ts b/packages/config/src/models/Config.schema.ts
@@ -22,7 +22,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class Config extends ConduitActiveSchema<Config> {

diff --git a/packages/security/src/models/Client.schema.ts b/packages/security/src/models/Client.schema.ts
@@ -35,7 +35,7 @@ const schemaOptions = {
       canDelete: false,
     },
   },
-};
+} as const;
 const collectionName = undefined;
 
 export class Client extends ConduitActiveSchema<Client> {