graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-23 16:44:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor: Extract isNativeToken method

Browse source
This commit is contained in:
syuilo 2017-01-06 11:07:42 +09:00
parent 733b3d8132
commit 86548f6468
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/api/authenticate.ts
View file

@ -2,6 +2,7 @@ import * as express from 'express';
import App from './models/app'; import App from './models/app';
import User from './models/user'; import User from './models/user';
import Userkey from './models/userkey'; import Userkey from './models/userkey';
import isNativeToken from './common/is-native-token';
export interface IAuthContext { export interface IAuthContext {
/** /**
@ -27,7 +28,7 @@ export default (req: express.Request) => new Promise<IAuthContext>(async (resolv
return resolve({ app: null, user: null, isSecure: false }); return resolve({ app: null, user: null, isSecure: false });
} }
if (token[0] == '!') { if (isNativeToken(token)) {
const user = await User const user = await User
.findOne({ token: token }); .findOne({ token: token });

1
src/api/common/is-native-token.ts Normal file
View file

@ -0,0 +1 @@
export default (token: string) => token[0] == '!';

3
src/api/streaming.ts
View file

@ -3,6 +3,7 @@ import * as websocket from 'websocket';
import * as redis from 'redis'; import * as redis from 'redis';
import User from './models/user'; import User from './models/user';
import Userkey from './models/userkey'; import Userkey from './models/userkey';
import isNativeToken from './common/is-native-token';
import homeStream from './stream/home'; import homeStream from './stream/home';
import messagingStream from './stream/messaging'; import messagingStream from './stream/messaging';
@ -50,7 +51,7 @@ module.exports = (server: http.Server) => {
function authenticate(connection: websocket.connection, token: string): Promise<any> { function authenticate(connection: websocket.connection, token: string): Promise<any> {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
if (token[0] == '!') { if (isNativeToken(token)) {
// Fetch user // Fetch user
// SELECT _id // SELECT _id
const user = await User const user = await User