1 files changed, 11 insertions, 23 deletions
diff --git a/src/server/api/endpoints/auth/session/userkey.ts b/src/server/api/endpoints/auth/session/userkey.ts
index e09e16e658..8524b96f94 100644
--- a/src/server/api/endpoints/auth/session/userkey.ts
+++ b/src/server/api/endpoints/auth/session/userkey.ts
@@ -1,10 +1,7 @@
 import $ from 'cafy';
-import App from '../../../../../models/app';
-import AuthSess from '../../../../../models/auth-session';
-import AccessToken from '../../../../../models/access-token';
-import { pack } from '../../../../../models/user';
 import define from '../../../define';
 import { ApiError } from '../../../error';
+import { Apps, AuthSessions, AccessTokens, Users } from '../../../../../models';
 
 export const meta = {
 	tags: ['auth'],
@@ -67,7 +64,7 @@ export const meta = {
 
 export default define(meta, async (ps) => {
 	// Lookup app
-	const app = await App.findOne({
+	const app = await Apps.findOne({
 		secret: ps.appSecret
 	});
 
@@ -76,13 +73,12 @@ export default define(meta, async (ps) => {
 	}
 
 	// Fetch token
-	const session = await AuthSess
-		.findOne({
-			token: ps.token,
-			appId: app._id
-		});
+	const session = await AuthSessions.findOne({
+		token: ps.token,
+		appId: app.id
+	});
 
-	if (session === null) {
+	if (session == null) {
 		throw new ApiError(meta.errors.noSuchSession);
 	}
 
@@ -91,25 +87,17 @@ export default define(meta, async (ps) => {
 	}
 
 	// Lookup access token
-	const accessToken = await AccessToken.findOne({
-		appId: app._id,
+	const accessToken = await AccessTokens.findOne({
+		appId: app.id,
 		userId: session.userId
 	});
 
 	// Delete session
-
-	/* https://github.com/Automattic/monk/issues/178
-	AuthSess.deleteOne({
-		_id: session._id
-	});
-	*/
-	AuthSess.remove({
-		_id: session._id
-	});
+	AuthSessions.delete(session.id);
 
 	return {
 		accessToken: accessToken.token,
-		user: await pack(session.userId, null, {
+		user: await Users.pack(session.userId, null, {
 			detail: true
 		})
 	};