Merge pull request #507 from teharrison/master

auth fix

RELEASE_NOTES.txt

@@ -1,3 +1,8 @@
+# v0.9.43
+
+- lots of bug fixes
+- lots of locking
+- globus auth fix
 
 # v0.9.33
 

lib/auth/globus/globus.go

@@ -126,6 +126,18 @@ func fetchProfile(t string) (u *user.User, err error) {
 }
 
 func clientId(t string) string {
+	// test for old format first
+	var cid string
+	for _, part := range strings.Split(t, "|") {
+		if kv := strings.Split(part, "="); kv[0] == "client_id" {
+			cid = kv[1]
+			break
+		}
+	}
+	if cid != "" {
+		return cid
+	}
+	// now use new format
 	client := &http.Client{
 		Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}},
 	}

lib/conf/conf.go

@@ -14,7 +14,7 @@ import (
 	"github.com/MG-RAST/golib/goconfig/config"
 )
 
-const VERSION string = "0.9.42"
+const VERSION string = "0.9.43"
 
 var GIT_COMMIT_HASH string // use -ldflags "-X github.com/MG-RAST/AWE/lib/conf.GIT_COMMIT_HASH <value>"
 const BasePriority int = 1