✨ 完成fcm推送

xkrfer · Apr 17, 2022 · 7c42395 · 7c42395
1 parent be10f88
commit 7c42395
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/src/helpers/send.ts b/src/helpers/send.ts
@@ -66,11 +66,10 @@ if (FCM_API_KEY && FCM_PRIVATE_KEY && FCM_PUBLIC_KEY) {
 }
 
 export async function sendByFCM(pushSubscription: string, message: string) {
-  if (!pushSubscription || !(FCM_API_KEY && FCM_PRIVATE_KEY && FCM_PUBLIC_KEY))
-    return;
-  try {
-    await webpush.sendNotification(JSON.parse(pushSubscription), message);
-  } catch (err) {
-    logger.error('sendByFCM error', err);
-  }
+  logger.log(`fcm: ${message}`);
+  await webpush
+    .sendNotification(JSON.parse(pushSubscription), message)
+    .catch((err) => {
+      logger.error(err);
+    });
 }
diff --git a/src/modules/device/device.controller.ts b/src/modules/device/device.controller.ts
@@ -75,7 +75,10 @@ export class DeviceController {
   @Post('bind/fcm')
   @HttpCode(200)
   async bindFCM(@Body() body: BindDeviceFCMDto, @Session() session) {
-    const status = await this.deviceService.removeDevice(body, session.user);
+    const status = await this.deviceService.bindDeviceWithFCM(
+      body,
+      session.user,
+    );
     return {
       code: status ? Code.DONE : Code.ARGS,
       error: '设备不存在或已注销',

diff --git a/src/modules/login/login.controller.ts b/src/modules/login/login.controller.ts
@@ -54,7 +54,6 @@ export class LoginController {
   @Get('github')
   async githubLogin(@Query() query, @Res() res) {
     const token = await this.loginService.githubLogin(query.code);
-    // 设置cookie,signed启用加密
     res.cookie('token', token, {
       maxAge: 1000 * 60,
       httpOnly: false,

diff --git a/src/modules/user/user.controller.ts b/src/modules/user/user.controller.ts
@@ -1,6 +1,6 @@
 import {
   Body,
-  Controller,
+  Controller, Get,
   HttpCode,
   Post,
   Session,
@@ -36,7 +36,7 @@ export class UserController {
     };
   }
 
-  @Post('config')
+  @Get('config')
   @HttpCode(200)
   @ApiOperation({ summary: '获取配置' })
   async getConfig() {

diff --git a/static/dist/assets/index.deec828e.css → static/dist/assets/index.21dbb922.css b/static/dist/assets/index.deec828e.css → static/dist/assets/index.21dbb922.css
diff --git a/static/dist/assets/index.b34e7d35.js b/static/dist/assets/index.b34e7d35.js
diff --git a/static/dist/assets/index.fa27ff90.js b/static/dist/assets/index.fa27ff90.js
diff --git a/static/dist/index.html b/static/dist/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" href="/favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>pushdeer-web</title>
-    <script type="module" crossorigin src="/assets/index.fa27ff90.js"></script>
-    <link rel="stylesheet" href="/assets/index.deec828e.css">
+    <script type="module" crossorigin src="/assets/index.b34e7d35.js"></script>
+    <link rel="stylesheet" href="/assets/index.21dbb922.css">
   </head>
   <body>
     <div id="app"></div>