Clean up recent API changes

api/common.go

@@ -15,29 +15,7 @@ func Init() {
 	daily.Init()
 }
 
-func getUsernameFromRequest(r *http.Request) (string, error) {
+func getTokenFromRequest(r *http.Request) ([]byte, error) {
-	if r.Header.Get("Authorization") == "" {
-		return "", fmt.Errorf("missing token")
-	}
-
-	token, err := base64.StdEncoding.DecodeString(r.Header.Get("Authorization"))
-	if err != nil {
-		return "", fmt.Errorf("failed to decode token: %s", err)
-	}
-
-	if len(token) != account.TokenSize {
-		return "", fmt.Errorf("invalid token length: got %d, expected %d", len(token), account.TokenSize)
-	}
-
-	username, err := db.FetchUsernameFromToken(token)
-	if err != nil {
-		return "", fmt.Errorf("failed to validate token: %s", err)
-	}
-
-	return username, nil
-}
-
-func getUUIDFromRequest(r *http.Request) ([]byte, error) {
 	if r.Header.Get("Authorization") == "" {
 		return nil, fmt.Errorf("missing token")
 	}
@@ -51,6 +29,29 @@ func getUUIDFromRequest(r *http.Request) ([]byte, error) {
 		return nil, fmt.Errorf("invalid token length: got %d, expected %d", len(token), account.TokenSize)
 	}
 
+	return token, nil
+}
+
+func getUsernameFromRequest(r *http.Request) (string, error) {
+	token, err := getTokenFromRequest(r)
+	if err != nil {
+		return "", err
+	}
+
+	username, err := db.FetchUsernameFromToken(token)
+	if err != nil {
+		return "", fmt.Errorf("failed to validate token: %s", err)
+	}
+
+	return username, nil
+}
+
+func getUUIDFromRequest(r *http.Request) ([]byte, error) {
+	token, err := getTokenFromRequest(r)
+	if err != nil {
+		return nil, err
+	}
+
 	uuid, err := db.FetchUUIDFromToken(token)
 	if err != nil {
 		return nil, fmt.Errorf("failed to validate token: %s", err)

api/endpoints.go

@@ -189,76 +189,55 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 
 		var token []byte
-		token, err = base64.StdEncoding.DecodeString(r.Header.Get("Authorization"))
+		token, err = getTokenFromRequest(r)
 		if err != nil {
-			httpError(w, r, fmt.Errorf("failed to decode token: %s", err), http.StatusBadRequest)
+			httpError(w, r, err, http.StatusBadRequest)
 			return
 		}
 
+		var active bool
+		if r.URL.Path == "/savedata/get" {
+			err = db.UpdateActiveSession(uuid, token)
+			if err != nil {
+				httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusBadRequest)
+				return
+			}
+		} else {
+			active, err = db.IsActiveSession(token)
+			if err != nil {
+				httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest)
+				return
+			}
+
+			// TODO: make this not suck
+			if !active && r.URL.Path != "/savedata/clear"{
+				httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest)
+				return
+			}
+		}
+
 		switch r.URL.Path {
 		case "/savedata/get":
-			err = db.UpdateActiveSession(uuid, token)
-			if err != nil {
-				httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusInternalServerError)
-				return
-			}
-
 			save, err = savedata.Get(uuid, datatype, slot)
 		case "/savedata/update":
-			var token []byte
-			token, err = base64.StdEncoding.DecodeString(r.Header.Get("Authorization"))
-			if err != nil {
-				httpError(w, r, fmt.Errorf("failed to decode token: %s", err), http.StatusBadRequest)
-				return
-			}
-
-			var active bool
-			active, err = db.IsActiveSession(token)
-			if err != nil {
-				httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusInternalServerError)
-				return
-			}
-			if !active {
-				httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest)
-				return
-			}
-
 			err = savedata.Update(uuid, slot, save)
 		case "/savedata/delete":
-			var active bool
-			active, err = db.IsActiveSession(token)
-			if err != nil {
-				httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusInternalServerError)
-				return
-			}
-			if !active {
-				httpError(w, r, fmt.Errorf("session out of date"), http.StatusBadRequest)
-				return
-			}
-
 			err = savedata.Delete(uuid, datatype, slot)
 		case "/savedata/clear":
-			var active bool
+			if !active {
-			active, err = db.IsActiveSession(token)
+				// TODO: make this not suck
-			if err != nil {
+				save = savedata.ClearResponse{Error: "session out of date"}
-				httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusInternalServerError)
+				break
-				return
 			}
 
-			if active {
+			s, ok := save.(defs.SessionSaveData)
-				s, ok := save.(defs.SessionSaveData)
+			if !ok {
-				if !ok {
+				err = fmt.Errorf("save data is not type SessionSaveData")
-					httpError(w, r, fmt.Errorf("save data is not type SessionSaveData"), http.StatusBadRequest)
+				break
-					return
-				}
-
-				// doesn't return a save, but it works
-				save, err = savedata.Clear(uuid, slot, daily.Seed(), s)
-			} else {
-				var response savedata.ClearResponse
-				response.Error = "session out of date"
-				save = response
 			}
+
+			// doesn't return a save, but it works
+			save, err = savedata.Clear(uuid, slot, daily.Seed(), s)
 		}
 		if err != nil {
 			httpError(w, r, err, http.StatusInternalServerError)