Compare commits

..

11 Commits

Author SHA1 Message Date
dependabot[bot] 225ca36308 Bump the docker-dependencies group across 1 directory with 2 updates
Bumps the docker-dependencies group with 2 updates in the / directory: docker/library/node and node.


Updates `docker/library/node` from 24-slim to 26-slim

Updates `node` from 24-alpine to 26-alpine

---
updated-dependencies:
- dependency-name: docker/library/node
  dependency-version: 26-slim
  dependency-type: direct:production
  dependency-group: docker-dependencies
- dependency-name: node
  dependency-version: 26-alpine
  dependency-type: direct:production
  dependency-group: docker-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-08-13 01:33:07 +00:00
Owen Schwartz 048e4fc73c Merge pull request #3574 from fosrl/dev
1.21.1-s.5
2026-08-12 16:34:31 -04:00
miloschwartz 71d9d8f010 fix accept invite as idp user 2026-08-12 16:25:20 -04:00
miloschwartz dd78c2cc08 dont show servers idps in create user when idp mode is org on enterprise 2026-08-12 15:20:41 -04:00
Owen 295e38d2af Remove arbitrary max 50 limit from email whitelist
Fix #3568
2026-08-12 09:11:10 -04:00
Owen 02e4fe8b48 Show the provided domains when changing properly 2026-08-11 09:40:55 -04:00
Owen ed46afd81a add subscription override column 2026-08-10 11:15:48 -04:00
miloschwartz 3dc9c100e9 better form feedback when saving roles 2026-08-10 11:02:44 -04:00
miloschwartz 02e97d6ae4 add copy button to org id 2026-08-10 10:44:25 -04:00
Owen Schwartz d04740fede Merge pull request #3537 from fosrl/dev
1.21.1-s.4
2026-08-06 14:07:42 -04:00
Owen Schwartz b7c0669c38 Merge pull request #3528 from fosrl/dev
1.21.1-s.3
2026-08-04 17:46:49 -04:00
39 changed files with 207 additions and 203 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
# FROM node:24-slim AS base
FROM public.ecr.aws/docker/library/node:24-slim AS base
FROM public.ecr.aws/docker/library/node:26-slim AS base
WORKDIR /app
@@ -33,7 +33,7 @@ FROM base AS builder
RUN npm ci --omit=dev
# FROM node:24-slim AS runner
FROM public.ecr.aws/docker/library/node:24-slim AS runner
FROM public.ecr.aws/docker/library/node:26-slim AS runner
WORKDIR /app
+1 -1
View File
@@ -1,4 +1,4 @@
FROM node:24-alpine
FROM node:26-alpine
WORKDIR /app
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Моля, уверете се, че сте влезли като правилния потребител.",
"inviteErrorNoUser": "Съжаляваме, но изглежда, че поканата, до която се опитвате да получите достъп, не е за съществуващ потребител.",
"inviteCreateUser": "Моля, първо създайте акаунт.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Отиди вкъщи",
"inviteLogInOtherUser": "Влезте като друг потребител",
"createAnAccount": "Създайте профил",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Задайте ПИН код на ресурса",
"actionSetResourceEmailWhitelist": "Задайте списък на одобрените имейл адреси за ресурса",
"actionGetResourceEmailWhitelist": "Вземете списък на одобрените имейл адреси за ресурса",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Получете политика за ресурси",
"actionUpdateResourcePolicy": "Актуализирайте политика за ресурси",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Задайте потребители на ресурсна политика",
"actionSetResourcePolicyRoles": "Задайте роли на ресурсна политика",
"actionSetResourcePolicyPassword": "Задайте парола на ресурсна политика",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Prosím ujistěte se, že jste přihlášeni jako správný uživatel.",
"inviteErrorNoUser": "Je nám líto, ale vypadá to, že pozvánka, ke které se snažíte získat přístup, není pro existujícího uživatele.",
"inviteCreateUser": "Nejprve si prosím vytvořte účet.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Přejít na hlavní stránku",
"inviteLogInOtherUser": "Přihlásit se jako jiný uživatel",
"createAnAccount": "Vytvořit účet",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Nastavit zdrojový kód",
"actionSetResourceEmailWhitelist": "Nastavit seznam povolených dokumentů",
"actionGetResourceEmailWhitelist": "Získat seznam povolených dokumentů",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Získat zásady zdroje",
"actionUpdateResourcePolicy": "Aktualizovat zásady zdroje",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Nastavte uživatele pro zásady zdroje",
"actionSetResourcePolicyRoles": "Nastavte role pro zásady zdroje",
"actionSetResourcePolicyPassword": "Nastavte heslo pro zásady zdroje",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Venligst tjek at du er loget ind som korrekt bruger.",
"inviteErrorNoUser": "Beklager, men det ser ud til, at invitationen du prøver at få adgang til, ikke er til en eksisterende bruger.",
"inviteCreateUser": "Opret venligst en konto først.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Gå hjem",
"inviteLogInOtherUser": "Log ind som en anden bruger",
"createAnAccount": "Opret konto",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Angiv ressource-PIN-kode",
"actionSetResourceEmailWhitelist": "Angiv e-mailwhitelist for ressource",
"actionGetResourceEmailWhitelist": "Hent e-mailwhitelist for ressource",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Få ressourceretningslinjen",
"actionUpdateResourcePolicy": "Opdater ressourceretningslinjen",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Angiv ressourceretningslinjens brugere",
"actionSetResourcePolicyRoles": "Angiv ressourceretningslinjens roller",
"actionSetResourcePolicyPassword": "Angiv ressourceretningslinjen for adgangskode",
+3 -8
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Bitte stelle sicher, dass du als korrekter Benutzer angemeldet bist.",
"inviteErrorNoUser": "Es tut uns leid, aber es sieht so aus, als sei die Einladung, auf die du zugreifen möchtest, nicht für einen existierenden Benutzer bestimmt.",
"inviteCreateUser": "Bitte erstelle zuerst ein Konto.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Zur Startseite",
"inviteLogInOtherUser": "Als anderer Benutzer anmelden",
"createAnAccount": "Konto erstellen",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Ressourcen-PIN festlegen",
"actionSetResourceEmailWhitelist": "Ressourcen-E-Mail-Whitelist festlegen",
"actionGetResourceEmailWhitelist": "Ressourcen-E-Mail-Whitelist abrufen",
"actionListResourcePolicies": "Ressourcen-Richtlinien auflisten",
"actionCreateResourcePolicy": "Ressourcen-Richtlinie erstellen",
"actionGetResourcePolicy": "Ressourcenrichtlinie abrufen",
"actionUpdateResourcePolicy": "Ressourcenrichtlinie aktualisieren",
"actionDeleteResourcePolicy": "Ressourcen-Richtlinie löschen",
"actionSetResourcePolicyUsers": "Ressourcenrichtlinienbenutzer festlegen",
"actionSetResourcePolicyRoles": "Rollen der Ressourcenrichtlinie festlegen",
"actionSetResourcePolicyPassword": "Passwort der Ressourcenrichtlinie festlegen",
@@ -2017,7 +2012,7 @@
"billingSites": "Standorte",
"billingUsers": "Benutzergeräte",
"billingDomains": "Domänen",
"billingOrganizations": "Organisationen",
"billingOrganizations": "Orden",
"billingRemoteExitNodes": "Entfernte Knoten",
"billingPublicResources": "Öffentliche Ressourcen",
"billingPrivateResources": "Private Ressourcen",
@@ -2177,7 +2172,7 @@
"billingResolvePaymentIssue": "Bitte beheben Sie Ihr Zahlungsproblem vor dem Upgrade oder Herabstufen",
"signUpTerms": {
"IAgreeToThe": "Ich stimme den",
"termsOfService": "Nutzungsbedingungen",
"termsOfService": "Nutzungsbedingungen zu",
"and": "und",
"privacyPolicy": "datenschutzrichtlinie."
},
@@ -3395,7 +3390,7 @@
"enterMfaCode": "Geben Sie den Code aus Ihrer Authentifizierungs-App ein",
"securityKeyRequired": "Bitte verwenden Sie Ihren Sicherheitsschlüssel zum Anmelden.",
"needToUseAnotherAccount": "Benötigen Sie ein anderes Konto?",
"loginLegalDisclaimer": "Indem Sie auf die Buttons unten klicken, bestätigen Sie, dass Sie die <termsOfService>Nutzungsbedingungen</termsOfService> und <privacyPolicy>Datenschutzrichtlinien</privacyPolicy> gelesen haben, verstehen und ihnen zustimmen.",
"loginLegalDisclaimer": "Indem Sie auf die Buttons unten klicken, bestätigen Sie, dass Sie gelesen haben, verstehen, und stimmen den <termsOfService>Nutzungsbedingungen</termsOfService> und <privacyPolicy>Datenschutzrichtlinien</privacyPolicy> zu.",
"termsOfService": "Nutzungsbedingungen",
"privacyPolicy": "Datenschutzerklärung",
"userNotFoundWithUsername": "Kein Benutzer mit diesem Benutzernamen gefunden.",
+2
View File
@@ -43,6 +43,8 @@
"inviteLoginUser": "Please make sure you're logged in as the correct user.",
"inviteErrorNoUser": "We're sorry, but it looks like the invite you're trying to access is not for a user that exists.",
"inviteCreateUser": "Please create an account first.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Go Home",
"inviteLogInOtherUser": "Log In as a Different User",
"createAnAccount": "Create an Account",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Por favor, asegúrese de que ha iniciado sesión como el usuario correcto.",
"inviteErrorNoUser": "Lo sentimos, pero parece que la invitación a la que intentas acceder no es para un usuario que existe.",
"inviteCreateUser": "Por favor, cree una cuenta primero.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Ir a casa",
"inviteLogInOtherUser": "Iniciar sesión como un usuario diferente",
"createAnAccount": "Crear una cuenta",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Establecer Pincode del recurso",
"actionSetResourceEmailWhitelist": "Establecer lista blanca de correo de recursos",
"actionGetResourceEmailWhitelist": "Obtener correo electrónico de recursos",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Obtener política de recursos",
"actionUpdateResourcePolicy": "Actualizar política de recursos",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Definir política de recursos para usuarios",
"actionSetResourcePolicyRoles": "Definir roles de política de recursos",
"actionSetResourcePolicyPassword": "Definir contraseña de política de recursos",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Veuillez vous assurer que vous êtes connecté avec le bon compte.",
"inviteErrorNoUser": "Nous sommes désolés, mais il semble que l'invitation à laquelle vous essayez d'accéder ne concerne pas un utilisateur existant.",
"inviteCreateUser": "Veuillez d'abord créer un compte.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Retour à l'accueil",
"inviteLogInOtherUser": "Se connecter en tant qu'utilisateur différent",
"createAnAccount": "Créer un compte",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Définir le code PIN de la ressource",
"actionSetResourceEmailWhitelist": "Définir la liste blanche des emails de la ressource",
"actionGetResourceEmailWhitelist": "Obtenir la liste blanche des emails de la ressource",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Obtenir une politique de ressources",
"actionUpdateResourcePolicy": "Mettre à jour la politique de ressources",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Définir les utilisateurs de la politique de ressources",
"actionSetResourcePolicyRoles": "Définir les rôles de la politique de ressources",
"actionSetResourcePolicyPassword": "Définir le mot de passe de la politique de ressources",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Assicurati di aver effettuato l'accesso come utente corretto.",
"inviteErrorNoUser": "Siamo spiacenti, ma sembra che l'invito che stai cercando di accedere non sia per un utente che esiste.",
"inviteCreateUser": "Si prega di creare un account prima.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Vai alla Home",
"inviteLogInOtherUser": "Accedi come utente diverso",
"createAnAccount": "Crea un account",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Imposta Codice PIN Risorsa",
"actionSetResourceEmailWhitelist": "Imposta Lista Autorizzazioni Email Risorsa",
"actionGetResourceEmailWhitelist": "Ottieni Lista Autorizzazioni Email Risorsa",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Ottieni la Politica della Risorsa",
"actionUpdateResourcePolicy": "Aggiorna la Politica della Risorsa",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Imposta Utenti della Politica Risorsa",
"actionSetResourcePolicyRoles": "Imposta Ruoli della Politica Risorsa",
"actionSetResourcePolicyPassword": "Imposta Password della Politica Risorsa",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "올바른 사용자로 로그인했는지 확인하십시오.",
"inviteErrorNoUser": "죄송하지만, 접근하려는 초대가 존재하지 않는 사용자에 대한 것인 것 같습니다.",
"inviteCreateUser": "먼저 계정을 생성해 주세요.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "홈으로 가기",
"inviteLogInOtherUser": "다른 사용자로 로그인",
"createAnAccount": "계정 만들기",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "리소스 핀코드 설정",
"actionSetResourceEmailWhitelist": "리소스 이메일 화이트리스트 설정",
"actionGetResourceEmailWhitelist": "리소스 이메일 화이트리스트 가져오기",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "리소스 정책 가져오기",
"actionUpdateResourcePolicy": "리소스 정책 업데이트",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "리소스 정책 사용자 설정",
"actionSetResourcePolicyRoles": "리소스 정책 역할 설정",
"actionSetResourcePolicyPassword": "리소스 정책 비밀번호 설정",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Vennligst sjekk at du er logget inn som riktig bruker.",
"inviteErrorNoUser": "Vi beklager, men det ser ut som invitasjonen du prøver å få tilgang til ikke er for en bruker som eksisterer.",
"inviteCreateUser": "Vennligst opprett en konto først.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Gå hjem",
"inviteLogInOtherUser": "Logg inn som en annen bruker",
"createAnAccount": "Lag konto",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Angi ressurspinkode",
"actionSetResourceEmailWhitelist": "Angi e-post-hviteliste for ressurs",
"actionGetResourceEmailWhitelist": "Hent e-post-hviteliste for ressurs",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Hent ressursregel",
"actionUpdateResourcePolicy": "Oppdater ressursregel",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Sett ressursregel for brukere",
"actionSetResourcePolicyRoles": "Sett ressursregel for roller",
"actionSetResourcePolicyPassword": "Sett ressursregel for passord",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Controleer of je bent aangemeld als de juiste gebruiker.",
"inviteErrorNoUser": "Het spijt ons, maar de uitnodiging die u probeert te gebruiken is niet voor een bestaande gebruiker.",
"inviteCreateUser": "U moet eerst een account aanmaken.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Ga naar huis",
"inviteLogInOtherUser": "Log in als een andere gebruiker",
"createAnAccount": "Account aanmaken",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Stel Resource Pincode in",
"actionSetResourceEmailWhitelist": "Stel Resource e-mail whitelist in",
"actionGetResourceEmailWhitelist": "Verkrijg Resource E-mail Whitelist",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Haal Bronbeleid op",
"actionUpdateResourcePolicy": "Werk Bronbeleid bij",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Stel gebruikers van bronbeleid in",
"actionSetResourcePolicyRoles": "Stel rollen van bronbeleid in",
"actionSetResourcePolicyPassword": "Stel wachtwoord van bronbeleid in",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Upewnij się, że jesteś zalogowany jako właściwy użytkownik.",
"inviteErrorNoUser": "Przykro nam, ale wygląda na to, że zaproszenie, do którego próbujesz uzyskać dostęp, nie jest dla użytkownika, który istnieje.",
"inviteCreateUser": "Proszę najpierw utworzyć konto.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Przejdź do strony głównej",
"inviteLogInOtherUser": "Zaloguj się jako inny użytkownik",
"createAnAccount": "Utwórz konto",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Ustaw kod PIN zasobu",
"actionSetResourceEmailWhitelist": "Ustaw białą listę email zasobu",
"actionGetResourceEmailWhitelist": "Pobierz białą listę email zasobu",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Pobierz politykę zasobów",
"actionUpdateResourcePolicy": "Zaktualizuj politykę zasobów",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Ustaw użytkowników polityki zasobów",
"actionSetResourcePolicyRoles": "Ustaw role polityki zasobów",
"actionSetResourcePolicyPassword": "Ustaw hasło polityki zasobów",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Verifique se você está logado como o utilizador correto.",
"inviteErrorNoUser": "Desculpe, mas parece que o convite que está a tentar aceder não é para um utilizador que existe.",
"inviteCreateUser": "Por favor, crie uma conta primeiro.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Voltar ao inicio",
"inviteLogInOtherUser": "Fazer login como um utilizador diferente",
"createAnAccount": "Crie uma conta",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Definir Código PIN do Recurso",
"actionSetResourceEmailWhitelist": "Definir Lista Permitida de Emails do Recurso",
"actionGetResourceEmailWhitelist": "Obter Lista Permitida de Emails do Recurso",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Obter Política de Recurso",
"actionUpdateResourcePolicy": "Atualizar Política de Recurso",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Definir Utilizadores da Política de Recurso",
"actionSetResourcePolicyRoles": "Definir Papéis da Política de Recurso",
"actionSetResourcePolicyPassword": "Definir Palavra-passe da Política de Recurso",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Убедитесь, что вы вошли под правильным пользователем.",
"inviteErrorNoUser": "Извините, но похоже, что приглашение, к которому вы пытаетесь получить доступ, предназначено для несуществующего пользователя.",
"inviteCreateUser": "Сначала создайте аккаунт.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "На главную",
"inviteLogInOtherUser": "Войти под другим пользователем",
"createAnAccount": "Создать учётную запись",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Установить ПИН-код ресурса",
"actionSetResourceEmailWhitelist": "Настроить белый список ресурсов email",
"actionGetResourceEmailWhitelist": "Получить белый список ресурсов email",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Получить политику ресурса",
"actionUpdateResourcePolicy": "Обновить политику ресурса",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Установить пользователей политики ресурса",
"actionSetResourcePolicyRoles": "Установить роли политики ресурса",
"actionSetResourcePolicyPassword": "Установить пароль политики ресурса",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "Lütfen doğru kullanıcı olarak oturum açtığınızdan emin olun.",
"inviteErrorNoUser": "Üzgünüz, ancak erişmeye çalıştığınız davet, var olan bir kullanıcı için değil gibi görünüyor.",
"inviteCreateUser": "Öncelikle bir hesap oluşturun.",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "Ana Sayfaya Dön",
"inviteLogInOtherUser": "Başka bir kullanıcı olarak giriş yapın",
"createAnAccount": "Bir Hesap Oluşturun",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "Kaynak PIN Kodunu Ayarla",
"actionSetResourceEmailWhitelist": "Kaynak E-posta Beyaz Listesi Ayarla",
"actionGetResourceEmailWhitelist": "Kaynak E-posta Beyaz Listesini Al",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "Kaynak Politikasını Al",
"actionUpdateResourcePolicy": "Kaynak Politikasını Güncelle",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "Kaynak Politika Kullanıcılarını Ayarla",
"actionSetResourcePolicyRoles": "Kaynak Politika Rolleri Ayarla",
"actionSetResourcePolicyPassword": "Kaynak Politika Şifresini Ayarla",
-5
View File
@@ -43,8 +43,6 @@
"inviteLoginUser": "请确保您以正确的用户登录。",
"inviteErrorNoUser": "很抱歉,但看起来你想访问的邀请不是一个存在的用户。",
"inviteCreateUser": "请先创建一个帐户。",
"inviteErrorOidcNotAllowed": "Invites can only be accepted by internal accounts. Sign out and log in with your password for this email.",
"inviteLoginInternalOnly": "Invites require an internal account with a password. Create an account or sign in with your password.",
"goHome": "返回首页",
"inviteLogInOtherUser": "以不同的用户登录",
"createAnAccount": "创建帐户",
@@ -1451,11 +1449,8 @@
"actionSetResourcePincode": "设置资源粉码",
"actionSetResourceEmailWhitelist": "设置资源电子邮件白名单",
"actionGetResourceEmailWhitelist": "获取资源电子邮件白名单",
"actionListResourcePolicies": "List Resource Policies",
"actionCreateResourcePolicy": "Create Resource Policy",
"actionGetResourcePolicy": "获取资源策略",
"actionUpdateResourcePolicy": "更新资源策略",
"actionDeleteResourcePolicy": "Delete Resource Policy",
"actionSetResourcePolicyUsers": "设置资源策略用户",
"actionSetResourcePolicyRoles": "设置资源策略角色",
"actionSetResourcePolicyPassword": "设置资源策略密码",
+2 -1
View File
@@ -95,7 +95,8 @@ export const subscriptions = pgTable("subscriptions", {
billingCycleAnchor: bigint("billingCycleAnchor", { mode: "number" }),
expiresAt: bigint("expiresAt", { mode: "number" }),
trial: boolean("trial").default(false),
type: varchar("type", { length: 50 }) // tier1, tier2, tier3, or license
type: varchar("type", { length: 50 }), // tier1, tier2, tier3, or license
override: boolean("override").default(false)
});
export const subscriptionItems = pgTable("subscriptionItems", {
+2 -1
View File
@@ -89,7 +89,8 @@ export const subscriptions = sqliteTable("subscriptions", {
expiresAt: integer("expiresAt"),
trial: integer("trial", { mode: "boolean" }).default(false),
billingCycleAnchor: integer("billingCycleAnchor"),
type: text("type") // tier1, tier2, tier3, or license
type: text("type"), // tier1, tier2, tier3, or license
override: integer("override", { mode: "boolean" }).default(false)
});
export const subscriptionItems = sqliteTable("subscriptionItems", {
-1
View File
@@ -632,7 +632,6 @@ export const ResourcePolicySchema = z.object({
})
)
)
.max(50)
.transform((v) => v.map((e) => e.toLowerCase()))
.optional()
.default([]),
+2 -1
View File
@@ -1,8 +1,9 @@
import { db, idp, idpOrg, Transaction } from "@server/db";
import { and, eq } from "drizzle-orm";
import { build } from "@server/build";
export function isOrgIdentityProviderMode(): boolean {
return process.env.IDENTITY_PROVIDER_MODE === "org";
return build === "saas" || process.env.IDENTITY_PROVIDER_MODE === "org";
}
/**
@@ -53,6 +53,15 @@ export async function handleSubscriptionDeleted(
return;
}
// If the subscription has been manually overridden, we lock it down
// so Stripe can no longer change (or delete) its status locally.
if (existingSubscription.override === true) {
logger.info(
`Subscription ${subscription.id} is locked (override=true). Ignoring deletion event from Stripe.`
);
return;
}
await db
.delete(subscriptions)
.where(eq(subscriptions.subscriptionId, subscription.id));
@@ -68,11 +68,25 @@ export async function handleSubscriptionUpdated(
const type = getSubType(fullSubscription);
const previousType = existingSubscription.type as SubscriptionType | null;
// If the subscription has been manually overridden, we lock the
// status down so Stripe webhooks can no longer change it.
const isLocked = existingSubscription.override === true;
if (isLocked) {
logger.info(
`Subscription ${subscription.id} is locked (override=true). Ignoring status change from Stripe (would have been ${subscription.status}).`
);
}
const effectiveStatus = isLocked
? existingSubscription.status
: subscription.status;
await db
.update(subscriptions)
.set({
status: subscription.status,
canceledAt: subscription.canceled_at
status: effectiveStatus,
canceledAt: isLocked
? existingSubscription.canceledAt
: subscription.canceled_at
? subscription.canceled_at
: null,
updatedAt: Math.floor(Date.now() / 1000),
@@ -275,23 +289,23 @@ export async function handleSubscriptionUpdated(
// we only need to handle the limit lifecycle for saas subscriptions not for the licenses
await handleSubscriptionLifesycle(
customer.orgId,
subscription.status,
effectiveStatus,
type
);
// Handle feature lifecycle when subscription is canceled or becomes unpaid
if (
subscription.status === "canceled" ||
subscription.status === "unpaid" ||
subscription.status === "incomplete_expired"
effectiveStatus === "canceled" ||
effectiveStatus === "unpaid" ||
effectiveStatus === "incomplete_expired"
) {
logger.info(
`Subscription ${subscription.id} for org ${customer.orgId} is ${subscription.status}, disabling paid features`
`Subscription ${subscription.id} for org ${customer.orgId} is ${effectiveStatus}, disabling paid features`
);
await handleTierChange(customer.orgId, null, previousType ?? undefined);
}
} else if (type === "license") {
if (subscription.status === "canceled" || subscription.status == "unpaid" || subscription.status == "incomplete_expired") {
if (effectiveStatus === "canceled" || effectiveStatus == "unpaid" || effectiveStatus == "incomplete_expired") {
try {
// WARNING:
// this invalidates ALL OF THE ENTERPRISE LICENSES for this orgId
@@ -107,7 +107,6 @@ const createResourcePolicyBodySchema = z.strictObject({
})
)
)
.max(50)
.transform((v) => v.map((e) => e.toLowerCase()))
.optional()
.default([]),
@@ -19,7 +19,6 @@ const setResourcePolicyWhitelistBodySchema = z.strictObject({
})
)
)
.max(50)
.transform((v) => v.map((e) => e.toLowerCase()))
});
@@ -24,7 +24,6 @@ const setResourceWhitelistBodySchema = z.strictObject({
})
)
)
.max(50)
.transform((v) => v.map((e) => e.toLowerCase()))
});
+24 -10
View File
@@ -22,6 +22,7 @@ import { calculateUserClientsForOrgs } from "@server/lib/calculateUserClientsFor
import { build } from "@server/build";
import { assignUserToOrg } from "@server/lib/userOrg";
import { isOrgRebuildRateLimited } from "@server/lib/rebuildClientAssociations";
import { UserType } from "@server/types/UserTypes";
const acceptInviteBodySchema = z.strictObject({
token: z.string(),
@@ -66,12 +67,17 @@ export async function acceptInvite(
);
}
const existingUser = await db
const [existingInternalUser] = await db
.select()
.from(users)
.where(eq(users.email, existingInvite.email))
.where(
and(
eq(users.email, existingInvite.email),
eq(users.type, UserType.Internal)
)
)
.limit(1);
if (!existingUser.length) {
if (!existingInternalUser) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
@@ -80,9 +86,8 @@ export async function acceptInvite(
);
}
const { user, session } = await verifySession(req);
const { user } = await verifySession(req);
// at this point we know the user exists
if (!user) {
return next(
createHttpError(
@@ -92,7 +97,7 @@ export async function acceptInvite(
);
}
if (user && user.email !== existingInvite.email) {
if (user.email !== existingInvite.email) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
@@ -101,6 +106,15 @@ export async function acceptInvite(
);
}
if (user.type !== UserType.Internal) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
"Invites can only be accepted by internal users."
)
);
}
if (build == "saas") {
const usage = await usageService.getUsage(
existingInvite.orgId,
@@ -195,7 +209,7 @@ export async function acceptInvite(
await assignUserToOrg(
org,
{
userId: existingUser[0].userId,
userId: user.userId,
orgId: existingInvite.orgId
},
inviteRoleIds,
@@ -208,13 +222,13 @@ export async function acceptInvite(
.where(eq(userInvites.inviteId, inviteId));
logger.debug(
`User ${existingUser[0].userId} accepted invite to org ${existingInvite.orgId}`
`User ${user.userId} accepted invite to org ${existingInvite.orgId}`
);
});
calculateUserClientsForOrgs(existingUser[0].userId).catch((e) => {
calculateUserClientsForOrgs(user.userId).catch((e) => {
logger.error(
`Failed to calculate user clients after accepting invite for user ${existingUser[0].userId}: ${e}`
`Failed to calculate user clients after accepting invite for user ${user.userId}: ${e}`
);
});
+11
View File
@@ -20,6 +20,7 @@ import { TierFeature, tierMatrix } from "@server/lib/billing/tierMatrix";
import { assignUserToOrg } from "@server/lib/userOrg";
import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
import { isOrgRebuildRateLimited } from "@server/lib/rebuildClientAssociations";
import { idpExistsForOrg } from "@server/lib/idp/idpExistsForOrg";
const paramsSchema = z.strictObject({
orgId: z.string().nonempty()
@@ -239,6 +240,16 @@ export async function createOrgUser(
);
}
const providerExists = await idpExistsForOrg(idpId, orgId);
if (!providerExists) {
return next(
createHttpError(
HttpCode.BAD_REQUEST,
"Identity provider not found in this organization"
)
);
}
const [idpRes] = await db
.select()
.from(idp)
+1 -1
View File
@@ -107,7 +107,7 @@ const listUsersSchema = z.strictObject({
.filter((n) => Number.isInteger(n) && n > 0);
const unique = [...new Set(nums)];
return unique.length ? unique : undefined;
}, z.array(z.number().int().positive()).max(50).optional())
}, z.array(z.number().int().positive()).optional())
.openapi({
description:
"Filter users who have any of these role ids in the organization (repeat query param)"
@@ -38,18 +38,6 @@ import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
import { z } from "zod";
const accessControlsFormSchema = z.object({
username: z.string(),
autoProvisioned: z.boolean(),
roles: z.array(
z.object({
id: z.string(),
text: z.string(),
isAdmin: z.boolean().optional()
})
)
});
export default function AccessControlsPage() {
const { orgUser: user, updateOrgUser } = userOrgUserContext();
const { user: sessionUser } = useUserContext();
@@ -69,6 +57,20 @@ export default function AccessControlsPage() {
(build === "enterprise" && !isPaid) ||
(build === "oss" && !isPaid));
const accessControlsFormSchema = z.object({
username: z.string(),
autoProvisioned: z.boolean(),
roles: z
.array(
z.object({
id: z.string(),
text: z.string(),
isAdmin: z.boolean().optional()
})
)
.min(1, { message: t("accessRoleSelectPlease") })
});
const form = useForm({
resolver: zodResolver(accessControlsFormSchema),
defaultValues: {
@@ -108,15 +110,6 @@ export default function AccessControlsPage() {
async function executeSave() {
const values = form.getValues();
if (values.roles.length === 0) {
toast({
variant: "destructive",
title: t("accessRoleRequired"),
description: t("accessRoleSelectPlease")
});
return;
}
setIsSaving(true);
try {
const roleIds = values.roles.map((r) => parseInt(r.id, 10));
@@ -170,15 +163,6 @@ export default function AccessControlsPage() {
const values = form.getValues();
if (values.roles.length === 0) {
toast({
variant: "destructive",
title: t("accessRoleRequired"),
description: t("accessRoleSelectPlease")
});
return;
}
const willHaveAdminRole = values.roles.some((r) => r.isAdmin === true);
const isRemovingOwnAdmin =
@@ -237,10 +237,13 @@ export default function Page() {
return;
}
const useOrgIdps =
build === "saas" || env.app.identityProviderMode === "org";
const res = await api
.get<
AxiosResponse<ListIdpsResponse>
>(build === "saas" ? `/org/${orgId}/idp` : "/idp")
>(useOrgIdps ? `/org/${orgId}/idp` : "/idp")
.catch((e) => {
console.error(e);
toast({
@@ -301,8 +304,7 @@ export default function Page() {
);
const [isSubmittingExternal, setIsSubmittingExternal] = useState(false);
const loading =
isSubmittingInternal || isSubmittingExternal;
const loading = isSubmittingInternal || isSubmittingExternal;
async function onSubmitInternal() {
const isValid = await internalForm.trigger();
+5 -2
View File
@@ -193,7 +193,10 @@ export default async function Page(props: {
redirect={redirectUrl}
forceLogin={forceLogin}
defaultUser={defaultUser}
lastUsedIdp={lastUsedIdpForSmartLogin}
inviteMode={isInvite}
lastUsedIdp={
isInvite ? null : lastUsedIdpForSmartLogin
}
orgSignIn={
!isInvite &&
(build === "saas" ||
@@ -213,7 +216,7 @@ export default async function Page(props: {
) : (
<DashboardLoginForm
redirect={redirectUrl}
idps={loginIdps}
idps={isInvite ? [] : loginIdps}
forceLogin={forceLogin}
showOrgLogin={
!isInvite &&
+13 -2
View File
@@ -53,7 +53,7 @@ import { PaidFeaturesAlert } from "@app/components/PaidFeaturesAlert";
import { usePaidStatus } from "@/hooks/usePaidStatus";
import { TierFeature, tierMatrix } from "@server/lib/billing/tierMatrix";
import { toUnicode } from "punycode";
import { useCallback, useEffect, useMemo, useState } from "react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useUserContext } from "@app/hooks/useUserContext";
type AvailableOption = {
@@ -166,8 +166,19 @@ export default function DomainPicker({
const [selectedProvidedDomain, setSelectedProvidedDomain] =
useState<AvailableOption | null>(null);
// Only run the initial base-domain selection once the domains have
// loaded. This must not re-run on later `defaultDomainId`/`defaultSubdomain`
// changes, because selecting a provided (namespace) domain calls
// onDomainChange(null), which the parent form echoes back as
// defaultDomainId/defaultSubdomain becoming undefined — re-running this
// effect on that change would immediately snap the selector back to the
// organization domain, making provided domains unselectable whenever one
// was already set.
const didSelectInitialDomainRef = useRef(false);
useEffect(() => {
if (!loadingDomains) {
if (!loadingDomains && !didSelectInitialDomainRef.current) {
didSelectInitialDomainRef.current = true;
let domainOptionToSelect: DomainOption | null = null;
if (organizationDomains.length > 0) {
// Select the first organization domain or the one provided from props
+19
View File
@@ -44,6 +44,7 @@ export default function InviteStatusCard({
| "user_does_not_exist"
| "not_logged_in"
| "user_limit_exceeded"
| "oidc_not_allowed"
>("rejected");
useEffect(() => {
@@ -69,6 +70,12 @@ export default function InviteStatusCard({
function cardType() {
if (error.includes("Invite is not for this user")) {
return "wrong_user";
} else if (
error.includes(
"Invites can only be accepted by internal users."
)
) {
return "oidc_not_allowed";
} else if (
error.includes(
"User does not exist. Please create an account first."
@@ -166,6 +173,14 @@ export default function InviteStatusCard({
<p className="text-center">{t("inviteCreateUser")}</p>
</div>
);
} else if (type === "oidc_not_allowed") {
return (
<div>
<p className="text-center mb-4">
{t("inviteErrorOidcNotAllowed")}
</p>
</div>
);
} else if (type === "user_limit_exceeded") {
return (
<div>
@@ -199,6 +214,10 @@ export default function InviteStatusCard({
);
} else if (type === "user_does_not_exist") {
return <Button onClick={goToSignup}>{t("createAnAccount")}</Button>;
} else if (type === "oidc_not_allowed") {
return (
<Button onClick={goToLogin}>{t("inviteLogInOtherUser")}</Button>
);
} else if (type === "user_limit_exceeded") {
return (
<Button
+4 -1
View File
@@ -8,6 +8,7 @@ import {
InfoSections,
InfoSectionTitle
} from "@app/components/InfoSection";
import CopyToClipboard from "@app/components/CopyToClipboard";
import { useTranslations } from "next-intl";
type OrgInfoCardProps = {};
@@ -26,7 +27,9 @@ export default function OrgInfoCard({}: OrgInfoCardProps) {
</InfoSection>
<InfoSection>
<InfoSectionTitle>{t("orgId")}</InfoSectionTitle>
<InfoSectionContent>{org.org.orgId}</InfoSectionContent>
<InfoSectionContent>
<CopyToClipboard text={org.org.orgId} />
</InfoSectionContent>
</InfoSection>
<InfoSection>
<InfoSectionTitle>{t("subnet")}</InfoSectionTitle>
+4 -51
View File
@@ -9,17 +9,15 @@ import {
FormMessage
} from "@app/components/ui/form";
import { toast } from "@app/hooks/useToast";
import { useTranslations } from "next-intl";
import { useRef } from "react";
import type { FieldValues, Path, UseFormReturn } from "react-hook-form";
import { RolesSelector, type SelectedRole } from "./roles-selector";
type OrgRolesTagFieldProps<TFieldValues extends FieldValues> = {
form: Pick<
UseFormReturn<TFieldValues>,
"control" | "getValues" | "setValue"
"control" | "getValues" | "setValue" | "clearErrors"
>;
orgId: string;
/** Field in the form that holds Tag[] (role tags). Default: `"roles"`. */
@@ -42,46 +40,6 @@ export default function OrgRolesTagField<TFieldValues extends FieldValues>({
disabled
}: OrgRolesTagFieldProps<TFieldValues>) {
const t = useTranslations();
const isPopoverOpenRef = useRef(false);
const lastValidRolesRef = useRef<SelectedRole[]>(
(form.getValues(name) as SelectedRole[]) ?? []
);
function validateRolesSelection() {
const current = form.getValues(name) as SelectedRole[];
if (current.length === 0 && lastValidRolesRef.current.length > 0) {
form.setValue(name, lastValidRolesRef.current as never, {
shouldDirty: true
});
toast({
variant: "destructive",
title: t("accessRoleRequired"),
description: t("accessRoleSelectPlease")
});
return false;
}
if (current.length > 0) {
lastValidRolesRef.current = current;
}
return true;
}
function handlePopoverOpenChange(open: boolean) {
isPopoverOpenRef.current = open;
if (open) {
const current = form.getValues(name) as SelectedRole[];
if (current.length > 0) {
lastValidRolesRef.current = current;
}
return;
}
validateRolesSelection();
}
function setRoleTags(nextValue: SelectedRole[]) {
const prev = form.getValues(name) as SelectedRole[];
@@ -99,15 +57,14 @@ export default function OrgRolesTagField<TFieldValues extends FieldValues>({
form.setValue(name, [prev[prev.length - 1]] as never, {
shouldDirty: true
});
form.clearErrors(name);
return;
}
form.setValue(name, next as never, { shouldDirty: true });
if (next.length > 0 && !isPopoverOpenRef.current) {
lastValidRolesRef.current = next;
} else if (!isPopoverOpenRef.current) {
validateRolesSelection();
if (next.length > 0) {
form.clearErrors(name);
}
}
@@ -117,9 +74,6 @@ export default function OrgRolesTagField<TFieldValues extends FieldValues>({
name={name}
render={({ field }) => {
const selectedRoles = (field.value ?? []) as SelectedRole[];
if (!isPopoverOpenRef.current && selectedRoles.length > 0) {
lastValidRolesRef.current = selectedRoles;
}
return (
<FormItem className="flex flex-col items-start">
@@ -129,7 +83,6 @@ export default function OrgRolesTagField<TFieldValues extends FieldValues>({
orgId={orgId}
selectedRoles={selectedRoles}
onSelectRoles={setRoleTags}
onPopoverOpenChange={handlePopoverOpenChange}
disabled={disabled}
/>
</FormControl>
+33 -4
View File
@@ -56,6 +56,7 @@ type SmartLoginFormProps = {
defaultUser?: string;
orgSignIn?: OrgSignInConfig;
lastUsedIdp?: (LoginFormIDP & { orgId?: string }) | null;
inviteMode?: boolean;
};
type ViewState =
@@ -93,7 +94,8 @@ export default function SmartLoginForm({
forceLogin,
defaultUser,
orgSignIn,
lastUsedIdp
lastUsedIdp,
inviteMode = false
}: SmartLoginFormProps) {
const router = useRouter();
const { env } = useEnvContext();
@@ -136,6 +138,10 @@ export default function SmartLoginForm({
return;
}
const signupUrl = redirect
? `/auth/signup?email=${encodeURIComponent(identifier)}&redirect=${encodeURIComponent(redirect)}&fromSmartLogin=true`
: `/auth/signup?email=${encodeURIComponent(identifier)}&fromSmartLogin=true`;
if (!result.found || result.accounts.length === 0) {
// No accounts found
if (!isEmail || forceLogin) {
@@ -147,13 +153,36 @@ export default function SmartLoginForm({
return;
}
// Valid email but no accounts and not forceLogin - redirect to signup
const signupUrl = redirect
? `/auth/signup?email=${encodeURIComponent(identifier)}&redirect=${encodeURIComponent(redirect)}&fromSmartLogin=true`
: `/auth/signup?email=${encodeURIComponent(identifier)}&fromSmartLogin=true`;
router.push(signupUrl);
return;
}
// Invite accept only supports internal (password) accounts
if (inviteMode) {
const internalAccount = result.accounts.find(
(acc) => acc.hasInternalAuth
);
if (internalAccount) {
setViewState({
type: "password",
identifier,
account: internalAccount
});
return;
}
if (isEmail && !forceLogin) {
router.push(signupUrl);
return;
}
form.setError("identifier", {
type: "manual",
message: t("inviteLoginInternalOnly")
});
return;
}
// Determine which view to show
const account = result.accounts[0]; // Use first account for now
@@ -15,11 +15,14 @@ import {
} from "@app/components/ui/popover";
import { cn } from "@app/lib/cn";
import { ListUserOrgsResponse } from "@server/routers/org";
import { Check, ChevronDown, ChevronsUpDown } from "lucide-react";
import { Check, ChevronDown, Plus } from "lucide-react";
import { usePathname, useRouter } from "next/navigation";
import { useMemo, useState } from "react";
import { useTranslations } from "next-intl";
import { Button } from "@app/components/ui/button";
import { useEnvContext } from "@app/hooks/useEnvContext";
import { useUserContext } from "@app/hooks/useUserContext";
import { build } from "@server/build";
type LauncherOrgSelectorProps = {
orgId?: string;
@@ -31,9 +34,16 @@ export function LauncherOrgSelector({ orgId, orgs }: LauncherOrgSelectorProps) {
const router = useRouter();
const pathname = usePathname();
const t = useTranslations();
const { env } = useEnvContext();
const { user } = useUserContext();
const selectedOrg = orgs?.find((org) => org.orgId === orgId);
let canCreateOrg = !env.flags.disableUserCreateOrg || user.serverAdmin;
if (build === "saas" && user.type !== "internal") {
canCreateOrg = false;
}
const sortedOrgs = useMemo(() => {
if (!orgs?.length) {
return orgs ?? [];
@@ -108,6 +118,22 @@ export function LauncherOrgSelector({ orgId, orgs }: LauncherOrgSelectorProps) {
</CommandGroup>
</CommandList>
</Command>
{canCreateOrg && (
<div className="p-2 border-t border-border">
<Button
variant="ghost"
size="sm"
className="w-full justify-start h-8 font-normal text-muted-foreground"
onClick={() => {
setOpen(false);
router.push("/setup");
}}
>
<Plus className="h-3.5 w-3.5 mr-2" />
{t("setupNewOrg")}
</Button>
</div>
)}
</PopoverContent>
</Popover>
);