0.2.45 - Server side git commits

server/internal/api/api.go

@@ -22,6 +22,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ponzischeme89/memby/server/internal/appupdate"
 	"github.com/ponzischeme89/memby/server/internal/bazarr"
 	"github.com/ponzischeme89/memby/server/internal/cache"
 	"github.com/ponzischeme89/memby/server/internal/config"
@@ -269,8 +270,10 @@ func (s *Server) authed(h authedFunc) http.Handler {
 		}
 		sess = s.captureClientIdentity(r, sess)
 		identify(r.Context(), sess)
-		decision := s.updateDecision(r)
-		if mustRetireForUpdate(decision, clientVersion(r)) {
+		policy := s.updatePolicy.get()
+		decision := appupdate.Decide(effectiveUpdatePolicy(policy), clientVersion(r))
+		retireBelow := destructiveUpdateFloor(policy)
+		if mustRetireForUpdate(decision, clientVersion(r), retireBelow) {
 			// Mirror an ordinary sign-out closely enough that this token cannot be restored
 			// from either database or Redis. The 401 is intentional: every supported client
 			// treats it as authoritative and removes the rejected local profile.
@@ -282,7 +285,7 @@ func (s *Server) authed(h authedFunc) http.Handler {
 			s.loggerFor(r.Context()).Info("signed out for required update",
 				"device_id", sess.DeviceID,
 				"from", clientLogValue(clientVersion(r)),
-				"minimum", forcedUpdateFloor,
+				"minimum", retireBelow,
 				"to", decision.Version,
 			)
 			w.Header().Set("X-Memby-Update-Required", decision.Version)