check validity of invite before accepting

tidepool-org · Dec 12, 2017 · 378e504 · 378e504 · jh-bate · Dec 12, 2017
1 parent 6cafd48
commit 378e504
Show file tree

Hide file tree

Showing 7 changed files with 259 additions and 186 deletions.
diff --git a/api/forgot_test.go b/api/forgot_test.go
@@ -30,7 +30,7 @@ func TestForgotResponds(t *testing.T) {
 			method:   "PUT",
 			url:      "/accept/forgot",
 			respCode: 200,
-			body: jo{
+			body: testJSONObject{
 				"key":      "1234_aK3yxxx123",
 				"email":    "me@myemail.com",
 				"password": "myN3wpa55w0rd",
@@ -48,7 +48,7 @@ func TestForgotResponds(t *testing.T) {
 			method:     "PUT",
 			url:        "/accept/forgot",
 			respCode:   404,
-			body: jo{
+			body: testJSONObject{
 				"key":      "1234_no_match",
 				"email":    "me@myemail.com",
 				"password": "myN3wpa55w0rd",
@@ -88,7 +88,7 @@ func TestForgotResponds(t *testing.T) {
 
 		if response.Body.Len() != 0 && len(test.response) != 0 {
 			// compare bodies by comparing the unmarshalled JSON results
-			var result = &jo{}
+			var result = &testJSONObject{}
 
 			if err := json.NewDecoder(response.Body).Decode(result); err != nil {
 				t.Logf("Err decoding nonempty response body: [%v]\n [%v]\n", err, response.Body)

diff --git a/api/hydrophoneApi.go b/api/hydrophoneApi.go
@@ -32,7 +32,7 @@ type (
 	}
 	Config struct {
 		ServerSecret string `json:"serverSecret"` //used for services
-		WebURL      string `json:"webUrl"`
+		WebURL       string `json:"webUrl"`
 		AssetURL     string `json:"assetUrl"`
 	}
 
@@ -256,15 +256,15 @@ func (a *Api) token(res http.ResponseWriter, req *http.Request) *shoreline.Token
 		td := a.sl.CheckToken(token)
 
 		if td == nil {
-			statusErr := &status.StatusError{status.NewStatus(http.StatusForbidden, STATUS_INVALID_TOKEN)}
+			statusErr := &status.StatusError{Status: status.NewStatus(http.StatusForbidden, STATUS_INVALID_TOKEN)}
 			log.Printf("token %s err[%v] ", STATUS_INVALID_TOKEN, statusErr)
 			a.sendModelAsResWithStatus(res, statusErr, http.StatusForbidden)
 			return nil
 		}
 		//all good!
 		return td
 	}
-	statusErr := &status.StatusError{status.NewStatus(http.StatusUnauthorized, STATUS_NO_TOKEN)}
+	statusErr := &status.StatusError{Status: status.NewStatus(http.StatusUnauthorized, STATUS_NO_TOKEN)}
 	log.Printf("token %s err[%v] ", STATUS_NO_TOKEN, statusErr)
 	a.sendModelAsResWithStatus(res, statusErr, http.StatusUnauthorized)
 	return nil

diff --git a/api/hydrophoneApi_test.go b/api/hydrophoneApi_test.go
@@ -97,20 +97,21 @@ func (m *testingShorelingMock) CheckToken(token string) *shoreline.TokenData {
 type (
 	//common test structure
 	toTest struct {
+		desc       string
 		skip       bool
 		returnNone bool
 		method     string
 		url        string
-		body       jo
+		body       testJSONObject
 		token      string
 		respCode   int
-		response   jo
+		response   testJSONObject
 	}
 	// These two types make it easier to define blobs of json inline.
 	// We don't use the types defined by the API because we want to
 	// be able to test with partial data structures.
-	// jo is a generic json object
-	jo map[string]interface{}
+	// testJSONObject is a generic json object
+	testJSONObject map[string]interface{}
 
 	// and ja is a generic json array
 	ja []interface{}
@@ -153,10 +154,10 @@ func TestGetStatus_StatusInternalServerError(t *testing.T) {
 	}
 }
 
-func (i *jo) deepCompare(j *jo) string {
-	for k, _ := range *i {
+func (i *testJSONObject) deepCompare(j *testJSONObject) string {
+	for k := range *i {
 		if reflect.DeepEqual((*i)[k], (*j)[k]) == false {
-			return fmt.Sprintf("for [%s] was [%v] expected [%v] ", k, (*i)[k], (*j)[k])
+			return fmt.Sprintf("`%s` expected `%v` actual `%v` ", k, (*j)[k], (*i)[k])
 		}
 	}
 	return ""