summaryrefslogtreecommitdiff
path: root/src/api/authenticate.ts
diff options
context:
space:
mode:
authorこぴなたみぽ <syuilotan@yahoo.co.jp>2017-09-16 14:30:44 +0900
committerこぴなたみぽ <syuilotan@yahoo.co.jp>2017-09-16 14:30:44 +0900
commitbbfac657fb95536f2e942fbd02343bb1185fc68b (patch)
tree1b2c050f1829a841c901ed64ae4c34593e80dbe4 /src/api/authenticate.ts
parentfix (diff)
downloadsharkey-bbfac657fb95536f2e942fbd02343bb1185fc68b.tar.gz
sharkey-bbfac657fb95536f2e942fbd02343bb1185fc68b.tar.bz2
sharkey-bbfac657fb95536f2e942fbd02343bb1185fc68b.zip
Refactoring
Diffstat (limited to 'src/api/authenticate.ts')
-rw-r--r--src/api/authenticate.ts18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/api/authenticate.ts b/src/api/authenticate.ts
index d4cc3fc41f..e044d4ae8b 100644
--- a/src/api/authenticate.ts
+++ b/src/api/authenticate.ts
@@ -1,6 +1,6 @@
import * as express from 'express';
import App from './models/app';
-import User from './models/user';
+import{ default as User, IUser } from './models/user';
import AccessToken from './models/access-token';
import isNativeToken from './common/is-native-token';
@@ -13,7 +13,7 @@ export interface IAuthContext {
/**
* Authenticated user
*/
- user: any;
+ user: IUser;
/**
* Weather if the request is via the User-Native Token or not
@@ -25,11 +25,15 @@ export default (req: express.Request) => new Promise<IAuthContext>(async (resolv
const token = req.body['i'] as string;
if (token == null) {
- return resolve({ app: null, user: null, isSecure: false });
+ return resolve({
+ app: null,
+ user: null,
+ isSecure: false
+ });
}
if (isNativeToken(token)) {
- const user = await User
+ const user: IUser = await User
.findOne({ token: token });
if (user === null) {
@@ -56,6 +60,10 @@ export default (req: express.Request) => new Promise<IAuthContext>(async (resolv
const user = await User
.findOne({ _id: accessToken.user_id });
- return resolve({ app: app, user: user, isSecure: false });
+ return resolve({
+ app: app,
+ user: user,
+ isSecure: false
+ });
}
});