see ubccpsc#31 fix tests (was too aggressive on the log outputs)

Author: rtholmes

packages/portal/backend/src/controllers/DatabaseController.ts

@@ -198,22 +198,22 @@ export class DatabaseController {
     */
 
     public async deleteAuth(record: Auth): Promise<boolean> {
-        Log.info("DatabaseController::deleteAuth( "+record.personId+" ) - start");
         if (record !== null) {
+            Log.info("DatabaseController::deleteAuth( " + record.personId + " ) - start");
             return await this.deleteRecord(this.AUTHCOLL, {personId: record.personId});
         }
     }
 
     public async deleteRepository(record: Repository): Promise<boolean> {
-        Log.info("DatabaseController::deleteRepository( "+record.id+" ) - start");
         if (record !== null) {
+            Log.info("DatabaseController::deleteRepository( " + record.id + " ) - start");
             return await this.deleteRecord(this.REPOCOLL, {id: record.id});
         }
     }
 
     public async deleteTeam(record: Team): Promise<boolean> {
-        Log.info("DatabaseController::deleteTeam( "+record.id+" ) - start");
         if (record !== null) {
+            Log.info("DatabaseController::deleteTeam( " + record.id + " ) - start");
             return await this.deleteRecord(this.TEAMCOLL, {id: record.id});
         }
     }

packages/portal/backend/src/controllers/PersonController.ts

@@ -67,6 +67,7 @@ export class PersonController {
      * @returns {boolean}
      */
     public async getPerson(personId: string): Promise<Person | null> {
+        Log.trace("PersonController::getPerson( ... ) - start");
         Log.trace("PersonController::getPerson( " + personId + " ) - start");
 
         let person = await this.db.getPerson(personId);

packages/portal/backend/src/server/common/AuthRoutes.ts

@@ -143,6 +143,10 @@ export class AuthRoutes implements IREST {
                 handleError("Login error; user not valid.");
             }
         }).then(function (isPrivileged) {
+            if (typeof isPrivileged === 'undefined') {
+                Log.warn('RouteHandler::getCredentials(..) - failsafe; DEBUG this case?');
+                isPrivileged = {isAdmin: false, isStaff: false}; // fail safe
+            }
             payload = {success: {personId: user, token: token, isAdmin: isPrivileged.isAdmin, isStaff: isPrivileged.isStaff}};
             Log.info('RouteHandler::getCredentials(..) - sending 200; isPriv: ' + (isPrivileged.isStaff || isPrivileged.isAdmin));
             res.send(200, payload);
@@ -267,7 +271,7 @@ export class AuthRoutes implements IREST {
             // auth written (or not); we only really care about the state of p at this point
 
 
-            Log.info("AuthRouteHandler::authCallback(..) - preparing redirect for: " + JSON.stringify(p));
+            Log.info("AuthRoutes::authCallback(..) - preparing redirect for: " + JSON.stringify(p));
             let feUrl = config.getProp(ConfigKey.backendUrl);
             let fePort = config.getProp(ConfigKey.backendPort);
 
@@ -279,7 +283,7 @@ export class AuthRoutes implements IREST {
                 if (feUrl.indexOf('//') > 0) {
                     feUrl = feUrl.substr(feUrl.indexOf('//') + 2, feUrl.length);
                 }
-                Log.trace("RouteHandler::authCallback(..) - /authCallback - redirect homepage URL: " + feUrl);
+                Log.trace("AuthRoutes::authCallback(..) - /authCallback - redirect homepage URL: " + feUrl);
 
                 res.redirect({
                     hostname: feUrl,
@@ -289,7 +293,7 @@ export class AuthRoutes implements IREST {
                 }, next);
             } else {
 
-                Log.trace("RouteHandler::authCallback(..) - /authCallback - redirect logout URL: " + feUrl);
+                Log.trace("AuthRoutes::authCallback(..) - /authCallback - redirect logout URL: " + feUrl);
 
                 res.redirect({
                     hostname: feUrl,
@@ -299,7 +303,7 @@ export class AuthRoutes implements IREST {
             }
         }).catch(function (err) {
             // code incorrect or expired
-            Log.error("AuthRouteHandler::authCallback(..) - /authCallback - ERROR: " + err);
+            Log.error("AuthRoutes::authCallback(..) - /authCallback - ERROR: " + err);
             // NOTE: should this be returning 400 or something?
             return next();
         });

packages/portal/backend/test/server/SDMMRoutesSpec.ts

@@ -183,7 +183,6 @@ describe('SDMM Routes', function () {
     }).timeout(1000 * 30);
 
     it('Should provision a d0 repo.', async function () {
-
         let response = null;
         const url = '/portal/sdmm/performAction/provisionD0';
         try {

testOutput/index.html

@@ -3,10 +3,14 @@
 	<title>Classy CI Artifacts</title>
 </head>
 <body style="font-size: 2em;">
+	
 	<!-- These resources are created by the CI environment and are not actually checked into version control -->
-	<br/><a href="backend/test/index.html">Backend Test Results</a>
-	<br/><a href="backend/coverage/index.html">Backend Coverage Report</a>
-	<br/><a href="autotest/test/index.html">Autotest Test Results</a>
-	<br/><a href="autotest/coverage/index.html">Autotest Coverage Report</a>	
+	<center>
+		<h2>Classy CI Artifacts</h2>
+		<a href="backend/test/index.html">Backend Test Results</a>
+		<br/><a href="backend/coverage/index.html">Backend Coverage Report</a>
+		<br/><a href="autotest/test/index.html">Autotest Test Results</a>
+		<br/><a href="autotest/coverage/index.html">Autotest Coverage Report</a>
+	</center>
 </body>
 </html>