From ee1f1c3d5c3e92649a215cbaf81afcf02dead4a0 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Thu, 11 Feb 2016 13:46:11 -0800
Subject: [PATCH] Fix cert look up causing crash

---
 server/boot/user.js | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/server/boot/user.js b/server/boot/user.js
index 5edcf506c31..8452462e8ba 100644
--- a/server/boot/user.js
+++ b/server/boot/user.js
@@ -307,14 +307,8 @@ module.exports = function(app) {
 
   function showCert(certType, req, res, next) {
     const username = req.params.username.toLowerCase();
-    const { user } = req;
     const certId = certIds[certType];
-    Observable.just(user)
-      .flatMap(user => {
-        if (user && user.username === username) {
-          return Observable.just(user);
-        }
-        return findUserByUsername$(username, {
+    return findUserByUsername$(username, {
           isGithubCool: true,
           isCheater: true,
           isLocked: true,
@@ -325,11 +319,10 @@ module.exports = function(app) {
           isHonest: true,
           username: true,
           name: true,
-          [ `challengesMap.${certId}` ]: true
-        });
+          challengeMap: true
       })
       .subscribe(
-        (user) => {
+        user => {
           if (!user) {
             req.flash('errors', {
               msg: `We couldn't find the user with the username ${username}`
@@ -378,8 +371,8 @@ module.exports = function(app) {
 
           if (user[certType]) {
 
-            const { completedDate = new Date() } =
-              user.challengeMap[certId] || {};
+            const { challengeMap = {} } = user;
+            const { completedDate = new Date() } = challengeMap[certId] || {};
 
             return res.render(
               certViews[certType],