@avakado.ai/schemas 1.1.0 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avakado.ai/schemas",
-  "version": "1.1.0",
+  "version": "1.1.4",
   "description": "Canonical Mongo schemas, models, enums and index declarations shared by the Avakado services.",
   "license": "UNLICENSED",
   "type": "module",

package/src/enums/index.js

@@ -62,3 +62,5 @@ export const CAMPAIGN_STATUS = ["pending", "active", "completed"];
 export const TASK_STATUS = ["pending", "in-progress", "completed", "failed", "skipped"];
 export const TASK_TYPES = ["quick", "webhook"];
 export const TASK_REFERENCE_TYPES = ["Message", "CallSession"];
+
+export const OAUTH_GRANT_MODES = ["access_refresh", "access_only", "permanent"];

package/src/models/Job.js

@@ -18,7 +18,6 @@ const JobSchema = new Schema({
     name: String,
     campaign: { type: Schema.Types.ObjectId, ref: "Campaign" },
     description: String,
-    bullMQJobId: String, // bullmq job id    
     status: { type: String, enum: jobStatusEnum, default: 'waiting' },
     priority: Number,               // 1 (highest) .. 10 (lowest)
     schedule: {
@@ -40,8 +39,7 @@ const JobSchema = new Schema({
     discriminatorKey: 'jobType', timestamps: true, index: [
         { status: 1, 'schedule.run_at': 1 },
         { business: 1, status: 1 },
-        { 'schedule.type': 1, 'schedule.run_at': 1 },
-        { bullMQJobId: 1 }
+        { 'schedule.type': 1, 'schedule.run_at': 1 }
     ]
 });
 // Pre-save middleware for validation

package/src/models/OAuth.js

@@ -0,0 +1,60 @@
+import { Schema } from "mongoose";
+import { defineModel } from "../runtime.js";
+import { OAUTH_GRANT_MODES } from "../enums/index.js";
+
+const OAuthClientSchema = new Schema({
+    clientId: { type: String, required: true, unique: true, index: true },
+    name: { type: String, required: true },
+    business: { type: Schema.Types.ObjectId, ref: "Businesses", index: true },
+    createdBy: { type: Schema.Types.ObjectId, ref: "Users", unique: true, sparse: true },
+    secretHash: { type: String, default: null },
+    secretVersion: { type: Number, default: 1 },
+    redirectUris: { type: [String], default: [] },
+    allowedOrigins: { type: [String], default: [] },
+    grantMode: { type: String, enum: OAUTH_GRANT_MODES, required: true, default: "access_refresh" },
+    isFirstParty: { type: Boolean, default: false },
+    revokedAt: { type: Date, default: null },
+}, { timestamps: true });
+
+OAuthClientSchema.index({ business: 1, revokedAt: 1 });
+OAuthClientSchema.index({ allowedOrigins: 1, revokedAt: 1 });
+
+const OAuthAuthorizationCodeSchema = new Schema({
+    codeHash: { type: String, required: true, unique: true },
+    clientId: { type: String, required: true, index: true },
+    user: { type: Schema.Types.ObjectId, ref: "Users", required: true },
+    redirectUri: { type: String, required: true },
+    scope: { type: String, default: "" },
+    codeChallenge: { type: String, default: null },
+    codeChallengeMethod: { type: String, enum: ["S256", "plain"], default: null },
+    expiresAt: { type: Date, required: true },
+    consumedAt: { type: Date, default: null },
+}, { timestamps: true });
+
+OAuthAuthorizationCodeSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+
+const OAuthRefreshTokenSchema = new Schema({
+    tokenHash: { type: String, required: true, unique: true },
+    clientId: { type: String, required: true, index: true },
+    user: { type: Schema.Types.ObjectId, ref: "Users", required: true, index: true },
+    familyId: { type: String, required: true, index: true },
+    expiresAt: { type: Date, required: true },
+    usedAt: { type: Date, default: null },
+    revokedAt: { type: Date, default: null },
+}, { timestamps: true });
+
+OAuthRefreshTokenSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+OAuthRefreshTokenSchema.index({ clientId: 1, revokedAt: 1 });
+OAuthRefreshTokenSchema.index({ user: 1, revokedAt: 1 });
+
+const OAuthRevokedJtiSchema = new Schema({
+    jti: { type: String, required: true, unique: true },
+    expiresAt: { type: Date, required: true },
+}, { timestamps: true });
+
+OAuthRevokedJtiSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+
+export const OAuthClient = defineModel("OAuthClient", OAuthClientSchema, "OAuthClients");
+export const OAuthAuthorizationCode = defineModel("OAuthAuthorizationCode", OAuthAuthorizationCodeSchema, "OAuthAuthorizationCodes");
+export const OAuthRefreshToken = defineModel("OAuthRefreshToken", OAuthRefreshTokenSchema, "OAuthRefreshTokens");
+export const OAuthRevokedJti = defineModel("OAuthRevokedJti", OAuthRevokedJtiSchema, "OAuthRevokedJtis");

package/src/models/index.js

@@ -29,3 +29,4 @@ export { Document } from "./Document.js";
 export { Data } from "./Data.js";
 export { Workflow, WorkflowSchema } from "./Workflow.js";
 export { WorkflowLogs } from "./WorkflowLogs.js";
+export { OAuthClient, OAuthAuthorizationCode, OAuthRefreshToken, OAuthRevokedJti } from "./OAuth.js";