🏷️ fix types

messages/bg-BG.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Базово удостоверяване чрез заглавие",
     "policyAuthHeaderAuthDescription": "Валидирайте собствено HTTP заглавие и стойност при всяка заявка",
     "policyAuthHeaderAuthSummary": "Конфигурирано заглавие",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Име на заглавието",
+    "policyAuthHeaderValue": "Очаквана стойност",
     "policyAuthSetPasscode": "Задайте парола",
     "policyAuthSetPincode": "Задайте ПИН код",
     "policyAuthSetEmailWhitelist": "Задайте списък с имейли",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Домейни",
     "billingOrganizations": "Организации",
     "billingRemoteExitNodes": "Дистанционни възли",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Няма конфигуриран лимит",
     "billingEstimatedPeriod": "Очакван период на фактуриране",
     "billingIncludedUsage": "Включено използване",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Колко потребители можете да използвате",
     "billingDomainInfo": "Колко домейни можете да използвате",
     "billingRemoteExitNodesInfo": "Колко дистанционни възли можете да използвате",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Лицензионни ключове",
     "billingLicenseKeysDescription": "Управлявайте вашите абонаменти за лицензионни ключове",
     "billingLicenseSubscription": "Абонамент за лиценз",

messages/cs-CZ.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Základní Ověření Záhlaví",
     "policyAuthHeaderAuthDescription": "Ověřit vlastní HTTP hlavičku názvu a hodnoty při každém požadavku",
     "policyAuthHeaderAuthSummary": "Nastaveno hlavička",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Název hlavičky",
+    "policyAuthHeaderValue": "Očekávaná hodnota",
     "policyAuthSetPasscode": "Nastavit přístupový kód",
     "policyAuthSetPincode": "Nastavit PIN kód",
     "policyAuthSetEmailWhitelist": "Nastavit e-mailový whitelist",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Domény",
     "billingOrganizations": "Tělo",
     "billingRemoteExitNodes": "Vzdálené uzly",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Žádný limit nenastaven",
     "billingEstimatedPeriod": "Odhadované období fakturace",
     "billingIncludedUsage": "Zahrnuto využití",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Kolik uživatelů můžete použít",
     "billingDomainInfo": "Kolik domén můžete použít",
     "billingRemoteExitNodesInfo": "Kolik vzdálených uzlů můžete použít",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Licenční klíče",
     "billingLicenseKeysDescription": "Spravovat předplatné licenčního klíče",
     "billingLicenseSubscription": "Předplatné licence",

messages/da-DK.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Grunnleggende Header Autentificering",
     "policyAuthHeaderAuthDescription": "Bekræft et tilpasset HTTP-headernavn og værdi ved hver forespørgsel",
     "policyAuthHeaderAuthSummary": "Header konfigureret",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Headernavn",
+    "policyAuthHeaderValue": "Forventet værdi",
     "policyAuthSetPasscode": "Angiv adgangskode",
     "policyAuthSetPincode": "Sett PIN-kode",
     "policyAuthSetEmailWhitelist": "Angiv e-mail hviteliste",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Domæner",
     "billingOrganizations": "Orger",
     "billingRemoteExitNodes": "Eksterne noder",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Ingen grænse konfigureret",
     "billingEstimatedPeriod": "Estimert faktureringsperiode",
     "billingIncludedUsage": "Inklusive Brug",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Hvor mange brugere du kan bruge",
     "billingDomainInfo": "Hvor mange domæner du kan bruge",
     "billingRemoteExitNodesInfo": "Hvor mange fjernnoder du kan bruge",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Licensnøgler",
     "billingLicenseKeysDescription": "Administrer dine licensnøgleabonnementer",
     "billingLicenseSubscription": "Licens abonnement",

messages/de-DE.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Grundlegende Header-Authentifizierung",
     "policyAuthHeaderAuthDescription": "Überprüfen Sie einen benutzerdefinierten HTTP-Headernamen und -wert bei jeder Anfrage",
     "policyAuthHeaderAuthSummary": "Header konfiguriert",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Header-Name",
+    "policyAuthHeaderValue": "Erwarteter Wert",
     "policyAuthSetPasscode": "Passcode setzen",
     "policyAuthSetPincode": "PIN-Code festlegen",
     "policyAuthSetEmailWhitelist": "E-Mail-Whitelist festlegen",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Domänen",
     "billingOrganizations": "Orden",
     "billingRemoteExitNodes": "Entfernte Knoten",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Kein Limit konfiguriert",
     "billingEstimatedPeriod": "Geschätzter Abrechnungszeitraum",
     "billingIncludedUsage": "Inklusive Nutzung",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Wie viele Benutzer Sie verwenden können",
     "billingDomainInfo": "Wie viele Domains Sie verwenden können",
     "billingRemoteExitNodesInfo": "Wie viele entfernte Knoten Sie verwenden können",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Lizenzschlüssel",
     "billingLicenseKeysDescription": "Verwalten Sie Ihre Lizenzschlüssel Abonnements",
     "billingLicenseSubscription": "Lizenzabonnement",

messages/en-US.json

@@ -1503,6 +1503,7 @@
     "otpAuthDescription": "Enter the code from your authenticator app or one of your single-use backup codes.",
     "otpAuthSubmit": "Submit Code",
     "idpContinue": "Or continue with",
+    "idpLastUsed": "Last used",
     "otpAuthBack": "Back to Password",
     "navbar": "Navigation Menu",
     "navbarDescription": "Main navigation menu for the application",
@@ -1915,6 +1916,9 @@
     "billingDomains": "Domains",
     "billingOrganizations": "Orgs",
     "billingRemoteExitNodes": "Remote Nodes",
+    "billingPublicResources": "Public Resources",
+    "billingPrivateResources": "Private Resources",
+    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "No limit configured",
     "billingEstimatedPeriod": "Estimated Billing Period",
     "billingIncludedUsage": "Included Usage",
@@ -1943,6 +1947,9 @@
     "billingUsersInfo": "How many users you can use",
     "billingDomainInfo": "How many domains you can use",
     "billingRemoteExitNodesInfo": "How many remote nodes you can use",
+    "billingPublicResourcesInfo": "How many public resources you can use",
+    "billingPrivateResourcesInfo": "How many private resources you can use",
+    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "License Keys",
     "billingLicenseKeysDescription": "Manage your license key subscriptions",
     "billingLicenseSubscription": "License Subscription",

messages/es-ES.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Autenticación Básica del Encabezado",
     "policyAuthHeaderAuthDescription": "Valida un nombre y valor de encabezado HTTP personalizado en cada petición",
     "policyAuthHeaderAuthSummary": "Encabezado configurado",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Nombre del encabezado",
+    "policyAuthHeaderValue": "Valor esperado",
     "policyAuthSetPasscode": "Establecer Código de Acceso",
     "policyAuthSetPincode": "Establecer Código PIN",
     "policyAuthSetEmailWhitelist": "Establecer Lista Blanca de Correo",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Dominios",
     "billingOrganizations": "Orgánico",
     "billingRemoteExitNodes": "Nodos remotos",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "No se ha configurado ningún límite",
     "billingEstimatedPeriod": "Período de facturación estimado",
     "billingIncludedUsage": "Uso incluido",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Cuántos usuarios puedes usar",
     "billingDomainInfo": "Cuántos dominios puedes usar",
     "billingRemoteExitNodesInfo": "Cuántos nodos remotos puedes usar",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Claves de licencia",
     "billingLicenseKeysDescription": "Administrar las suscripciones de su clave de licencia",
     "billingLicenseSubscription": "Suscripción de licencia",

