Address feedback

Author: devversion

tools/dashboard/functions/functions.ts

@@ -0,0 +1 @@
+export {payloadGithubStatus} from './payload-github-status';

tools/dashboard/functions/github-status.ts renamed to tools/dashboard/functions/github/github-status.ts

@@ -1,5 +1,10 @@
+import {config} from 'firebase-functions';
+
 const request = require('request');
-const {version, name} = require('./package.json');
+const {version, name} = require('../package.json');
+
+/** API token for the Github repository. Required to set the github status on commits and PRs. */
+const repoToken = config().repoToken;
 
 /** Data that must be specified to set a Github PR status. */
 export type GithubStatusData = {
@@ -10,7 +15,7 @@ export type GithubStatusData = {
 };
 
 /** Function that sets a Github commit status */
-export function setGithubStatus(commitSHA: string, authToken: string, data: GithubStatusData) {
+export function setGithubStatus(commitSHA: string, data: GithubStatusData) {
   const state = data.result ? 'success' : 'failure';
 
   const requestData = JSON.stringify({
@@ -21,7 +26,7 @@ export function setGithubStatus(commitSHA: string, authToken: string, data: Gith
   });
 
   const headers = {
-    'Authorization': `token ${authToken}`,
+    'Authorization': `token ${repoToken}`,
     'User-Agent': `${name}/${version}`,
     'Content-Type': 'application/json',
     'Content-Length': Buffer.byteLength(requestData)

tools/dashboard/functions/index.js

@@ -12,9 +12,5 @@ require('ts-node').register({
   project: path.join(__dirname, 'tsconfig.json')
 });
 
-const functionExports = require('./dashboard-functions');
-
-// Re-export every firebase function from TypeScript
-Object.keys(functionExports).forEach(fnName => {
-  module.exports[fnName] = functionExports[fnName];
-});
+// Export all functions from the TypeScript source.
+Object.assign(exports, require('./functions'));

tools/dashboard/functions/jwt/verify-token.ts

@@ -0,0 +1,22 @@
+import {verify} from 'jsonwebtoken';
+import {config} from 'firebase-functions';
+
+/** The JWT secret. This is used to validate JWT. */
+const jwtSecret = config().jwtSecret;
+
+/** The repo slug. This is used to validate the JWT is sent from correct repo. */
+const repoSlug = config().repoSlug;
+
+export function verifyToken(token: string): boolean {
+  try {
+    const tokenPayload = verify(token, jwtSecret, {issuer: 'Travis CI, GmbH'});
+
+    if (tokenPayload.slug !== repoSlug) {
+      console.log(`JWT slugs are not matching. Expected ${repoSlug}`);
+    }
+
+    return true;
+  } catch (e) {
+    return false;
+  }
+}

tools/dashboard/functions/dashboard-functions.ts renamed to tools/dashboard/functions/payload-github-status.ts

@@ -1,15 +1,6 @@
-import {https, config} from 'firebase-functions';
-import {verify} from 'jsonwebtoken';
-import {setGithubStatus} from './github-status';
-
-/** The repo slug. This is used to validate the JWT is sent from correct repo. */
-const repoSlug = config().repoSlug;
-
-/** API token for the Github repository. Required to set the github status on commits and PRs. */
-const repoToken = config().repoToken;
-
-/** The JWT secret. This is used to validate JWT. */
-const jwtSecret = config().jwtSecret;
+import {https} from 'firebase-functions';
+import {verifyToken} from './jwt/verify-token';
+import {setGithubStatus} from './github/github-status';
 
 export const payloadGithubStatus = https.onRequest(async (request, response) => {
   const authToken = request.header('auth-token');
@@ -28,7 +19,7 @@ export const payloadGithubStatus = https.onRequest(async (request, response) =>
     return response.status(400).json({message: 'No valid payload diff has been specified.'});
   }
 
-  await setGithubStatus(commitSha, repoToken, {
+  await setGithubStatus(commitSha, {
     result: true,
     name: 'Library Payload',
     url: `https://travis-ci.org/angular/material2/jobs/${process.env['TRAVIS_JOB_ID']}`,
@@ -37,15 +28,3 @@ export const payloadGithubStatus = https.onRequest(async (request, response) =>
 
   response.json({message: 'Payload Github status successfully set.'});
 });
-
-function verifyToken(token: string): boolean {
-  try {
-    const tokenPayload = verify(token, jwtSecret, {issuer: 'Travis CI, GmbH'});
-    if (tokenPayload.slug !== repoSlug) {
-      console.log(`JWT slugs are not matching. Expected ${repoSlug}`);
-    }
-    return true;
-  } catch (e) {
-    return false;
-  }
-}

tools/dashboard/functions/tsconfig.json

@@ -11,6 +11,6 @@
     "outDir": "../../../dist/dashboard-functions/"
   },
   "files": [
-    "./dashboard-functions.ts"
+    "./functions.ts"
   ]
 }