kaori 4 лет назад
Родитель
Сommit
4b833ea4a7

+ 1 - 1
packages/slackbot-proxy/src/controllers/growi-to-slack.ts

@@ -90,7 +90,7 @@ export class GrowiToSlackCtrl {
     // retrieve latest Order with Installation
     const order = await this.orderRepository.createQueryBuilder('order')
       .orderBy('order.createdAt', 'DESC')
-      .where('growiAccessToken = :token', { token: tokenGtoP })
+      .where('proxyAccessToken = :token', { token: tokenGtoP })
       .leftJoinAndSelect('order.installation', 'installation')
       .getOne();
 

+ 3 - 9
packages/slackbot-proxy/src/entities/order.ts

@@ -31,16 +31,10 @@ export class Order {
   proxyAccessToken?: string;
 
   isExpired():boolean {
-    const createdTime = (new Date(this.createdAt)).getTime();
     const currentTime = (new Date()).getTime();
-    console.log('createdTime', createdTime);
-    console.log('currentTime', currentTime);
-    if (this.createdAt != null && currentTime < createdTime + 600000) {
-      console.log('isExpiredです');
-      return true;
-    }
-    console.log('isNotExpiredです');
-    return false;
+    const expiredAt = this.createdAt.getTime() + 600000;
+
+    return expiredAt < currentTime;
   }
 
 }