summaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-11-23 05:43:00 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-11-23 05:43:00 +0900
commit3f8ebac466ece8e9598432f3f574ec44e420c03b (patch)
tree05114fce9728d6ce1deecc1f2eb8a903a22b0100 /src/api
parent:v: (diff)
downloadsharkey-3f8ebac466ece8e9598432f3f574ec44e420c03b.tar.gz
sharkey-3f8ebac466ece8e9598432f3f574ec44e420c03b.tar.bz2
sharkey-3f8ebac466ece8e9598432f3f574ec44e420c03b.zip
なんかもうめっちゃ変えた
Closes #940
Diffstat (limited to 'src/api')
-rw-r--r--src/api/common/push-sw.ts6
-rw-r--r--src/api/private/signup.ts2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/api/common/push-sw.ts b/src/api/common/push-sw.ts
index 782a4a6a6c..2993c760ee 100644
--- a/src/api/common/push-sw.ts
+++ b/src/api/common/push-sw.ts
@@ -4,7 +4,11 @@ import Subscription from '../models/sw-subscription';
import config from '../../conf';
if (config.sw) {
- push.setGCMAPIKey(config.sw.gcm_api_key);
+ // アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録
+ push.setVapidDetails(
+ config.maintainer.url,
+ config.sw.public_key,
+ config.sw.private_key);
}
export default async function(userId: mongo.ObjectID | string, type, body?) {
diff --git a/src/api/private/signup.ts b/src/api/private/signup.ts
index e24734f80c..466c6a489f 100644
--- a/src/api/private/signup.ts
+++ b/src/api/private/signup.ts
@@ -9,7 +9,7 @@ import generateUserToken from '../common/generate-native-user-token';
import config from '../../conf';
recaptcha.init({
- secret_key: config.recaptcha.secretKey
+ secret_key: config.recaptcha.secret_key
});
const home = {