messages/fr-FR.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Authentification de l'en-tête de base",
     "policyAuthHeaderAuthDescription": "Validez un nom et une valeur d'en-tête HTTP personnalisé à chaque requête",
     "policyAuthHeaderAuthSummary": "En-tête configuré",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Nom de l'en-tête",
+    "policyAuthHeaderValue": "Valeur attendue",
     "policyAuthSetPasscode": "Définir le code confidentiel",
     "policyAuthSetPincode": "Définir le code PIN",
     "policyAuthSetEmailWhitelist": "Définir la liste blanche des e-mails",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Domaines",
     "billingOrganizations": "Organes",
     "billingRemoteExitNodes": "Nœuds distants",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Aucune limite configurée",
     "billingEstimatedPeriod": "Période de facturation estimée",
     "billingIncludedUsage": "Utilisation incluse",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Combien d'utilisateurs vous pouvez utiliser",
     "billingDomainInfo": "Combien de domaines vous pouvez utiliser",
     "billingRemoteExitNodesInfo": "Combien de nœuds distants vous pouvez utiliser",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Clés de licence",
     "billingLicenseKeysDescription": "Gérer vos abonnements à la clé de licence",
     "billingLicenseSubscription": "Abonnement à la licence",

messages/it-IT.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Autenticazione Header Base",
     "policyAuthHeaderAuthDescription": "Convalida un nome e un valore di intestazione HTTP personalizzato su ogni richiesta",
     "policyAuthHeaderAuthSummary": "Intestazione configurata",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Nome dell'intestazione",
+    "policyAuthHeaderValue": "Valore atteso",
     "policyAuthSetPasscode": "Imposta Codice di Accesso",
     "policyAuthSetPincode": "Imposta Codice PIN",
     "policyAuthSetEmailWhitelist": "Imposta Lista Autorizzazioni Email",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Domini",
     "billingOrganizations": "Organi",
     "billingRemoteExitNodes": "Nodi Remoti",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Nessun limite configurato",
     "billingEstimatedPeriod": "Periodo di Fatturazione Stimato",
     "billingIncludedUsage": "Utilizzo Incluso",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Quanti utenti puoi usare",
     "billingDomainInfo": "Quanti domini puoi usare",
     "billingRemoteExitNodesInfo": "Quanti nodi remoti puoi usare",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Chiavi di Licenza",
     "billingLicenseKeysDescription": "Gestisci le sottoscrizioni alla chiave di licenza",
     "billingLicenseSubscription": "Abbonamento Licenza",

messages/ko-KR.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "기본 헤더 인증",
     "policyAuthHeaderAuthDescription": "각 요청에서 맞춤 HTTP 헤더 이름 및 값을 검증",
     "policyAuthHeaderAuthSummary": "헤더 구성됨",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "헤더 이름",
+    "policyAuthHeaderValue": "예상 값",
     "policyAuthSetPasscode": "패스코드 설정",
     "policyAuthSetPincode": "PIN 코드 설정",
     "policyAuthSetEmailWhitelist": "이메일 화이트리스트 설정",
@@ -1915,9 +1915,6 @@
     "billingDomains": "도메인",
     "billingOrganizations": "조직",
     "billingRemoteExitNodes": "원격 노드",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "구성된 한도가 없습니다.",
     "billingEstimatedPeriod": "예상 청구 기간",
     "billingIncludedUsage": "포함 사용량",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "사용할 수 있는 사용자 수",
     "billingDomainInfo": "사용할 수 있는 도메인 수",
     "billingRemoteExitNodesInfo": "사용할 수 있는 원격 노드 수",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "라이센스 키",
     "billingLicenseKeysDescription": "라이센스 키 구독을 관리하세요",
     "billingLicenseSubscription": "라이센스 구독",

messages/nb-NO.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Grunnleggende Header Autentisering",
     "policyAuthHeaderAuthDescription": "Bekreft et tilpasset HTTP-headernavn og verdi ved hver forespørsel",
     "policyAuthHeaderAuthSummary": "Header konfigurert",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Headernavn",
+    "policyAuthHeaderValue": "Forventet verdi",
     "policyAuthSetPasscode": "Angi passordkode",
     "policyAuthSetPincode": "Sett PIN-kode",
     "policyAuthSetEmailWhitelist": "Angi e-post hviteliste",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Domener",
     "billingOrganizations": "Orger",
     "billingRemoteExitNodes": "Eksterne Noder",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Ingen grense konfigurert",
     "billingEstimatedPeriod": "Estimert faktureringsperiode",
     "billingIncludedUsage": "Inkludert Bruk",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Hvor mange brukere du kan bruke",
     "billingDomainInfo": "Hvor mange domener du kan bruke",
     "billingRemoteExitNodesInfo": "Hvor mange fjernnoder du kan bruke",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Lisensnøkler",
     "billingLicenseKeysDescription": "Administrer dine lisensnøkkelabonnementer",
     "billingLicenseSubscription": "Lisens abonnement",

messages/nl-NL.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Basic Header Authenticatie",
     "policyAuthHeaderAuthDescription": "Valideer een aangepaste HTTP-headernaam en waarde bij elk verzoek",
     "policyAuthHeaderAuthSummary": "Header geconfigureerd",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Header naam",
+    "policyAuthHeaderValue": "Verwachte waarde",
     "policyAuthSetPasscode": "Stel toegangscode in",
     "policyAuthSetPincode": "Stel Pincode in",
     "policyAuthSetEmailWhitelist": "Stel E-mail Whitelist in",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Domeinen",
     "billingOrganizations": "Ordenen",
     "billingRemoteExitNodes": "Externe knooppunten",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Geen limiet ingesteld",
     "billingEstimatedPeriod": "Geschatte Facturatie Periode",
     "billingIncludedUsage": "Opgenomen Gebruik",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Hoeveel gebruikers je kan gebruiken",
     "billingDomainInfo": "Hoeveel domeinen je kunt gebruiken",
     "billingRemoteExitNodesInfo": "Hoeveel externe nodes je kunt gebruiken",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Licentie Sleutels",
     "billingLicenseKeysDescription": "Beheer uw licentiesleutelabonnementen",
     "billingLicenseSubscription": "Licentie abonnement",

messages/pl-PL.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Podstawowe Uwierzytelnianie Nagłówka",
     "policyAuthHeaderAuthDescription": "Walidacja niestandardowej nazwy i wartości nagłówka HTTP przy każdym żądaniu",
     "policyAuthHeaderAuthSummary": "Skonfigurowany nagłówek",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Nazwa nagłówka",
+    "policyAuthHeaderValue": "Oczekiwana wartość",
     "policyAuthSetPasscode": "Ustaw hasło dostępu",
     "policyAuthSetPincode": "Ustaw kod PIN",
     "policyAuthSetEmailWhitelist": "Ustaw białą listę e-mail",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Domeny",
     "billingOrganizations": "O masie całkowitej pojazdu przekraczającej 5 ton, ale nieprzekraczającej 5 ton",
     "billingRemoteExitNodes": "Zdalne węzły",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Nie skonfigurowano limitu",
     "billingEstimatedPeriod": "Szacowany Okres Rozliczeniowy",
     "billingIncludedUsage": "Zawarte użycie",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Ile użytkowników możesz użyć",
     "billingDomainInfo": "Ile domen możesz użyć",
     "billingRemoteExitNodesInfo": "Ile zdalnych węzłów możesz użyć",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Klucze licencyjne",
     "billingLicenseKeysDescription": "Zarządzaj subskrypcjami kluczy licencyjnych",
     "billingLicenseSubscription": "Subskrypcja licencji",

