summaryrefslogtreecommitdiff
path: root/src/api/private
diff options
context:
space:
mode:
authorこぴなたみぽ <syuilotan@yahoo.co.jp>2018-02-02 10:31:17 +0900
committerこぴなたみぽ <syuilotan@yahoo.co.jp>2018-02-02 10:31:17 +0900
commit2cb0511dba7463ad50725fd2dfd1966f0a108a45 (patch)
treed55ae280443ce1a78c1771d678e666246c1271f4 /src/api/private
parentwip (diff)
downloadsharkey-2cb0511dba7463ad50725fd2dfd1966f0a108a45.tar.gz
sharkey-2cb0511dba7463ad50725fd2dfd1966f0a108a45.tar.bz2
sharkey-2cb0511dba7463ad50725fd2dfd1966f0a108a45.zip
wip
Diffstat (limited to 'src/api/private')
-rw-r--r--src/api/private/signin.ts3
-rw-r--r--src/api/private/signup.ts3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/api/private/signin.ts b/src/api/private/signin.ts
index ab6e93562c..b49d25d99a 100644
--- a/src/api/private/signin.ts
+++ b/src/api/private/signin.ts
@@ -2,8 +2,7 @@ import * as express from 'express';
import * as bcrypt from 'bcryptjs';
import * as speakeasy from 'speakeasy';
import { default as User, IUser } from '../models/user';
-import Signin from '../models/signin';
-import { pack } from '../models/signin';
+import Signin, { pack } from '../models/signin';
import event from '../event';
import signin from '../common/signin';
import config from '../../conf';
diff --git a/src/api/private/signup.ts b/src/api/private/signup.ts
index 105fe319a5..392f3b1fc7 100644
--- a/src/api/private/signup.ts
+++ b/src/api/private/signup.ts
@@ -3,8 +3,7 @@ import * as express from 'express';
import * as bcrypt from 'bcryptjs';
import recaptcha = require('recaptcha-promise');
import { default as User, IUser } from '../models/user';
-import { validateUsername, validatePassword } from '../models/user';
-import { pack } from '../models/user';
+import { validateUsername, validatePassword }, { pack } from '../models/user';
import generateUserToken from '../common/generate-native-user-token';
import config from '../../conf';