Pr05/server migrate models

.eslintrc

@@ -135,7 +135,7 @@
         "import/no-extraneous-dependencies": "off",
         "no-unused-vars": "off",
         "import/no-default-export": "warn",
-        "no-underscore-dangle": "warn",
+        "no-underscore-dangle": "off",
         "react/require-default-props": "off",
         "no-shadow": "off",
         "@typescript-eslint/no-shadow": "error"

client/tsconfig.json

@@ -6,6 +6,6 @@
     "lib": ["DOM", "ESNext"],
     "jsx": "react",
   },
-  "include": ["./**/*"],
+  "include": ["./**/*", "../types"],
   "exclude": ["../node_modules", "../server"]
 }

package.json

@@ -126,6 +126,7 @@
     "@svgr/webpack": "^6.2.1",
     "@testing-library/jest-dom": "^5.15.0",
     "@testing-library/react": "^12.1.2",
+    "@types/bcryptjs": "^2.4.6",
     "@types/friendly-words": "^1.2.2",
     "@types/jest": "^29.5.14",
     "@types/node": "^16.18.126",

server/config/passport.js

@@ -8,7 +8,7 @@ import LocalStrategy from 'passport-local';
 import GoogleStrategy from 'passport-google-oauth20';
 import { BasicStrategy } from 'passport-http';
 
-import User from '../models/user';
+import { User } from '../models/user';
 
 const accountSuspensionMessage =
   'Account has been suspended. Please contact [email protected] if you believe this is an error.';
@@ -61,7 +61,8 @@ passport.use(
           await user.save();
 
           return done(null, user);
-        } else { // eslint-disable-line
+        } else {
+          // eslint-disable-line
           return done(null, false, { msg: 'Invalid email or password' });
         }
       } catch (err) {

server/controllers/aws.controller.js

@@ -9,7 +9,7 @@ import {
 } from '@aws-sdk/client-s3';
 import mongoose from 'mongoose';
 
-import User from '../models/user';
+import { User } from '../models/user';
 import Project from '../models/project';
 
 const { ObjectId } = mongoose.Types;

server/controllers/collection.controller/collectionForUserExists.js

@@ -1,5 +1,5 @@
 import Collection from '../../models/collection';
-import User from '../../models/user';
+import { User } from '../../models/user';
 
 /**
  * @param {string} username

server/controllers/collection.controller/listCollections.js

@@ -1,5 +1,5 @@
 import Collection from '../../models/collection';
-import User from '../../models/user';
+import { User } from '../../models/user';
 
 async function getOwnerUserId(req) {
   if (req.params.username) {

server/controllers/project.controller.js

@@ -7,7 +7,7 @@ import isAfter from 'date-fns/isAfter';
 import axios from 'axios';
 import slugify from 'slugify';
 import Project from '../models/project';
-import User from '../models/user';
+import { User } from '../models/user';
 import { resolvePathToFile } from '../utils/filePath';
 import { generateFileSystemSafeName } from '../utils/generateFileSystemSafeName';
 

server/controllers/project.controller/__test__/deleteProject.test.js

@@ -4,7 +4,7 @@
 import { Request, Response } from 'jest-express';
 
 import Project from '../../../models/project';
-import User from '../../../models/user';
+import { User } from '../../../models/user';
 import deleteProject from '../deleteProject';
 import { deleteObjectsFromS3 } from '../../aws.controller';
 

server/controllers/project.controller/__test__/getProjectsForUser.test.js

@@ -3,7 +3,7 @@
  */
 import { Request, Response } from 'jest-express';
 
-import User from '../../../models/user';
+import { User } from '../../../models/user';
 import getProjectsForUser, {
   apiGetProjectsForUser
 } from '../getProjectsForUser';

server/controllers/project.controller/getProjectsForUser.js

@@ -1,5 +1,5 @@
 import Project from '../../models/project';
-import User from '../../models/user';
+import { User } from '../../models/user';
 import { toApi as toApiProjectObject } from '../../domain-objects/Project';
 
 /**