messages/pt-PT.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Autenticação de Cabeçalho Básico",
     "policyAuthHeaderAuthDescription": "Valide um nome e valor de cabeçalho HTTP personalizado em cada solicitação",
     "policyAuthHeaderAuthSummary": "Cabeçalho configurado",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Nome do Cabeçalho",
+    "policyAuthHeaderValue": "Valor esperado",
     "policyAuthSetPasscode": "Definir Código de Acesso",
     "policyAuthSetPincode": "Definir Código PIN",
     "policyAuthSetEmailWhitelist": "Definir Lista de E-mails Permitidos",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Domínios",
     "billingOrganizations": "Órgãos",
     "billingRemoteExitNodes": "Nós remotos",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Nenhum limite configurado",
     "billingEstimatedPeriod": "Período Estimado de Cobrança",
     "billingIncludedUsage": "Uso Incluído",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Quantos usuários você pode usar",
     "billingDomainInfo": "Quantos domínios você pode usar",
     "billingRemoteExitNodesInfo": "Quantos nós remotos você pode usar",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Chaves de Licença",
     "billingLicenseKeysDescription": "Gerenciar suas subscrições de chave de licença",
     "billingLicenseSubscription": "Assinatura de Licença",

messages/ru-RU.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Базовая аутентификация заголовка",
     "policyAuthHeaderAuthDescription": "Проверка пользовательского имени и значения HTTP-заголовка для каждого запроса",
     "policyAuthHeaderAuthSummary": "Заголовок настроен",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Имя заголовка",
+    "policyAuthHeaderValue": "Ожидаемое значение",
     "policyAuthSetPasscode": "Установить пароль",
     "policyAuthSetPincode": "Установить ПИН-код",
     "policyAuthSetEmailWhitelist": "Установить белый список email",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Домены",
     "billingOrganizations": "Орги",
     "billingRemoteExitNodes": "Удаленные узлы",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Лимит не установлен",
     "billingEstimatedPeriod": "Предполагаемый период выставления счетов",
     "billingIncludedUsage": "Включенное использование",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Сколько пользователей вы можете использовать",
     "billingDomainInfo": "Сколько доменов вы можете использовать",
     "billingRemoteExitNodesInfo": "Сколько удаленных узлов вы можете использовать",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Лицензионные ключи",
     "billingLicenseKeysDescription": "Управление подписками на лицензионные ключи",
     "billingLicenseSubscription": "Лицензионное соглашение",

messages/tr-TR.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "Temel Başlık Kimlik Doğrulama",
     "policyAuthHeaderAuthDescription": "Her istekte özel bir HTTP başlık adını ve değerini doğrulayın",
     "policyAuthHeaderAuthSummary": "Başlık yapılandırıldı",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "Başlık adı",
+    "policyAuthHeaderValue": "Beklenen değer",
     "policyAuthSetPasscode": "Şifreyi Ayarla",
     "policyAuthSetPincode": "PIN Kodunu Ayarla",
     "policyAuthSetEmailWhitelist": "E-posta Beyaz Listesini Ayarla",
@@ -1915,9 +1915,6 @@
     "billingDomains": "Alan Adları",
     "billingOrganizations": "Organizasyonlar",
     "billingRemoteExitNodes": "Uzak Düğümler",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "Hiçbir limit yapılandırılmadı",
     "billingEstimatedPeriod": "Tahmini Fatura Dönemi",
     "billingIncludedUsage": "Dahil Kullanım",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "Kaç tane kullanıcı kullanabileceğiniz",
     "billingDomainInfo": "Kaç tane alan adı kullanabileceğiniz",
     "billingRemoteExitNodesInfo": "Kaç tane uzaktan düğüm kullanabileceğiniz",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "Lisans Anahtarları",
     "billingLicenseKeysDescription": "Lisans anahtarı aboneliklerinizi yönetin",
     "billingLicenseSubscription": "Lisans Aboneliği",

messages/zh-CN.json

@@ -864,8 +864,8 @@
     "policyAuthHeaderAuthTitle": "基础标题认证",
     "policyAuthHeaderAuthDescription": "在每次请求上验证自定义 HTTP 标头名称和值",
     "policyAuthHeaderAuthSummary": "标头已配置",
-    "policyAuthHeaderName": "Username",
-    "policyAuthHeaderValue": "Password",
+    "policyAuthHeaderName": "标头名称",
+    "policyAuthHeaderValue": "预期值",
     "policyAuthSetPasscode": "设定密码",
     "policyAuthSetPincode": "设置 PIN 码",
     "policyAuthSetEmailWhitelist": "设置电子邮件白名单",
@@ -1915,9 +1915,6 @@
     "billingDomains": "域",
     "billingOrganizations": "球队",
     "billingRemoteExitNodes": "远程节点",
-    "billingPublicResources": "Public Resources",
-    "billingPrivateResources": "Private Resources",
-    "billingMachineClients": "Machine Clients",
     "billingNoLimitConfigured": "未配置限制",
     "billingEstimatedPeriod": "估计结算周期",
     "billingIncludedUsage": "包含的使用量",
@@ -1946,9 +1943,6 @@
     "billingUsersInfo": "您可以使用多少用户",
     "billingDomainInfo": "您可以使用多少域",
     "billingRemoteExitNodesInfo": "您可以使用多少远程节点",
-    "billingPublicResourcesInfo": "How many public resources you can use",
-    "billingPrivateResourcesInfo": "How many private resources you can use",
-    "billingMachineClientsInfo": "How many machine clients you can use",
     "billingLicenseKeys": "许可证密钥",
     "billingLicenseKeysDescription": "管理您的许可证密钥订阅",
     "billingLicenseSubscription": "许可订阅",

server/lib/billing/features.ts

