Resolves #99, show dashboard without the ?dashboard queryparam

Author: Adam Tuttle

core/api.cfc

@@ -53,10 +53,24 @@
 			</cfif>
 		</cfif>
 		<cfif !isUnhandledPathRequest(arguments.targetPath)>
-			<!--- if browsing to root of api, redirect to dashboard --->
-			<cfif NOT application._taffy.settings.disableDashboard AND NOT structKeyExists(url,application._taffy.settings.endpointURLParam) AND NOT structKeyExists(form,application._taffy.settings.endpointURLParam) AND len(cgi.path_info) lte 1 and len(cgi.query_string) eq 0 and listLast(cgi.script_name, "/") eq "index.cfm">
-				<cfset local.basePath = listDeleteAt(cgi.script_name,listLen(cgi.script_name,"/"),"/") />
-				<cflocation url="#local.basePath#/?#application._taffy.settings.dashboardKey#" addtoken="false" />
+			<!--- if browsing to root of api, show dashboard --->
+			<cfif
+				NOT structKeyExists(url,application._taffy.settings.endpointURLParam)
+				AND NOT structKeyExists(form,application._taffy.settings.endpointURLParam)
+				AND len(cgi.path_info) lte 1
+				AND listLast(cgi.script_name, "/") eq "index.cfm">
+				<cfif NOT application._taffy.settings.disableDashboard>
+					<cfset requestStartEvent() />
+					<cfinclude template="dashboard.cfm" />
+					<cfabort />
+				<cfelse>
+					<cfif len(application._taffy.settings.disabledDashboardRedirect)>
+						<cflocation url="#application._taffy.settings.disabledDashboardRedirect#" addtoken="false" />
+						<cfabort />
+					<cfelse>
+						<cfset throwError(403, "Forbidden") />
+					</cfif>
+				</cfif>
 			</cfif>
 		<cfelse>
 			<!--- allow pass-thru for selected paths --->
@@ -300,6 +314,7 @@
 		<cfset local.defaultConfig.representationClass = "taffy.core.nativeJsonRepresentation" />
 		<cfset local.defaultConfig.dashboardKey = "dashboard" />
 		<cfset local.defaultConfig.disableDashboard = false />
+		<cfset local.defaultConfig.disabledDashboardRedirect = "" />
 		<cfset local.defaultConfig.unhandledPaths = "/flex2gateway" />
 		<cfset local.defaultConfig.allowCrossDomain = false />
 		<cfset local.defaultConfig.useEtags = false />

tests/tests/TestCore.cfc

@@ -452,6 +452,41 @@
 			debug(local.result);
 			assertEquals(200,val(local.result.statusCode));
 		}
+
+		function allows_dashboard_when_enabled(){
+			var restore = application._taffy.settings.disableDashboard;
+			application._taffy.settings.disableDashboard = false;
+			local.result = apiCall("get", "/", "");
+			debug(local.result);
+			assertEquals(200, val(local.result.statusCode));
+
+			application._taffy.settings.disableDashboard = restore;
+		}
+
+		function returns_403_at_root_when_dashboard_disabled_with_no_redirect(){
+			var restore = application._taffy.settings.disableDashboard;
+			application._taffy.settings.disableDashboard = true;
+			local.result = apiCall("get", "/", "");
+			debug(local.result);
+			assertEquals(403, val(local.result.statusCode));
+
+			application._taffy.settings.disableDashboard = restore;
+		}
+
+		function returns_302_at_root_when_dashboard_disabled_with_redirect(){
+			var restore1 = application._taffy.settings.disableDashboard;
+			var restore2 = application._taffy.settings.disabledDashboardRedirect;
+			application._taffy.settings.disableDashboard = true;
+			application._taffy.settings.disabledDashboardRedirect = 'http://google.com';
+			local.result = apiCall("get", "/", "");
+			debug(local.result);
+			assertEquals(302, val(local.result.statusCode));
+			assertTrue(structKeyExists(local.result.responseHEader, "location"));
+			assertEquals(application._taffy.settings.disabledDashboardRedirect, local.result.responseHeader.location);
+
+			application._taffy.settings.disableDashboard = restore1;
+			application._taffy.settings.disabledDashboardRedirect = restore2;
+		}
 	</cfscript>