Merge branch 'develop'

1 files changed, 14 insertions, 14 deletions

diff --git a/src/server/api/authenticate.ts b/src/server/api/authenticate.ts
index 7781b87c88..ecf4a82c45 100644
--- a/src/server/api/authenticate.ts
+++ b/src/server/api/authenticate.ts
@@ -1,37 +1,37 @@
-import App, { IApp } from '../../models/app';
-import { default as User, IUser } from '../../models/user';
-import AccessToken from '../../models/access-token';
 import isNativeToken from './common/is-native-token';
+import { User } from '../../models/entities/user';
+import { App } from '../../models/entities/app';
+import { Users, AccessTokens, Apps } from '../../models';
 
-export default async (token: string): Promise<[IUser, IApp]> => {
+export default async (token: string): Promise<[User | null | undefined, App | null | undefined]> => {
 	if (token == null) {
 		return [null, null];
 	}
 
 	if (isNativeToken(token)) {
 		// Fetch user
-		const user: IUser = await User
+		const user = await Users
 			.findOne({ token });
 
-		if (user === null) {
-			throw 'user not found';
+		if (user == null) {
+			throw new Error('user not found');
 		}
 
 		return [user, null];
 	} else {
-		const accessToken = await AccessToken.findOne({
+		const accessToken = await AccessTokens.findOne({
 			hash: token.toLowerCase()
 		});
 
-		if (accessToken === null) {
-			throw 'invalid signature';
+		if (accessToken == null) {
+			throw new Error('invalid signature');
 		}
 
-		const app = await App
-			.findOne({ _id: accessToken.appId });
+		const app = await Apps
+			.findOne(accessToken.appId);
 
-		const user = await User
-			.findOne({ _id: accessToken.userId });
+		const user = await Users
+			.findOne(accessToken.userId);
 
 		return [user, app];
 	}