@@ -27,6 +27,12 @@ export async function getFeatureDisplayName(
             return "Remote Exit Nodes";
         case LimitId.ORGANIZATIONS:
             return "Organizations";
+        case LimitId.PUBLIC_RESOURCES:
+            return "Public Resources";
+        case LimitId.PRIVATE_RESOURCES:
+            return "Private Resources";
+        case LimitId.MACHINE_CLIENTS:
+            return "Machine Clients";
         case LimitId.TIER1:
             return "Home Lab";
         default:

server/private/routers/billing/getOrgUsage.ts

@@ -104,6 +104,18 @@ export async function getOrgUsage(
             orgId,
             LimitId.ORGANIZATIONS
         );
+        const publicResources = await usageService.getUsage(
+            orgId,
+            LimitId.PUBLIC_RESOURCES
+        );
+        const privateResources = await usageService.getUsage(
+            orgId,
+            LimitId.PRIVATE_RESOURCES
+        );
+        const machineClients = await usageService.getUsage(
+            orgId,
+            LimitId.MACHINE_CLIENTS
+        );
         // const egressData = await usageService.getUsage(
         //     orgId,
         //     FeatureId.EGRESS_DATA_MB
@@ -127,6 +139,15 @@ export async function getOrgUsage(
         if (organizations) {
             usageData.push(organizations);
         }
+        if (publicResources) {
+            usageData.push(publicResources);
+        }
+        if (privateResources) {
+            usageData.push(privateResources);
+        }
+        if (machineClients) {
+            usageData.push(machineClients);
+        }
 
         const orgLimits = await db
             .select()

server/routers/newt/handleNewtPingMessage.ts

@@ -5,8 +5,21 @@ import { Newt } from "@server/db";
 import { eq } from "drizzle-orm";
 import logger from "@server/logger";
 import { sendNewtSyncMessage } from "./sync";
+import semver from "semver";
 import { recordSitePing } from "./pingAccumulator";
 
+const NEWT_SUPPORTS_SYNC_VERSION = ">=1.14.0";
+const PONG = {
+    message: {
+        type: "pong",
+        data: {
+            timestamp: new Date().toISOString()
+        }
+    },
+    broadcast: false,
+    excludeSender: false
+};
+
 /**
  * Handles ping messages from newt clients.
  *
@@ -37,6 +50,14 @@ export const handleNewtPingMessage: MessageHandler = async (context) => {
     // cross-region latency to the database.
     recordSitePing(newt.siteId);
 
+    if (
+        newt.version &&
+        !semver.satisfies(newt.version, NEWT_SUPPORTS_SYNC_VERSION)
+    ) {
+        // Newt does not support the sync message so not checking - stop here -
+        return PONG;
+    }
+
     // Check config version and sync if stale.
     const configVersion = await getClientConfigVersion(newt.newtId);
 
@@ -65,14 +86,5 @@ export const handleNewtPingMessage: MessageHandler = async (context) => {
         await sendNewtSyncMessage(newt, site);
     }
 
-    return {
-        message: {
-            type: "pong",
-            data: {
-                timestamp: new Date().toISOString()
-            }
-        },
-        broadcast: false,
-        excludeSender: false
-    };
+    return PONG;
 };

server/routers/newt/sync.ts

@@ -9,45 +9,45 @@ import {
 import { canCompress } from "@server/lib/clientVersionChecks";
 
 export async function sendNewtSyncMessage(newt: Newt, site: Site) {
-    // const {
-    //     tcpTargets,
-    //     udpTargets,
-    //     validHealthCheckTargets,
-    //     browserGatewayTargets,
-    //     remoteExitNodeSubnets
-    // } = await buildTargetConfigurationForNewtClient(site.siteId);
-    // let exitNode: ExitNode | undefined;
-    // if (site.exitNodeId) {
-    //     [exitNode] = await db
-    //         .select()
-    //         .from(exitNodes)
-    //         .where(eq(exitNodes.exitNodeId, site.exitNodeId))
-    //         .limit(1);
-    // }
-    // const { peers, targets } = await buildClientConfigurationForNewtClient(
-    //     site,
-    //     exitNode
-    // );
-    // await sendToClient(
-    //     newt.newtId,
-    //     {
-    //         type: "newt/sync",
-    //         data: {
-    //             proxyTargets: {
-    //                 udp: udpTargets,
-    //                 tcp: tcpTargets
-    //             },
-    //             healthCheckTargets: validHealthCheckTargets,
-    //             peers: peers,
-    //             clientTargets: targets,
-    //             browserGatewayTargets: browserGatewayTargets,
-    //             remoteExitNodeSubnets: remoteExitNodeSubnets
-    //         }
-    //     },
-    //     {
-    //         compress: canCompress(newt.version, "newt")
-    //     }
-    // ).catch((error) => {
-    //     logger.warn(`Error sending newt sync message:`, error);
-    // });
+    const {
+        tcpTargets,
+        udpTargets,
+        validHealthCheckTargets,
+        browserGatewayTargets,
+        remoteExitNodeSubnets
+    } = await buildTargetConfigurationForNewtClient(site.siteId);
+    let exitNode: ExitNode | undefined;
+    if (site.exitNodeId) {
+        [exitNode] = await db
+            .select()
+            .from(exitNodes)
+            .where(eq(exitNodes.exitNodeId, site.exitNodeId))
+            .limit(1);
+    }
+    const { peers, targets } = await buildClientConfigurationForNewtClient(
+        site,
+        exitNode
+    );
+    await sendToClient(
+        newt.newtId,
+        {
+            type: "newt/sync",
+            data: {
+                proxyTargets: {
+                    udp: udpTargets,
+                    tcp: tcpTargets
+                },
+                healthCheckTargets: validHealthCheckTargets,
+                peers: peers,
+                clientTargets: targets,
+                browserGatewayTargets: browserGatewayTargets,
+                remoteExitNodeSubnets: remoteExitNodeSubnets
+            }
+        },
+        {
+            compress: canCompress(newt.version, "newt")
+        }
+    ).catch((error) => {
+        logger.warn(`Error sending newt sync message:`, error);
+    });
 }

server/setup/ensureActions.ts

@@ -3,8 +3,12 @@ import { db, orgs } from "@server/db";
 import { actions, roles, roleActions } from "@server/db";
 import { eq, inArray } from "drizzle-orm";
 import logger from "@server/logger";
+import { build } from "@server/build";
 
 export async function ensureActions() {
+    if (build == "saas") {
+        return;
+    }
     await db.transaction(async (trx) => {
         const actionIds = Object.values(ActionsEnum);
         const existingActions = await trx.select().from(actions).execute();

src/app/[orgId]/settings/(private)/billing/page.tsx

@@ -158,6 +158,9 @@ const tierLimits: Record<
         domains: number;
         remoteNodes: number;
         organizations: number;
+        publicResources: number;
+        privateResources: number;
+        machineClients: number;
     }
 > = {
     basic: {
@@ -165,35 +168,50 @@ const tierLimits: Record<
         sites: freeLimitSet[LimitId.SITES]?.value ?? 0,
         domains: freeLimitSet[LimitId.DOMAINS]?.value ?? 0,
         remoteNodes: freeLimitSet[LimitId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: freeLimitSet[LimitId.ORGANIZATIONS]?.value ?? 0
+        organizations: freeLimitSet[LimitId.ORGANIZATIONS]?.value ?? 0,
+        publicResources: freeLimitSet[LimitId.PUBLIC_RESOURCES]?.value ?? 0,
+        privateResources: freeLimitSet[LimitId.PRIVATE_RESOURCES]?.value ?? 0,
+        machineClients: freeLimitSet[LimitId.MACHINE_CLIENTS]?.value ?? 0
     },
     tier1: {
         users: tier1LimitSet[LimitId.USERS]?.value ?? 0,
         sites: tier1LimitSet[LimitId.SITES]?.value ?? 0,
         domains: tier1LimitSet[LimitId.DOMAINS]?.value ?? 0,
         remoteNodes: tier1LimitSet[LimitId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: tier1LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0
+        organizations: tier1LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0,
+        publicResources: tier1LimitSet[LimitId.PUBLIC_RESOURCES]?.value ?? 0,
+        privateResources: tier1LimitSet[LimitId.PRIVATE_RESOURCES]?.value ?? 0,
+        machineClients: tier1LimitSet[LimitId.MACHINE_CLIENTS]?.value ?? 0
     },
     tier2: {
         users: tier2LimitSet[LimitId.USERS]?.value ?? 0,
         sites: tier2LimitSet[LimitId.SITES]?.value ?? 0,
         domains: tier2LimitSet[LimitId.DOMAINS]?.value ?? 0,
         remoteNodes: tier2LimitSet[LimitId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: tier2LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0
+        organizations: tier2LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0,
+        publicResources: tier2LimitSet[LimitId.PUBLIC_RESOURCES]?.value ?? 0,
+        privateResources: tier2LimitSet[LimitId.PRIVATE_RESOURCES]?.value ?? 0,
+        machineClients: tier2LimitSet[LimitId.MACHINE_CLIENTS]?.value ?? 0
     },
     tier3: {
         users: tier3LimitSet[LimitId.USERS]?.value ?? 0,
         sites: tier3LimitSet[LimitId.SITES]?.value ?? 0,
         domains: tier3LimitSet[LimitId.DOMAINS]?.value ?? 0,
         remoteNodes: tier3LimitSet[LimitId.REMOTE_EXIT_NODES]?.value ?? 0,
-        organizations: tier3LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0
+        organizations: tier3LimitSet[LimitId.ORGANIZATIONS]?.value ?? 0,
+        publicResources: tier3LimitSet[LimitId.PUBLIC_RESOURCES]?.value ?? 0,
+        privateResources: tier3LimitSet[LimitId.PRIVATE_RESOURCES]?.value ?? 0,
+        machineClients: tier3LimitSet[LimitId.MACHINE_CLIENTS]?.value ?? 0
     },
     enterprise: {
         users: 0, // Custom for enterprise
         sites: 0, // Custom for enterprise
         domains: 0, // Custom for enterprise
         remoteNodes: 0, // Custom for enterprise
-        organizations: 0 // Custom for enterprise
+        organizations: 0, // Custom for enterprise
+        publicResources: 0, // Custom for enterprise
+        privateResources: 0, // Custom for enterprise
+        machineClients: 0 // Custom for enterprise
     }
 };
 
@@ -234,6 +252,9 @@ export default function BillingPage() {
     const DOMAINS = "domains";
     const REMOTE_EXIT_NODES = "remoteExitNodes";
     const ORGINIZATIONS = "organizations";
+    const PUBLIC_RESOURCES = "publicResources";
+    const PRIVATE_RESOURCES = "privateResources";
+    const MACHINE_CLIENTS = "machineClients";
 
     // Confirmation dialog state
     const [showConfirmDialog, setShowConfirmDialog] = useState(false);
@@ -797,6 +818,45 @@ export default function BillingPage() {
             });
         }
 
+        // Check public resources
+        const publicResourcesUsage = getUsageValue(PUBLIC_RESOURCES);
+        if (
+            limits.publicResources > 0 &&
+            publicResourcesUsage > limits.publicResources
+        ) {
+            violations.push({
+                feature: "Public Resources",
+                currentUsage: publicResourcesUsage,
+                newLimit: limits.publicResources
+            });
+        }
+
+        // Check private resources
+        const privateResourcesUsage = getUsageValue(PRIVATE_RESOURCES);
+        if (
+            limits.privateResources > 0 &&
+            privateResourcesUsage > limits.privateResources
+        ) {
+            violations.push({
+                feature: "Private Resources",
+                currentUsage: privateResourcesUsage,
+                newLimit: limits.privateResources
+            });
+        }
+
+        // Check machine clients
+        const machineClientsUsage = getUsageValue(MACHINE_CLIENTS);
+        if (
+            limits.machineClients > 0 &&
+            machineClientsUsage > limits.machineClients
+        ) {
+            violations.push({
+                feature: "Machine Clients",
+                currentUsage: machineClientsUsage,
+                newLimit: limits.machineClients
+            });
+        }
+
         return violations;
     };
 
@@ -997,21 +1057,23 @@ export default function BillingPage() {
                     </SettingsSectionDescription>
                 </SettingsSectionHeader>
                 <SettingsSectionBody>
-                    <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+                    <div className="grid grid-cols-1 md:grid-cols-4 gap-6">
                         {/* Current Usage */}
-                        <div className="border rounded-lg p-4">
+                        <div className="border rounded-lg p-4 md:col-span-1">
                             <div className="text-sm text-muted-foreground mb-2">
                                 {t("billingCurrentUsage") || "Current Usage"}
                             </div>
-                            <div className="flex items-baseline gap-2">
-                                <span className="text-3xl font-semibold">
-                                    {getUserCount()}
-                                </span>
-                                <span className="text-lg">
-                                    {t("billingUsers") || "Users"}
-                                </span>
+                            <div className="flex flex-col items-start gap-1">
+                                <div className="flex items-baseline gap-2">
+                                    <span className="text-3xl font-semibold">
+                                        {getUserCount()}
+                                    </span>
+                                    <span className="text-lg">
+                                        {t("billingUsers") || "Users"}
+                                    </span>
+                                </div>
                                 {hasSubscription && getPricePerUser() > 0 && (
-                                    <div className="text-sm text-muted-foreground mt-1">
+                                    <div className="text-sm text-muted-foreground">
                                         x ${getPricePerUser()} / month = $
                                         {getUserCount() * getPricePerUser()} /
                                         month
@@ -1021,11 +1083,11 @@ export default function BillingPage() {
                         </div>
 
                         {/* Maximum Limits */}
-                        <div className="border rounded-lg p-4">
+                        <div className="border rounded-lg p-4 md:col-span-3">
                             <div className="text-sm text-muted-foreground mb-3">
                                 {t("billingMaximumLimits") || "Maximum Limits"}
                             </div>
-                            <InfoSections cols={5}>
+                            <InfoSections cols={8}>
                                 <InfoSection>
                                     <InfoSectionTitle className="flex items-center gap-1 text-xs">
                                         {t("billingUsers") || "Users"}
@@ -1308,6 +1370,168 @@ export default function BillingPage() {
                                         )}
                                     </InfoSectionContent>
                                 </InfoSection>
+                                <InfoSection>
+                                    <InfoSectionTitle className="flex items-center gap-1 text-xs">
+                                        {t("billingPublicResources") ||
+                                            "Public Resources"}
+                                    </InfoSectionTitle>
+                                    <InfoSectionContent className="text-sm">
+                                        {isOverLimit(PUBLIC_RESOURCES) ? (
+                                            <Tooltip>
+                                                <TooltipTrigger className="flex items-center gap-1">
+                                                    <AlertTriangle className="h-3 w-3 text-orange-400" />
+                                                    <span
+                                                        className={cn(
+                                                            "text-orange-600 dark:text-orange-400 font-medium"
+                                                        )}
+                                                    >
+                                                        {getLimitValue(
+                                                            PUBLIC_RESOURCES
+                                                        ) ??
+                                                            t(
+                                                                "billingUnlimited"
+                                                            ) ??
+                                                            "∞"}
+                                                    </span>
+                                                </TooltipTrigger>
+                                                <TooltipContent>
+                                                    <p>
+                                                        {t(
+                                                            "billingUsageExceedsLimit",
+                                                            {
+                                                                current:
+                                                                    getUsageValue(
+                                                                        PUBLIC_RESOURCES
+                                                                    ),
+                                                                limit:
+                                                                    getLimitValue(
+                                                                        PUBLIC_RESOURCES
+                                                                    ) ?? 0
+                                                            }
+                                                        ) ||
+                                                            `Current usage (${getUsageValue(PUBLIC_RESOURCES)}) exceeds limit (${getLimitValue(PUBLIC_RESOURCES)})`}
+                                                    </p>
+                                                </TooltipContent>
+                                            </Tooltip>
+                                        ) : (
+                                            <>
+                                                {getLimitValue(
+                                                    PUBLIC_RESOURCES
+                                                ) ??
+                                                    t("billingUnlimited") ??
+                                                    "∞"}
+                                            </>
+                                        )}
+                                    </InfoSectionContent>
+                                </InfoSection>
+                                <InfoSection>
+                                    <InfoSectionTitle className="flex items-center gap-1 text-xs">
+                                        {t("billingPrivateResources") ||
+                                            "Private Resources"}
+                                    </InfoSectionTitle>
+                                    <InfoSectionContent className="text-sm">
+                                        {isOverLimit(PRIVATE_RESOURCES) ? (
+                                            <Tooltip>
+                                                <TooltipTrigger className="flex items-center gap-1">
+                                                    <AlertTriangle className="h-3 w-3 text-orange-400" />
+                                                    <span
+                                                        className={cn(
+                                                            "text-orange-600 dark:text-orange-400 font-medium"
+                                                        )}
+                                                    >
+                                                        {getLimitValue(
+                                                            PRIVATE_RESOURCES
+                                                        ) ??
+                                                            t(
+                                                                "billingUnlimited"
+                                                            ) ??
+                                                            "∞"}
+                                                    </span>
+                                                </TooltipTrigger>
+                                                <TooltipContent>
+                                                    <p>
+                                                        {t(
+                                                            "billingUsageExceedsLimit",
+                                                            {
+                                                                current:
+                                                                    getUsageValue(
+                                                                        PRIVATE_RESOURCES
+                                                                    ),
+                                                                limit:
+                                                                    getLimitValue(
+                                                                        PRIVATE_RESOURCES
+                                                                    ) ?? 0
+                                                            }
+                                                        ) ||
+                                                            `Current usage (${getUsageValue(PRIVATE_RESOURCES)}) exceeds limit (${getLimitValue(PRIVATE_RESOURCES)})`}
+                                                    </p>
+                                                </TooltipContent>
+                                            </Tooltip>
+                                        ) : (
+                                            <>
+                                                {getLimitValue(
+                                                    PRIVATE_RESOURCES
+                                                ) ??
+                                                    t("billingUnlimited") ??
+                                                    "∞"}
+                                            </>
+                                        )}
+                                    </InfoSectionContent>
+                                </InfoSection>
+                                <InfoSection>
+                                    <InfoSectionTitle className="flex items-center gap-1 text-xs">
+                                        {t("billingMachineClients") ||
+                                            "Machine Clients"}
+                                    </InfoSectionTitle>
+                                    <InfoSectionContent className="text-sm">
+                                        {isOverLimit(MACHINE_CLIENTS) ? (
+                                            <Tooltip>
+                                                <TooltipTrigger className="flex items-center gap-1">
+                                                    <AlertTriangle className="h-3 w-3 text-orange-400" />
+                                                    <span
+                                                        className={cn(
+                                                            "text-orange-600 dark:text-orange-400 font-medium"
+                                                        )}
+                                                    >
+                                                        {getLimitValue(
+                                                            MACHINE_CLIENTS
+                                                        ) ??
+                                                            t(
+                                                                "billingUnlimited"
+                                                            ) ??
+                                                            "∞"}
+                                                    </span>
+                                                </TooltipTrigger>
+                                                <TooltipContent>
+                                                    <p>
+                                                        {t(
+                                                            "billingUsageExceedsLimit",
+                                                            {
+                                                                current:
+                                                                    getUsageValue(
+                                                                        MACHINE_CLIENTS
+                                                                    ),
+                                                                limit:
+                                                                    getLimitValue(
+                                                                        MACHINE_CLIENTS
+                                                                    ) ?? 0
+                                                            }
+                                                        ) ||
+                                                            `Current usage (${getUsageValue(MACHINE_CLIENTS)}) exceeds limit (${getLimitValue(MACHINE_CLIENTS)})`}
+                                                    </p>
+                                                </TooltipContent>
+                                            </Tooltip>
+                                        ) : (
+                                            <>
+                                                {getLimitValue(
+                                                    MACHINE_CLIENTS
+                                                ) ??
+                                                    t("billingUnlimited") ??
+                                                    "∞"}
+                                            </>
+                                        )}
+                                    </InfoSectionContent>
+                                </InfoSection>
                             </InfoSections>
                         </div>
                     </div>
@@ -1507,6 +1731,45 @@ export default function BillingPage() {
                                                         "Remote Nodes"}
                                                 </span>
                                             </div>
+                                            <div className="flex items-center gap-2">
+                                                <span className="w-1.5 h-1.5 rounded-full bg-muted-foreground/50 shrink-0" />
+                                                <span>
+                                                    {
+                                                        tierLimits[
+                                                            pendingTier.tier
+                                                        ].publicResources
+                                                    }{" "}
+                                                    {t(
+                                                        "billingPublicResources"
+                                                    ) || "Public Resources"}
+                                                </span>
+                                            </div>
+                                            <div className="flex items-center gap-2">
+                                                <span className="w-1.5 h-1.5 rounded-full bg-muted-foreground/50 shrink-0" />
+                                                <span>
+                                                    {
+                                                        tierLimits[
+                                                            pendingTier.tier
+                                                        ].privateResources
+                                                    }{" "}
+                                                    {t(
+                                                        "billingPrivateResources"
+                                                    ) || "Private Resources"}
+                                                </span>
+                                            </div>
+                                            <div className="flex items-center gap-2">
+                                                <span className="w-1.5 h-1.5 rounded-full bg-muted-foreground/50 shrink-0" />
+                                                <span>
+                                                    {
+                                                        tierLimits[
+                                                            pendingTier.tier
+                                                        ].machineClients
+                                                    }{" "}
+                                                    {t(
+                                                        "billingMachineClients"
+                                                    ) || "Machine Clients"}
+                                                </span>
+                                            </div>
                                         </div>
                                     </div>
                                 )}

src/app/auth/login/page.tsx

@@ -16,8 +16,11 @@ import LoginCardHeader from "@app/components/LoginCardHeader";
 import { priv } from "@app/lib/api";
 import { AxiosResponse } from "axios";
 import { LoginFormIDP } from "@app/components/LoginForm";
-import { ListIdpsResponse } from "@server/routers/idp";
+import { ListIdpsResponse, type GetIdpResponse } from "@server/routers/idp";
 import type { Metadata } from "next";
+import { cookies } from "next/headers";
+import { LAST_USED_IDP_COOKIE_NAME } from "@app/lib/consts";
+import z from "zod";
 
 export const metadata: Metadata = {
     title: "Log In"
@@ -29,8 +32,9 @@ export default async function Page(props: {
     searchParams: Promise<{ [key: string]: string | string[] | undefined }>;
 }) {
     const searchParams = await props.searchParams;
-    const getUser = cache(verifySession);
-    const user = await getUser({ skipCheckVerifyEmail: true });
+    const user = await verifySession({ skipCheckVerifyEmail: true });
+
+    const lastUsedIdpCookie = (await cookies()).get(LAST_USED_IDP_COOKIE_NAME);
 
     const isInvite = searchParams?.redirect?.includes("/invite");
     const forceLoginParam = searchParams?.forceLogin;
@@ -85,19 +89,47 @@ export default async function Page(props: {
         (build === "enterprise" && env.app.identityProviderMode === "org");
 
     let loginIdps: LoginFormIDP[] = [];
+    let lastUsedIdpForSmartLogin: (LoginFormIDP & { orgId?: string }) | null =
+        null;
     if (!useSmartLogin) {
         // Load IdPs for DashboardLoginForm (OSS or org-only IdP mode)
         if (build === "oss" || env.app.identityProviderMode !== "org") {
-            const idpsRes = await cache(
-                async () =>
-                    await priv.get<AxiosResponse<ListIdpsResponse>>("/idp")
-            )();
+            const idpsRes =
+                await priv.get<AxiosResponse<ListIdpsResponse>>("/idp");
             loginIdps = idpsRes.data.data.idps.map((idp) => ({
                 idpId: idp.idpId,
                 name: idp.name,
                 variant: idp.type
             })) as LoginFormIDP[];
         }
+    } else {
+        if (lastUsedIdpCookie) {
+            const lastUsedIdpSchema = z.object({
+                orgId: z.string().optional(),
+                idpId: z.number()
+            });
+            try {
+                const persistedData = lastUsedIdpSchema.parse(
+                    JSON.parse(lastUsedIdpCookie.value)
+                );
+
+                const idpRes = await priv.get<AxiosResponse<GetIdpResponse>>(
+                    `/idp/${persistedData.idpId}`
+                );
+
+                const idp = idpRes.data.data.idp;
+
+                lastUsedIdpForSmartLogin = {
+                    idpId: idp.idpId,
+                    name: idp.name,
+                    variant: idp.type,
+                    orgId: persistedData.orgId,
+                    lastUsed: true
+                };
+            } catch (error) {
+                // the idp might not exist or the data is malformatted, skip this
+            }
+        }
     }
 
     const t = await getTranslations();
@@ -160,6 +192,7 @@ export default async function Page(props: {
                                 redirect={redirectUrl}
                                 forceLogin={forceLogin}
                                 defaultUser={defaultUser}
+                                lastUsedIdp={lastUsedIdpForSmartLogin}
                                 orgSignIn={
                                     !isInvite &&
                                     (build === "saas" ||

src/app/page.tsx

@@ -5,7 +5,6 @@ import UserProvider from "@app/providers/UserProvider";
 import { ListUserOrgsResponse } from "@server/routers/org";
 import { AxiosResponse } from "axios";
 import { redirect } from "next/navigation";
-import { cache } from "react";
 import OrganizationLanding from "@app/components/OrganizationLanding";
 import { pullEnv } from "@app/lib/pullEnv";
 import { cleanRedirect } from "@app/lib/cleanRedirect";
@@ -13,7 +12,6 @@ import { Layout } from "@app/components/Layout";
 import RedirectToOrg from "@app/components/RedirectToOrg";
 import { InitialSetupCompleteResponse } from "@server/routers/auth";
 import { cookies } from "next/headers";
-import { build } from "@server/build";
 
 export const dynamic = "force-dynamic";
 
@@ -27,8 +25,7 @@ export default async function Page(props: {
 
     const env = pullEnv();
 
-    const getUser = cache(verifySession);
-    const user = await getUser({ skipCheckVerifyEmail: true });
+    const user = await verifySession({ skipCheckVerifyEmail: true });
 
     let complete = false;
     try {

src/components/IdpLoginButtons.tsx

@@ -1,26 +1,25 @@
 "use client";
 
-import { useEffect, useState } from "react";
-import { Button } from "@app/components/ui/button";
-import { Alert, AlertDescription } from "@app/components/ui/alert";
-import { useTranslations } from "next-intl";
+import { generateOidcUrlProxy } from "@app/actions/server";
 import IdpTypeIcon from "@app/components/IdpTypeIcon";
-import {
-    generateOidcUrlProxy,
-    type GenerateOidcUrlResponse
-} from "@app/actions/server";
+import { Alert, AlertDescription } from "@app/components/ui/alert";
+import { Button } from "@app/components/ui/button";
+import { cleanRedirect } from "@app/lib/cleanRedirect";
+import { LAST_USED_IDP_COOKIE_NAME } from "@app/lib/consts";
+import { setClientCookie } from "@app/lib/setClientCookie";
+import { useTranslations } from "next-intl";
 import {
     redirect as redirectTo,
-    useParams,
+    useRouter,
     useSearchParams
 } from "next/navigation";
-import { useRouter } from "next/navigation";
-import { cleanRedirect } from "@app/lib/cleanRedirect";
+import { useEffect, useState, useTransition } from "react";
 
 export type LoginFormIDP = {
     idpId: number;
     name: string;
     variant?: string;
+    lastUsed?: boolean;
 };
 
 type IdpLoginButtonsProps = {
@@ -35,7 +34,6 @@ export default function IdpLoginButtons({
     orgId
 }: IdpLoginButtonsProps) {
     const [error, setError] = useState<string | null>(null);
-    const [loading, setLoading] = useState(false);
     const t = useTranslations();
 
     const params = useSearchParams();
@@ -52,10 +50,22 @@ export default function IdpLoginButtons({
         }
     }, []);
 
+    const [loading, startTransition] = useTransition();
+
     async function loginWithIdp(idpId: number) {
-        setLoading(true);
         setError(null);
 
+        setClientCookie(
+            LAST_USED_IDP_COOKIE_NAME,
+            JSON.stringify({
+                orgId,
+                idpId
+            }),
+            {
+                sameSite: "Lax"
+            }
+        );
+
         let redirectToUrl: string | undefined;
         try {
             console.log("generating", idpId, redirect || "/", orgId);
@@ -68,7 +78,6 @@ export default function IdpLoginButtons({
 
             if (response.error) {
                 setError(response.message);
-                setLoading(false);
                 return;
             }
 
@@ -84,7 +93,6 @@ export default function IdpLoginButtons({
                         "An unexpected error occurred. Please try again."
                 })
             );
-            setLoading(false);
         }
 
         if (redirectToUrl) {
@@ -124,20 +132,38 @@ export default function IdpLoginButtons({
                                 idp.variant || idp.name.toLowerCase();
 
                             return (
-                                <Button
+                                <div
+                                    className="w-full relative"
                                     key={idp.idpId}
-                                    type="button"
-                                    variant="outline"
-                                    className="w-full inline-flex items-center space-x-2"
-                                    onClick={() => {
-                                        loginWithIdp(idp.idpId);
-                                    }}
-                                    disabled={loading}
-                                    loading={loading}
                                 >
-                                    <IdpTypeIcon type={effectiveType} size={16} />
-                                    <span>{idp.name}</span>
-                                </Button>
+                                    <Button
+                                        key={idp.idpId}
+                                        type="button"
+                                        variant="outline"
+                                        className="w-full inline-flex items-center space-x-2  after:absolute after:inset-0 after:z-10"
+                                        onClick={() => {
+                                            startTransition(() =>
+                                                loginWithIdp(idp.idpId)
+                                            );
+                                        }}
+                                        disabled={loading}
+                                        loading={loading}
+                                    >
+                                        <IdpTypeIcon
+                                            type={effectiveType}
+                                            size={16}
+                                        />
+                                        <span>{idp.name}</span>
+                                    </Button>
+
+                                    {idp.lastUsed && (
+                                        <div className="absolute inset-0">
+                                            <span className="absolute top-0 right-0 text-xs bg-primary text-primary-foreground rounded-bl-sm rounded-tr-sm px-2 py-0.5">
+                                                {t("idpLastUsed")}
+                                            </span>
+                                        </div>
+                                    )}
+                                </div>
                             );
                         })}
                     </>

src/components/LoginForm.tsx

@@ -30,10 +30,7 @@ import Link from "next/link";
 import { GenerateOidcUrlResponse } from "@server/routers/idp";
 import { Separator } from "./ui/separator";
 import { useTranslations } from "next-intl";
-import {
-    generateOidcUrlProxy,
-    loginProxy
-} from "@app/actions/server";
+import { generateOidcUrlProxy, loginProxy } from "@app/actions/server";
 import { redirect as redirectTo } from "next/navigation";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import IdpTypeIcon from "@app/components/IdpTypeIcon";
@@ -41,11 +38,13 @@ import IdpTypeIcon from "@app/components/IdpTypeIcon";
 import { loadReoScript } from "reodotdev";
 import { build } from "@server/build";
 import MfaInputForm from "@app/components/MfaInputForm";
+import { useLocalStorage } from "@app/hooks/useLocalStorage";
 
 export type LoginFormIDP = {
     idpId: number;
     name: string;
     variant?: string;
+    lastUsed?: boolean;
 };
 
 type LoginFormProps = {
@@ -105,7 +104,6 @@ export default function LoginForm({
         }
     }, []);
 
-
     const formSchema = z.object({
         email: z.string().email({ message: t("emailInvalid") }),
         password: z.string().min(8, { message: t("passwordRequirementsChars") })
@@ -130,6 +128,10 @@ export default function LoginForm({
         }
     });
 
+    const [lastUsedIdpId, setLastUsedIdpId] = useLocalStorage<string | null>(
+        "login:last-used-idp",
+        null
+    );
 
     async function onSubmit(values: any) {
         const { email, password } = form.getValues();
@@ -179,8 +181,7 @@ export default function LoginForm({
             if (data.useSecurityKey) {
                 setError(
                     t("securityKeyRequired", {
-                        defaultValue:
-                            "Please use your security key to sign in."
+                        defaultValue: "Please use your security key to sign in."
                     })
                 );
                 return;
@@ -242,6 +243,8 @@ export default function LoginForm({
 
     async function loginWithIdp(idpId: number) {
         let redirectUrl: string | undefined;
+
+        setLastUsedIdpId(idpId.toString());
         try {
             const data = await generateOidcUrlProxy(
                 idpId,
@@ -356,7 +359,6 @@ export default function LoginForm({
             )}
 
             <div className="space-y-4">
-
                 {!mfaRequested && (
                     <>
                         <SecurityKeyAuthButton
@@ -385,25 +387,41 @@ export default function LoginForm({
                                         idp.variant || idp.name.toLowerCase();
 
                                     return (
-                                        <Button
+                                        <div
+                                            className="w-full relative"
                                             key={idp.idpId}
-                                            type="button"
-                                            variant="outline"
-                                            className="w-full inline-flex items-center space-x-2"
-                                            onClick={() => {
-                                                loginWithIdp(idp.idpId);
-                                            }}
                                         >
-                                            <IdpTypeIcon type={effectiveType} size={16} />
-                                            <span>{idp.name}</span>
-                                        </Button>
+                                            <Button
+                                                key={idp.idpId}
+                                                type="button"
+                                                variant="outline"
+                                                className="w-full inline-flex items-center space-x-2 after:absolute after:inset-0 after:z-10"
+                                                onClick={() => {
+                                                    loginWithIdp(idp.idpId);
+                                                }}
+                                            >
+                                                <IdpTypeIcon
+                                                    type={effectiveType}
+                                                    size={16}
+                                                />
+                                                <span>{idp.name}</span>
+                                            </Button>
+
+                                            {lastUsedIdpId ===
+                                                idp.idpId.toString() && (
+                                                <div className="absolute inset-0">
+                                                    <span className="absolute top-0 right-0 text-xs bg-primary text-primary-foreground rounded-bl-sm rounded-tr-sm px-2 py-0.5">
+                                                        {t("idpLastUsed")}
+                                                    </span>
+                                                </div>
+                                            )}
+                                        </div>
                                     );
                                 })}
                             </>
                         )}
                     </>
                 )}
-
             </div>
         </div>
     );

src/components/SmartLoginForm.tsx

@@ -27,6 +27,8 @@ import UserProfileCard from "@app/components/UserProfileCard";
 import SecurityKeyAuthButton from "@app/components/SecurityKeyAuthButton";
 import { Separator } from "@app/components/ui/separator";
 import OrgSignInLink from "@app/components/OrgSignInLink";
+import type { LoginFormIDP } from "./LoginForm";
+import IdpLoginButtons from "./IdpLoginButtons";
 
 const identifierSchema = z.object({
     identifier: z.string().min(1, "Username or email is required")
@@ -53,6 +55,7 @@ type SmartLoginFormProps = {
     forceLogin?: boolean;
     defaultUser?: string;
     orgSignIn?: OrgSignInConfig;
+    lastUsedIdp?: (LoginFormIDP & { orgId?: string }) | null;
 };
 
 type ViewState =
@@ -89,7 +92,8 @@ export default function SmartLoginForm({
     redirect,
     forceLogin,
     defaultUser,
-    orgSignIn
+    orgSignIn,
+    lastUsedIdp
 }: SmartLoginFormProps) {
     const router = useRouter();
     const { env } = useEnvContext();
@@ -294,6 +298,15 @@ export default function SmartLoginForm({
                                 </span>
                             </div>
                         </div>
+
+                        {lastUsedIdp && (
+                            <IdpLoginButtons
+                                idps={[lastUsedIdp]}
+                                orgId={lastUsedIdp.orgId}
+                                redirect={redirect}
+                            />
+                        )}
+
                         <OrgSignInLink
                             href={orgSignIn.href}
                             linkText={orgSignIn.linkText}

src/lib/consts.ts

@@ -0,0 +1 @@
+export const LAST_USED_IDP_COOKIE_NAME = "p__last_used_idp";

src/lib/setClientCookie.ts

@@ -0,0 +1,32 @@
+/**
+ * Set a cookie on the client side in javascript code, not on the server
+ * @param name
+ * @param value
+ * @param days
+ * @param options
+ */
+export function setClientCookie(
+    name: string,
+    value: string,
+    options: {
+        days?: number;
+        path?: string;
+        secure?: boolean;
+        sameSite?: "Strict" | "Lax" | "None";
+    } = {}
+): void {
+    let cookie = `${encodeURIComponent(name)}=${encodeURIComponent(value)}`;
+
+    if (options.days) {
+        const date = new Date();
+        date.setTime(date.getTime() + options.days * 864e5);
+        cookie += `; expires=${date.toUTCString()}`;
+    }
+
+    cookie += `; path=${options.path ?? "/"}`;
+
+    if (options.secure) cookie += "; Secure";
+    if (options.sameSite) cookie += `; SameSite=${options.sameSite}`;
+
+    document.cookie = cookie;
+}