Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/server/api/models/auth-session.ts
View file

@ -3,11 +3,15 @@ import deepcopy = require('deepcopy');
import db from '../../../db/mongodb';
import { pack as packApp } from './app';
const AuthSession = db.get('auth_sessions');
const AuthSession = db.get<IAuthSession>('authSessions');
export default AuthSession;
export interface IAuthSession {
_id: mongo.ObjectID;
createdAt: Date;
appId: mongo.ObjectID;
userId: mongo.ObjectID;
token: string;
}
/**
@ -24,7 +28,6 @@ export const pack = (
let _session: any;
// TODO: Populate session if it ID
_session = deepcopy(session);
// Me
@ -39,7 +42,7 @@ export const pack = (
delete _session._id;
// Populate app
_session.app = await packApp(_session.app_id, me);
_session.app = await packApp(_session.appId, me);
resolve(_session);
});