Merge branch 'main' into mpa_docsApi2_20230516

zitadel · May 17, 2023 · ef7b36e · ef7b36e
2 parents 21b3aa2 + 885e338
commit ef7b36e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/internal/api/ui/console/console.go b/internal/api/ui/console/console.go
@@ -116,12 +116,13 @@ func Start(config Config, externalSecure bool, issuer op.IssuerFromRequest, call
 			http.Error(w, fmt.Sprintf("unable to template instance management url for console: %v", err), http.StatusInternalServerError)
 			return
 		}
-		environmentJSON, err := createEnvironmentJSON(url, issuer(r), instance.ConsoleClientID(), customerPortal, instanceMgmtURL)
+		exhausted := limitingAccessInterceptor.Limit(ctx)
+		environmentJSON, err := createEnvironmentJSON(url, issuer(r), instance.ConsoleClientID(), customerPortal, instanceMgmtURL, exhausted)
 		if err != nil {
 			http.Error(w, fmt.Sprintf("unable to marshal env for console: %v", err), http.StatusInternalServerError)
 			return
 		}
-		if limitingAccessInterceptor.Limit(ctx) {
+		if exhausted {
 			limitingAccessInterceptor.SetExhaustedCookie(w, r)
 		} else {
 			limitingAccessInterceptor.DeleteExhaustedCookie(w, r)
@@ -154,19 +155,21 @@ func csp() *middleware.CSP {
 	return &csp
 }
 
-func createEnvironmentJSON(api, issuer, clientID, customerPortal, instanceMgmtUrl string) ([]byte, error) {
+func createEnvironmentJSON(api, issuer, clientID, customerPortal, instanceMgmtUrl string, exhausted bool) ([]byte, error) {
 	environment := struct {
 		API                   string `json:"api,omitempty"`
 		Issuer                string `json:"issuer,omitempty"`
 		ClientID              string `json:"clientid,omitempty"`
 		CustomerPortal        string `json:"customer_portal,omitempty"`
 		InstanceManagementURL string `json:"instance_management_url,omitempty"`
+		Exhausted             bool   `json:"exhausted,omitempty"`
 	}{
 		API:                   api,
 		Issuer:                issuer,
 		ClientID:              clientID,
 		CustomerPortal:        customerPortal,
 		InstanceManagementURL: instanceMgmtUrl,
+		Exhausted:             exhausted,
 	}
 	return json.Marshal(environment)
 }