Merge pull request #956 from JustaPenguin/sign-up-fix

don't stop sign ups for non-acsr enabled servers

Author: Hecrer

championship_manager.go

@@ -213,31 +213,33 @@ func (cm *ChampionshipManager) BuildChampionshipOpts(r *http.Request) (champions
 	opts.Championship = championship
 	opts.ACSREnabled = cm.acsrClient.Enabled
 
-	ranges, err := cm.LoadACSRRanges()
+	if opts.ACSREnabled {
+		ranges, err := cm.LoadACSRRanges()
 
-	if err != nil {
-		logrus.WithError(err).Errorf("couldn't load ACSR skill/safety range information")
-	} else {
-		highestSkillCount := 0
-		highestSafetyCount := 0
-
-		for _, acsrRange := range ranges {
-			switch acsrRange.RatingType {
-			case "skill":
-				if acsrRange.Count > highestSkillCount {
-					highestSkillCount = acsrRange.Count
-				}
-			case "safety":
-				if acsrRange.Count > highestSafetyCount {
-					highestSafetyCount = acsrRange.Count
+		if err != nil {
+			logrus.WithError(err).Errorf("couldn't load ACSR skill/safety range information")
+		} else {
+			highestSkillCount := 0
+			highestSafetyCount := 0
+
+			for _, acsrRange := range ranges {
+				switch acsrRange.RatingType {
+				case "skill":
+					if acsrRange.Count > highestSkillCount {
+						highestSkillCount = acsrRange.Count
+					}
+				case "safety":
+					if acsrRange.Count > highestSafetyCount {
+						highestSafetyCount = acsrRange.Count
+					}
 				}
 			}
-		}
 
-		opts.ACSRRanges = &ACSRRanges{
-			Ranges:             ranges,
-			HighestSkillCount:  highestSkillCount,
-			HighestSafetyCount: highestSafetyCount,
+			opts.ACSRRanges = &ACSRRanges{
+				Ranges:             ranges,
+				HighestSkillCount:  highestSkillCount,
+				HighestSafetyCount: highestSafetyCount,
+			}
 		}
 	}
 
@@ -1698,15 +1700,23 @@ func (cm *ChampionshipManager) HandleChampionshipSignUp(r *http.Request) (respon
 		return signUpResponse, false, ValidationError("Please enter a valid SteamID64.")
 	}
 
-	rating, err := cm.LoadACSRRating(signUpResponse.GUID)
+	serverOptions, err := cm.store.LoadServerOptions()
 
 	if err != nil {
-		logrus.WithError(err).Errorf("Couldn't load ACSR rating for guid: %s", signUpResponse.GUID)
-		return signUpResponse, false, ValidationError("Please register your GUID to an account with ACSR.")
+		return signUpResponse, false, err
 	}
 
-	if !championship.DriverMeetsACSRGates(rating) {
-		return signUpResponse, false, ValidationError("You do not meet the minimum ACSR skill/safety requirements.")
+	if serverOptions.EnableACSR {
+		rating, err := cm.LoadACSRRating(signUpResponse.GUID)
+
+		if err != nil {
+			logrus.WithError(err).Errorf("Couldn't load ACSR rating for guid: %s", signUpResponse.GUID)
+			return signUpResponse, false, ValidationError("Please register your GUID to an account with ACSR.")
+		}
+
+		if !championship.DriverMeetsACSRGates(rating) {
+			return signUpResponse, false, ValidationError("You do not meet the minimum ACSR skill/safety requirements.")
+		}
 	}
 
 	for _, entrant := range championship.SignUpForm.Responses {

championships_handler.go

@@ -188,9 +188,30 @@ func (ch *ChampionshipsHandler) view(w http.ResponseWriter, r *http.Request) {
 type ACSRRatingGateMet struct {
 	ACSRDriverRating *ACSRDriverRating `json:"acsr_driver_rating"`
 	GateMet          bool              `json:"gate_met"`
+	ACSREnabled      bool              `json:"acsr_enabled"`
 }
 
 func (ch *ChampionshipsHandler) acsrRating(w http.ResponseWriter, r *http.Request) {
+	serverOptions, err := ch.championshipManager.store.LoadServerOptions()
+
+	if err != nil {
+		logrus.WithError(err).Error("acsr rating: couldn't load server options")
+		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+		return
+	}
+
+	if !serverOptions.EnableACSR {
+		ratingGateMet := &ACSRRatingGateMet{
+			ACSRDriverRating: &ACSRDriverRating{},
+			GateMet:          true,
+			ACSREnabled:      false,
+		}
+
+		_ = json.NewEncoder(w).Encode(ratingGateMet)
+
+		return
+	}
+
 	guid := chi.URLParam(r, "guid")
 	championshipID := chi.URLParam(r, "championshipID")
 
@@ -215,6 +236,7 @@ func (ch *ChampionshipsHandler) acsrRating(w http.ResponseWriter, r *http.Reques
 	ratingGateMet := &ACSRRatingGateMet{
 		ACSRDriverRating: rating,
 		GateMet:          gateMet,
+		ACSREnabled:      true,
 	}
 
 	_ = json.NewEncoder(w).Encode(ratingGateMet)

cmd/server-manager/typescript/src/Championship.ts

@@ -7,6 +7,7 @@ declare var CanMoveChampionshipEvents: boolean;
 interface ACSRDriverRatingGateMet {
     acsr_driver_rating: ACSRDriverRating;
     gate_met: boolean;
+    acsr_enabled: boolean;
 }
 
 interface ACSRDriverRating {
@@ -104,6 +105,10 @@ export namespace Championship {
                         data: "",
                         dataType: "json"
                     }).then((response: ACSRDriverRatingGateMet) => {
+                        if (!response.acsr_enabled) {
+                            return
+                        }
+
                         if (response.acsr_driver_rating == null) {
                             let notFoundSpan = $('<span />');
                             let notFoundLink = $(`<a />`);

cmd/server-manager/views/pages/championships/sign-up.html

@@ -208,7 +208,7 @@ <h1 class="text-center">
         {{ end }}
 
         <div class="mt-5">
-            <button type="submit" disabled class="btn btn-success float-right" id="register-for-championship">Register</button>
+            <button type="submit" {{ if $championship.ACSR }}disabled id="register-for-championship"{{ end }} class="btn btn-success float-right">Register</button>
         </div>
     </form>