fix(proxy|auth|upstream|templates): 403 errors, gzip decoding, domain name migration

cmd/controllers/login_accounts.go

@@ -38,7 +38,7 @@ func (h *Handler) SelectAccountHandler(w http.ResponseWriter, r *http.Request) {
 	authenticator := auth.NewPhoneNumberAuthenticator(phoneNumber)
 	requestErr := authenticator.RequestSmsCode(selectedAccount)
 	if requestErr != nil {
-		http.Error(w, fmt.Sprintf("Failed to request confirmation code: %v", err), http.StatusInternalServerError)
+		http.Error(w, fmt.Sprintf("Failed to request confirmation code: %v", requestErr), http.StatusInternalServerError)
 		return
 	}
 

main.go

@@ -91,7 +91,7 @@ func main() {
 	handlers := controllers.NewHandlers(templateFs, credentialsStore, domruAPI)
 	handlers.Logger = logger
 
-	upstream, err := url.Parse(constants.BaseUrl)
+	upstream, err := url.Parse(constants.BaseURL)
 	if err != nil {
 		log.Fatal(err)
 	}

pkg/auth/phone_number.go

@@ -3,6 +3,7 @@ package auth
 import (
 	"fmt"
 	"net/http"
+	"net/url"
 	"regexp"
 	"strconv"
 
@@ -57,7 +58,8 @@ func (a *PhoneNumberAuthenticator) isPhoneNumberValid() bool {
 }
 
 func (a *PhoneNumberAuthenticator) requestConfirmationCode(account models.Account) error {
-	confirmURL := fmt.Sprintf("%s/auth/v2/confirmation/%s", constants.BaseUrl, a.phoneNumber)
+	// Properly encode phone number for URL (+ becomes %2B)
+	confirmURL := fmt.Sprintf("%s/auth/v2/confirmation/%s", constants.BaseURL, url.PathEscape(a.phoneNumber))
 	if account.AccountID == nil {
 		return fmt.Errorf("account id is nil. Account: %v", account)
 	}
@@ -74,7 +76,8 @@ func (a *PhoneNumberAuthenticator) requestConfirmationCode(account models.Accoun
 }
 
 func (a *PhoneNumberAuthenticator) sendConfirmationCode(smsCode string, account models.Account) (models.AuthenticationResponse, error) {
-	confirmURL := fmt.Sprintf("%s/auth/v3/auth/%s/confirmation", constants.BaseUrl, a.phoneNumber)
+	// Properly encode phone number for URL (+ becomes %2B)
+	confirmURL := fmt.Sprintf("%s/auth/v3/auth/%s/confirmation", constants.BaseURL, url.PathEscape(a.phoneNumber))
 	if account.ProfileID == nil {
 		return models.AuthenticationResponse{}, fmt.Errorf("profile id is nil. Account: %v", account)
 	}

pkg/domru/apiWrapper.go

@@ -21,7 +21,7 @@ type APIWrapper struct {
 }
 
 func NewDomruAPI(authClient myhttp.HTTPClient) *APIWrapper {
-	return &APIWrapper{authClient: authClient, baseURL: constants.BaseUrl, Logger: slog.Default()}
+	return &APIWrapper{authClient: authClient, baseURL: constants.BaseURL, Logger: slog.Default()}
 }
 
 func (w *APIWrapper) LoginWithPassword(accountID, password string) (models.AuthenticationResponse, error) {
@@ -79,7 +79,8 @@ func (w *APIWrapper) RequestFinances() (models.FinancesResponse, error) {
 func (w *APIWrapper) RequestAccounts(phone string) ([]models.Account, error) {
 	var accounts []models.Account
 
-	loginURL := fmt.Sprintf("%s/auth/v2/login/%s", w.baseURL, phone)
+	// Properly encode phone number for URL (+ becomes %2B)
+	loginURL := fmt.Sprintf("%s/auth/v2/login/%s", w.baseURL, url.PathEscape(phone))
 	err := helpers.NewUpstreamRequest(loginURL).Send(http.MethodGet, &accounts)
 	if err != nil {
 		return nil, fmt.Errorf("request accounts: %w", err)

pkg/domru/constants/main.go

@@ -3,13 +3,11 @@ package constants
 import "fmt"
 
 const (
-	BaseUrl            = "https://myhome.novotelecom.ru"
+	BaseURL            = "https://myhome.proptech.ru"
 	USERAGENT_TEMPLATE = "Google sdkgphone64x8664 | Android 14 | erth | 8.9.2 (8090200)"
 
 	API_HA_NETWORK = "http://supervisor/network/info"
 
-	API_AUTH = "https://api-auth.domru.ru/v1/person/auth"
-
 	API_AUTH_LOGIN            = "%s/auth/v2/login/%s"
 	API_AUTH_CONFIRMATION     = "%s/auth/v2/confirmation/%s"
 	API_AUTH_CONFIRMATION_SMS = "%s/auth/v2/auth/%s/confirmation"

pkg/domru/helpers/upstream_request.go

@@ -15,10 +15,11 @@ import (
 )
 
 var defaultHeaders = map[string]string{
-	"user-agent":      "Google sdkgphone64x8664 | Android 14 | erth | 8.9.2 (8090200) |  | null | 10c99d90-9899-4a25-926f-067b34bc4a7f | null",
-	"content-type":    "application/json; charset=UTF-8",
-	"connection":      "Keep-Alive",
-	"accept-encoding": "gzip",
+	"user-agent":   "Google sdkgphone64x8664 | Android 14 | erth | 8.9.2 (8090200) |  | null | 10c99d90-9899-4a25-926f-067b34bc4a7f | null",
+	"content-type": "application/json; charset=UTF-8",
+	"connection":   "Keep-Alive",
+	// Note: Don't set "accept-encoding" manually. Go's http.Client automatically handles gzip
+	// compression/decompression when you let it manage the Accept-Encoding header.
 }
 
 type UpstreamError struct {

pkg/reverseproxy/main.go

@@ -22,6 +22,7 @@ func (p *ReverseProxy) ProxyRequestHandler() func(http.ResponseWriter, *http.Req
 		// Step 1: rewrite URL
 		req.URL.Scheme = p.target.Scheme
 		req.URL.Host = p.target.Host
+		req.Host = p.target.Host // CRITICAL: Set Host header for upstream (fixes 403 errors)
 		req.RequestURI = ""
 
 		resp, err := p.Client.Do(req)

pkg/tokenmanagement/main.go

@@ -51,7 +51,7 @@ func (v *ValidTokenProvider) RefreshToken() error {
 	}
 
 	var refreshTokenResponse models.AuthenticationResponse
-	refreshURL := fmt.Sprintf(constants.API_REFRESH_SESSION, constants.BaseUrl)
+	refreshURL := fmt.Sprintf(constants.API_REFRESH_SESSION, constants.BaseURL)
 	err = helpers.NewUpstreamRequest(refreshURL,
 		helpers.WithHeader("Bearer", credentials.RefreshToken),
 		helpers.WithHeader("Operator", fmt.Sprint(credentials.OperatorID)),

templates/home.html.tmpl

@@ -80,14 +80,18 @@
             {{ range $index, $ac := $placeEl.Place.AccessControls }}
             {{$snapshotUrl := getSnapshotUrl $.BaseURL $placeEl.Place.ID $ac.ID }}
             {{$streamUrl := "Camera for this index not found ;("}}
-            {{ with (index $.Cameras.Data $index) }}
-                {{$streamUrl = getCameraStreamUrl $.BaseURL .ID }}
+            {{$cameraId := ""}}
+            {{ if lt $index (len $.Cameras.Data) }}
+                {{ with (index $.Cameras.Data $index) }}
+                    {{$streamUrl = getCameraStreamUrl $.BaseURL .ID }}
+                    {{$cameraId = printf "№ %d" .ID }}
+                {{ end }}
             {{ end }}
             {{$openDoorUrl := getOpenDoorUrl $.BaseURL $placeEl.Place.ID $ac.ID }}
 
             <div class="resp-table-row">
                 <div class="table-body-cell">Камера:</div>
-                <div class="table-body-cell">№ {{ (index $.Cameras.Data $index).ID }}</div>
+                <div class="table-body-cell">{{ $cameraId }}</div>
             </div>
             <div class="resp-table-row">
                 <div class="table-body-cell">Адрес:</div>