summaryrefslogtreecommitdiff
path: root/src/server/api/private
diff options
context:
space:
mode:
authorAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-02 13:15:53 +0900
committerAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-02 13:15:53 +0900
commit3fb6834f7d06d52163102b69afe353f8c65ee003 (patch)
tree2d44fc013296310c1a9baed62f45f89ec1fd179d /src/server/api/private
parentAbolish common and misc directories (diff)
downloadsharkey-3fb6834f7d06d52163102b69afe353f8c65ee003.tar.gz
sharkey-3fb6834f7d06d52163102b69afe353f8c65ee003.tar.bz2
sharkey-3fb6834f7d06d52163102b69afe353f8c65ee003.zip
Introduce config module
Diffstat (limited to 'src/server/api/private')
-rw-r--r--src/server/api/private/signin.ts2
-rw-r--r--src/server/api/private/signup.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts
index 99ba51b416..bf883ee27a 100644
--- a/src/server/api/private/signin.ts
+++ b/src/server/api/private/signin.ts
@@ -5,7 +5,7 @@ import User, { ILocalUser } from '../../../models/user';
import Signin, { pack } from '../../../models/signin';
import event from '../../../event';
import signin from '../common/signin';
-import config from '../../../conf';
+import config from '../../../config';
export default async (req: express.Request, res: express.Response) => {
res.header('Access-Control-Allow-Origin', config.url);
diff --git a/src/server/api/private/signup.ts b/src/server/api/private/signup.ts
index 45b978d0b6..4203ce526d 100644
--- a/src/server/api/private/signup.ts
+++ b/src/server/api/private/signup.ts
@@ -5,7 +5,7 @@ import { generate as generateKeypair } from '../../../crypto_key';
import recaptcha = require('recaptcha-promise');
import User, { IUser, validateUsername, validatePassword, pack } from '../../../models/user';
import generateUserToken from '../common/generate-native-user-token';
-import config from '../../../conf';
+import config from '../../../config';
recaptcha.init({
secret_key: config.recaptcha.secret_key