update user and profile models

Author: DylanBulmer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codrjs/core",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "An open-sourced customizable annotation tool",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

src/models/Profile.ability.ts

@@ -6,9 +6,9 @@ export default function ProfileAbility(user: IUser) {
     if (user.role === "codr:admin") {
       can("manage", "Profile");
     } else {
-      can("create", "Profile", { userId: user._id });
-      can("read", "Profile", { userId: user._id });
-      can("update", "Profile", { userId: user._id });
+      can("create", "Profile", { user: user._id });
+      can("read", "Profile", { user: user._id });
+      can("update", "Profile", { user: user._id });
     }
   });
 }

src/models/Profile.ts

@@ -6,14 +6,16 @@ import {
 import { Schema, model, Document } from "mongoose";
 
 export interface IProfile extends Document {
+  avatarUrl?: string;
   username: string;
-  userId: Schema.Types.ObjectId;
+  user: Schema.Types.ObjectId;
 }
 
 const ProfileSchema = new Schema<IProfile>(
   {
     username: { type: String, required: true, unique: true },
-    userId: {
+    avatarUrl: { type: String },
+    user: {
       type: Schema.Types.ObjectId,
       ref: "User",
       required: true,

src/models/User.ts

@@ -30,6 +30,8 @@ export interface IUser extends Document {
   providers?: IUserProvider;
   isAdmin: boolean;
   role: UserRoleType;
+  disabled: boolean;
+  anonymous: boolean;
 }
 
 const UserProvider = new Schema<IUserProvider>({
@@ -74,6 +76,14 @@ const UserSchema = new Schema<IUser>(
       type: String,
       required: [true, "Please specify the user's role."],
     },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    anonymous: {
+      type: Boolean,
+      default: false,
+    },
   },
   {
     timestamps: true,

src/services/database.ts

@@ -7,7 +7,7 @@ import ProfileAbility from "../models/Profile.ability.js";
 import User, { IUser } from "../models/User.js";
 import UserAbility from "../models/User.ability.js";
 import App from "./app.js";
-import { QueryWithHelpers, Types } from "mongoose";
+import { QueryWithHelpers } from "mongoose";
 import type { AccessibleRecordQueryHelpers } from "@casl/mongoose/dist/types/accessible_records.js";
 import Error from "../classes/Error.js";
 
@@ -33,17 +33,13 @@ class Database {
     }
   }
 
-  Profile(token: IUser): QueryWithHelpers<
-    (IProfile & {
-      _id: Types.ObjectId;
-    })[],
-    IProfile & {
-      _id: Types.ObjectId;
-    },
+  Profile(
+    token: IUser,
+  ): QueryWithHelpers<
+    IProfile[],
+    IProfile,
     AccessibleRecordQueryHelpers<IProfile>,
-    IProfile & {
-      _id: Types.ObjectId;
-    }
+    IProfile
   > {
     if (this.app.mongoIsConnected)
       return Profile.accessibleBy(ProfileAbility(token));