Skip to content

Commit 5f1efe8

Browse files
committed
models/user: update to named export, no-verify but tests pass
1 parent 000963d commit 5f1efe8

File tree

23 files changed

+285
-160
lines changed

23 files changed

+285
-160
lines changed

server/config/passport.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import LocalStrategy from 'passport-local';
88
import GoogleStrategy from 'passport-google-oauth20';
99
import { BasicStrategy } from 'passport-http';
1010

11-
import User from '../models/user';
11+
import { User } from '../models/user';
1212

1313
const accountSuspensionMessage =
1414
'Account has been suspended. Please contact privacy@p5js.org if you believe this is an error.';
@@ -61,7 +61,8 @@ passport.use(
6161
await user.save();
6262

6363
return done(null, user);
64-
} else { // eslint-disable-line
64+
} else {
65+
// eslint-disable-line
6566
return done(null, false, { msg: 'Invalid email or password' });
6667
}
6768
} catch (err) {

server/controllers/aws.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
} from '@aws-sdk/client-s3';
1010
import mongoose from 'mongoose';
1111

12-
import User from '../models/user';
12+
import { User } from '../models/user';
1313
import Project from '../models/project';
1414

1515
const { ObjectId } = mongoose.Types;

server/controllers/collection.controller/collectionForUserExists.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Collection from '../../models/collection';
2-
import User from '../../models/user';
2+
import { User } from '../../models/user';
33

44
/**
55
* @param {string} username

server/controllers/collection.controller/listCollections.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Collection from '../../models/collection';
2-
import User from '../../models/user';
2+
import { User } from '../../models/user';
33

44
async function getOwnerUserId(req) {
55
if (req.params.username) {

server/controllers/project.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import isAfter from 'date-fns/isAfter';
77
import axios from 'axios';
88
import slugify from 'slugify';
99
import Project from '../models/project';
10-
import User from '../models/user';
10+
import { User } from '../models/user';
1111
import { resolvePathToFile } from '../utils/filePath';
1212
import { generateFileSystemSafeName } from '../utils/generateFileSystemSafeName';
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import { Request, Response } from 'jest-express';
55

66
import Project from '../../../models/project';
7-
import User from '../../../models/user';
7+
import { User } from '../../../models/user';
88
import deleteProject from '../deleteProject';
99
import { deleteObjectsFromS3 } from '../../aws.controller';
1010

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
import { Request, Response } from 'jest-express';
55

6-
import User from '../../../models/user';
6+
import { User } from '../../../models/user';
77
import getProjectsForUser, {
88
apiGetProjectsForUser
99
} from '../getProjectsForUser';

server/controllers/project.controller/getProjectsForUser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Project from '../../models/project';
2-
import User from '../../models/user';
2+
import { User } from '../../models/user';
33
import { toApi as toApiProjectObject } from '../../domain-objects/Project';
44

55
/**

server/controllers/user.controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import crypto from 'crypto';
22

3-
import User from '../models/user';
3+
import { User } from '../models/user';
44
import { mailerService } from '../utils/mail';
55
import { renderEmailConfirmation, renderResetPassword } from '../views/mail';
66

server/controllers/user.controller/__tests__/apiKey.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { last } from 'lodash';
44
import { Request, Response } from 'jest-express';
55

6-
import User from '../../../models/user';
6+
import { User } from '../../../models/user';
77
import { createApiKey, removeApiKey } from '../apiKey';
88

99
jest.mock('../../../models/user');

0 commit comments

Comments
 (0)