From 22e14490d23a94554309cc0acf9c0a6fb0af7fa3 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Thu, 8 Jun 2017 20:24:49 +0200
Subject: [PATCH] build: fix dashboard error (#5010)

* Fixes a TypeScript error in the dashboard functions.
---
 tools/dashboard/functions/jwt/verify-token.ts | 4 +++-
 tools/dashboard/functions/package.json        | 6 +++---
 tools/dashboard/functions/tsconfig.json       | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/dashboard/functions/jwt/verify-token.ts b/tools/dashboard/functions/jwt/verify-token.ts
index de0c477af1c..6630fc03063 100644
--- a/tools/dashboard/functions/jwt/verify-token.ts
+++ b/tools/dashboard/functions/jwt/verify-token.ts
@@ -9,7 +9,9 @@ const repoSlug = config().repoSlug;
 
 export function verifyToken(token: string): boolean {
   try {
-    const tokenPayload = verify(token, jwtSecret, {issuer: 'Travis CI, GmbH'});
+    // The returned value of the verify method can be either a string or a object. Reading
+    // properties without explicitly treating the result as `any` will lead to a TypeScript error.
+    const tokenPayload = verify(token, jwtSecret, {issuer: 'Travis CI, GmbH'}) as any;
 
     if (tokenPayload.slug !== repoSlug) {
       console.log(`JWT slugs are not matching. Expected ${repoSlug}`);
diff --git a/tools/dashboard/functions/package.json b/tools/dashboard/functions/package.json
index 05380e83503..5ea08a76d2c 100644
--- a/tools/dashboard/functions/package.json
+++ b/tools/dashboard/functions/package.json
@@ -3,12 +3,12 @@
   "version": "0.0.1",
   "main": "index.js",
   "dependencies": {
-    "@types/jsonwebtoken": "^7.2.0",
+    "@types/jsonwebtoken": "^7.2.1",
     "firebase-admin": "~4.2.1",
     "firebase-functions": "^0.5.7",
     "jsonwebtoken": "^7.4.1",
     "request": "^2.81.0",
-    "ts-node": "^3.0.4",
-    "typescript": "^2.3.3"
+    "ts-node": "^3.0.6",
+    "typescript": "^2.3.4"
   }
 }
diff --git a/tools/dashboard/functions/tsconfig.json b/tools/dashboard/functions/tsconfig.json
index ead7ebada8a..eb99d5842d9 100644
--- a/tools/dashboard/functions/tsconfig.json
+++ b/tools/dashboard/functions/tsconfig.json
@@ -8,7 +8,8 @@
     "sourceMap": true,
     "target": "es5",
     "baseUrl": "",
-    "outDir": "../../../dist/dashboard-functions/"
+    "outDir": "../../../dist/dashboard-functions/",
+    "types": ["jsonwebtoken"]
   },
   "files": [
     "./functions.ts"