fix ACL; fix dep issue; update tests and build script

Author: DylanBulmer

bin/post-build.sh

@@ -1,3 +1,7 @@
+cp package.json README.md lib/
+rm -rf ./lib/types/__tests__
+rm -rf ./lib/esm/__tests__
+
 cat >lib/cjs/package.json <<!EOF
 {
     "type": "commonjs"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codrjs/core",
-  "version": "1.0.6-patch7",
+  "version": "1.0.7",
   "description": "An open-sourced customizable annotation tool",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
     "test": "jest --config jest.config.json --passWithNoTests --coverage",
     "build:esm": "tsc --project tsconfig.esm.json",
     "build:cjs": "tsc --project tsconfig.cjs.json",
-    "build": "yarn clean && yarn build:cjs && yarn build:esm && cp package.json README.md lib/ && rm -rf ./lib/types/__tests__ && ./bin/post-build.sh",
+    "build": "yarn clean && yarn build:cjs && yarn build:esm && ./bin/post-build.sh",
     "clean": "rm -rf ./lib",
     "format": "prettier --write \"src/**/*.(ts|js)\"",
     "lint": "eslint -c .eslintrc.json --ignore-path .eslintignore --ext .ts src",

src/__tests__/AccessToken.test.ts

@@ -41,6 +41,16 @@ describe("Access Token and Access Code generation", () => {
     expect(token3.toJSON().uuid).toBe(uuid3);
   });
 
+  it("properly validates a token", () => {
+    expect(token2.isValid(uuid2 as unknown as typeof uuidv4)).toBe(true);
+  });
+
+  it("properly expires a token", () => {
+    token2.use();
+    expect(token2.isValid(uuid2 as unknown as typeof uuidv4)).toBe(false);
+    expect(token2.toJSON().expired).toBe(true);
+  });
+
   it("fails to generate a token", () => {
     const test1 = () => {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment

src/models/Profile.ts

@@ -1,4 +1,8 @@
-import { AccessibleRecordModel } from "@casl/mongoose";
+import {
+  accessibleFieldsPlugin,
+  AccessibleModel,
+  accessibleRecordsPlugin,
+} from "@casl/mongoose";
 import { Schema, model, Document } from "mongoose";
 
 export interface IProfile extends Document {
@@ -8,7 +12,7 @@ export interface IProfile extends Document {
 
 const ProfileSchema = new Schema<IProfile>(
   {
-    username: { type: String, required: true },
+    username: { type: String, required: true, unique: true },
     userId: {
       type: Schema.Types.ObjectId,
       ref: "User",
@@ -21,7 +25,9 @@ const ProfileSchema = new Schema<IProfile>(
 );
 
 // exports User model.
-const Profile = model<IProfile, AccessibleRecordModel<IProfile>>(
+ProfileSchema.plugin(accessibleFieldsPlugin);
+ProfileSchema.plugin(accessibleRecordsPlugin);
+const Profile = model<IProfile, AccessibleModel<IProfile>>(
   "Profile",
   ProfileSchema,
 );

src/models/User.ts

@@ -1,6 +1,10 @@
 import { EmailRegex } from "../classes/Email.js";
+import {
+  accessibleFieldsPlugin,
+  AccessibleModel,
+  accessibleRecordsPlugin,
+} from "@casl/mongoose";
 import { Schema, model, Document } from "mongoose";
-import { AccessibleRecordModel } from "@casl/mongoose";
 
 interface IUserProvider {
   photo?: string;
@@ -77,5 +81,7 @@ UserSchema.virtual("fullName").get(function get() {
 });
 
 // exports User model.
-const User = model<IUser, AccessibleRecordModel<IUser>>("User", UserSchema);
+UserSchema.plugin(accessibleFieldsPlugin);
+UserSchema.plugin(accessibleRecordsPlugin);
+const User = model<IUser, AccessibleModel<IUser>>("User", UserSchema);
 export default User;

src/services/app.ts

@@ -3,8 +3,6 @@
  * it access to necessary configuration to access the database, authenticating
  * with the server, and other uses.
  */
-
-import { accessibleRecordsPlugin } from "@casl/mongoose";
 import User from "../models/User.js";
 import mongoose, { Mongoose } from "mongoose";
 
@@ -59,7 +57,6 @@ class App implements AppOptions {
     try {
       // connect to the database.
       this.mongo = await mongoose.connect(this.databaseUri);
-      this.mongo.plugin(accessibleRecordsPlugin);
 
       // try to create an admin user.
       try {

src/services/database.ts

@@ -2,14 +2,13 @@
  * This service handles all configuration handlers for codr.
  */
 
-import { UserToken } from "../classes/JWT.js";
 import Profile, { IProfile } from "../models/Profile.js";
 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 type { AccessibleRecordQueryHelpers } from "../../node_modules/@casl/mongoose/dist/types/accessible_records.js";
+import type { AccessibleRecordQueryHelpers } from "@casl/mongoose/dist/types/accessible_records.js";
 
 class Database {
   private app: App;
@@ -18,7 +17,7 @@ class Database {
   }
 
   User(
-    token: UserToken,
+    token: IUser,
   ): QueryWithHelpers<
     IUser[],
     IUser,
@@ -33,7 +32,7 @@ class Database {
     }
   }
 
-  Profile(token: UserToken): QueryWithHelpers<
+  Profile(token: IUser): QueryWithHelpers<
     (IProfile & {
       _id: Types.ObjectId;
     })[],