Refactored redirect code

opdetails.go

@@ -0,0 +1,86 @@
+// The Isomorphic Go Project
+// Copyright (c) Wirecog, LLC. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license, which can be found in the LICENSE file.
+
+package isokit
+
+import "github.com/gopherjs/gopherjs/js"
+
+type OperatingDetails struct {
+	Environment int
+	Runtime     int
+}
+
+const (
+	ServerEnvironment = iota
+	WebBrowserEnvironment
+)
+
+const (
+	GoRuntime = iota
+	JSRuntime
+)
+
+var (
+	operatingEnvironment int
+	operatingRuntime     int
+)
+
+func isJSRuntime() bool {
+	return js.Global != nil
+}
+
+func isGoRuntime() bool {
+	return !isJSRuntime()
+}
+
+func isWebBrowserEnvironment() bool {
+	return isJSRuntime() && js.Global.Get("document") != js.Undefined
+}
+
+func isServerEnvironment() bool {
+
+	if isGoRuntime() == true {
+		return true
+	} else if isJSRuntime() == true {
+		return !isWebBrowserEnvironment()
+	} else {
+		return true
+	}
+
+}
+
+func OperatingEnvironment() int {
+	return operatingEnvironment
+}
+
+func OperatingRuntime() int {
+	return operatingRuntime
+}
+
+func initializeOperatingDetails() {
+
+	if isJSRuntime() == true {
+		operatingRuntime = WebBrowserEnvironment
+	}
+
+	if isGoRuntime() == true {
+		operatingRuntime = GoRuntime
+	}
+
+	if isServerEnvironment() == true {
+		operatingEnvironment = ServerEnvironment
+	}
+
+	if isWebBrowserEnvironment() == true {
+		operatingEnvironment = WebBrowserEnvironment
+	}
+
+}
+
+func init() {
+
+	initializeOperatingDetails()
+
+}

redirect.go

@@ -8,13 +8,12 @@ package isokit
 import (
 	"net/http"
 
-	"github.com/go-humble/detect"
 	"github.com/gopherjs/gopherjs/js"
 )
 
 // ServerRedirect performs a redirect when operating on the server-side.
 func ServerRedirect(w http.ResponseWriter, r *http.Request, destinationURL string) {
-	http.Redirect(w, r, destinationURL, 301)
+	http.Redirect(w, r, destinationURL, 302)
 }
 
 // ClientRedirect performs a redirect when operating on the client-side.
@@ -30,11 +29,11 @@ func Redirect(items ...interface{}) {
 	var w http.ResponseWriter
 	var r *http.Request
 
-	if detect.IsServer() && len(items) != 3 {
+	if OperatingEnvironment() == ServerEnvironment && len(items) != 3 {
 		return
 	}
 
-	if detect.IsBrowser() && len(items) != 1 {
+	if OperatingEnvironment() == WebBrowserEnvironment && len(items) != 1 {
 		return
 	}
 
@@ -51,7 +50,7 @@ func Redirect(items ...interface{}) {
 
 	}
 
-	if detect.IsServer() && (w == nil || r == nil) {
+	if OperatingEnvironment() == ServerEnvironment && (w == nil || r == nil) {
 		return
 	}
 
@@ -59,11 +58,11 @@ func Redirect(items ...interface{}) {
 		return
 	}
 
-	switch {
-	case detect.IsBrowser():
+	switch OperatingEnvironment() {
+	case WebBrowserEnvironment:
 		ClientRedirect(url)
 
-	case detect.IsServer():
+	case ServerEnvironment:
 		ServerRedirect(w, r, url)
 	}
 }