Просмотр исходного кода

Merge pull request #3773 from weseek/imprv/gw5555-order-isExpired-new

implement isExpired
Yuki Takei 4 лет назад
Родитель
Сommit
d1f2a61b09

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

@@ -91,7 +91,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();
 

+ 4 - 2
packages/slackbot-proxy/src/entities/order.ts

@@ -31,8 +31,10 @@ export class Order {
   proxyAccessToken?: string;
 
   isExpired():boolean {
-    // TODO GW-5555 implement this
-    return false;
+    const now = Date.now();
+    const expiredAt = this.createdAt.getTime() + 600000;
+
+    return expiredAt < now;
   }
 
 }