scheduler-node-models 1.1.9 → 1.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scheduler-node-models",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [

package/users/user.d.ts

@@ -1,4 +1,3 @@
-import { ObjectId } from "mongodb";
 /**
  * The user class and interface.
  */
@@ -7,7 +6,8 @@ import { ObjectId } from "mongodb";
  * its class object.
  */
 export interface IUser {
-    _id?: ObjectId;
+    _id?: string;
+    id: string;
     emailAddress: string;
     password?: string;
     passwordExpires: Date;
@@ -37,7 +37,7 @@ export interface IUser {
  * password change, plus token expiration date/time the reset token expires)
  */
 export declare class User implements IUser {
-    _id: ObjectId;
+    id: string;
     emailAddress: string;
     password?: string;
     passwordExpires: Date;

package/users/user.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = void 0;
-const mongodb_1 = require("mongodb");
-const bcrypt_1 = require("bcrypt");
+const bcrypt_ts_1 = require("bcrypt-ts");
 /**
  * This class represents a user and all the actions available to the user object.
  * The main class members are:
@@ -20,7 +19,7 @@ const bcrypt_1 = require("bcrypt");
  * password change, plus token expiration date/time the reset token expires)
  */
 class User {
-    _id;
+    id;
     emailAddress;
     password;
     passwordExpires;
@@ -33,7 +32,10 @@ class User {
     resettokenexp;
     additionalEmails;
     constructor(user) {
-        this._id = (user && user._id) ? user._id : new mongodb_1.ObjectId();
+        this.id = (user && user.id) ? user.id : '';
+        if (this.id === '') {
+            this.id = (user && user._id) ? user._id.toString() : '';
+        }
         this.emailAddress = (user) ? user.emailAddress : '';
         this.password = (user) ? user.password : undefined;
         this.passwordExpires = (user) ? new Date(user.passwordExpires) : new Date();
@@ -104,8 +106,8 @@ class User {
      * @param passwd The string value for the new password
      */
     setPassword(passwd) {
-        const salt = (0, bcrypt_1.genSaltSync)(12);
-        const result = (0, bcrypt_1.hashSync)(passwd, salt);
+        const salt = (0, bcrypt_ts_1.genSaltSync)(12);
+        const result = (0, bcrypt_ts_1.hashSync)(passwd, salt);
         this.password = result;
         this.passwordExpires = new Date();
         this.badAttempts = 0;
@@ -117,7 +119,7 @@ class User {
      * @throws An error if the account is locked or there is a mismatch with the password.
      */
     checkPassword(pwd) {
-        if (this.password && (0, bcrypt_1.compareSync)(pwd, this.password)) {
+        if (this.password && (0, bcrypt_ts_1.compareSync)(pwd, this.password)) {
             if (this.badAttempts > 2) {
                 throw new Error("Account Locked");
             }

package/users/web.d.ts

@@ -20,3 +20,12 @@ export interface AddUserRequest {
     application: string;
     permissions?: string[];
 }
+/**
+ * This interface will be used to update a user with a call from the client to the
+ * api server.  All fields would be required.
+ */
+export interface UpdateUserRequest {
+    id: string;
+    field: string;
+    value: string;
+}