mirror of
https://github.com/fosrl/pangolin.git
synced 2026-07-17 11:06:30 +02:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b66430d8d8 |
+2
-2
@@ -5,7 +5,7 @@ go 1.25.0
|
|||||||
require (
|
require (
|
||||||
github.com/charmbracelet/huh v1.0.0
|
github.com/charmbracelet/huh v1.0.0
|
||||||
github.com/charmbracelet/lipgloss v1.1.0
|
github.com/charmbracelet/lipgloss v1.1.0
|
||||||
golang.org/x/term v0.44.0
|
golang.org/x/term v0.45.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -33,6 +33,6 @@ require (
|
|||||||
github.com/rivo/uniseg v0.4.7 // indirect
|
github.com/rivo/uniseg v0.4.7 // indirect
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||||
golang.org/x/sync v0.15.0 // indirect
|
golang.org/x/sync v0.15.0 // indirect
|
||||||
golang.org/x/sys v0.46.0 // indirect
|
golang.org/x/sys v0.47.0 // indirect
|
||||||
golang.org/x/text v0.23.0 // indirect
|
golang.org/x/text v0.23.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
+4
-4
@@ -69,10 +69,10 @@ golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
|
|||||||
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||||
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
|
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
|
||||||
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||||
golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
|
golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
|
||||||
golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
|
golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
|
||||||
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
|
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
|
||||||
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
|
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Списък с покани",
|
"actionListInvitations": "Списък с покани",
|
||||||
"actionExportLogs": "Експортиране на дневници",
|
"actionExportLogs": "Експортиране на дневници",
|
||||||
"actionViewLogs": "Преглед на дневници",
|
"actionViewLogs": "Преглед на дневници",
|
||||||
"actionCreateSiteProvisioningKey": "Създаване на ключ за предоставяне на сайт",
|
|
||||||
"actionListSiteProvisioningKeys": "Списък на ключовете за предоставяне на сайт",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Актуализиране на ключ за предоставяне на сайт",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Изтриване на ключ за предоставяне на сайт",
|
|
||||||
"noneSelected": "Нищо не е избрано",
|
"noneSelected": "Нищо не е избрано",
|
||||||
"orgNotFound2": "Няма намерени организации.",
|
"orgNotFound2": "Няма намерени организации.",
|
||||||
"search": "Търси…",
|
"search": "Търси…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Качването неуспешно",
|
"rdpUploadFailed": "Качването неуспешно",
|
||||||
"rdpUnicodeKeyboardMode": "Режим на unicode клавиатура",
|
"rdpUnicodeKeyboardMode": "Режим на unicode клавиатура",
|
||||||
"sessionToolbarShow": "Показване на лентата с инструменти",
|
"sessionToolbarShow": "Показване на лентата с инструменти",
|
||||||
"sessionToolbarHide": "Скриване на лентата с инструменти",
|
"sessionToolbarHide": "Скриване на лентата с инструменти"
|
||||||
"actionUpdateSiteApprovals": "Обновяване на одобренията на сайта"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Seznam pozvánek",
|
"actionListInvitations": "Seznam pozvánek",
|
||||||
"actionExportLogs": "Exportovat protokoly",
|
"actionExportLogs": "Exportovat protokoly",
|
||||||
"actionViewLogs": "Zobrazit logy",
|
"actionViewLogs": "Zobrazit logy",
|
||||||
"actionCreateSiteProvisioningKey": "Vytvořit klíč pro zřízení webu",
|
|
||||||
"actionListSiteProvisioningKeys": "Seznam klíčů pro zřízení webu",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Aktualizovat klíč pro zřízení webu",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Smazat klíč pro zřízení webu",
|
|
||||||
"noneSelected": "Není vybráno",
|
"noneSelected": "Není vybráno",
|
||||||
"orgNotFound2": "Nebyly nalezeny žádné organizace.",
|
"orgNotFound2": "Nebyly nalezeny žádné organizace.",
|
||||||
"search": "Vyhledávání…",
|
"search": "Vyhledávání…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Nahrání selhalo",
|
"rdpUploadFailed": "Nahrání selhalo",
|
||||||
"rdpUnicodeKeyboardMode": "Režim Unicode klávesnice",
|
"rdpUnicodeKeyboardMode": "Režim Unicode klávesnice",
|
||||||
"sessionToolbarShow": "Zobrazit panel nástrojů",
|
"sessionToolbarShow": "Zobrazit panel nástrojů",
|
||||||
"sessionToolbarHide": "Skrýt panel nástrojů",
|
"sessionToolbarHide": "Skrýt panel nástrojů"
|
||||||
"actionUpdateSiteApprovals": "Aktualizovat schválení webu"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Vis invitationer",
|
"actionListInvitations": "Vis invitationer",
|
||||||
"actionExportLogs": "Eksportér logs",
|
"actionExportLogs": "Eksportér logs",
|
||||||
"actionViewLogs": "Vis logs",
|
"actionViewLogs": "Vis logs",
|
||||||
"actionCreateSiteProvisioningKey": "Opret provisioneringsnøgle til site",
|
|
||||||
"actionListSiteProvisioningKeys": "Vis provisioneringsnøgler til site",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Opdater provisioneringsnøgle til site",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Slet provisioneringsnøgle til site",
|
|
||||||
"noneSelected": "Ingen valgt",
|
"noneSelected": "Ingen valgt",
|
||||||
"orgNotFound2": "Ingen organisationer fundet.",
|
"orgNotFound2": "Ingen organisationer fundet.",
|
||||||
"search": "Søg…",
|
"search": "Søg…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Uploaden mislykkedes",
|
"rdpUploadFailed": "Uploaden mislykkedes",
|
||||||
"rdpUnicodeKeyboardMode": "Unicode tastaturtilstand",
|
"rdpUnicodeKeyboardMode": "Unicode tastaturtilstand",
|
||||||
"sessionToolbarShow": "Vis værktøjslinje",
|
"sessionToolbarShow": "Vis værktøjslinje",
|
||||||
"sessionToolbarHide": "Skjul værktøjslinje",
|
"sessionToolbarHide": "Skjul værktøjslinje"
|
||||||
"actionUpdateSiteApprovals": "Opdater godkendelser på site"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Einladungen auflisten",
|
"actionListInvitations": "Einladungen auflisten",
|
||||||
"actionExportLogs": "Logs exportieren",
|
"actionExportLogs": "Logs exportieren",
|
||||||
"actionViewLogs": "Logs anzeigen",
|
"actionViewLogs": "Logs anzeigen",
|
||||||
"actionCreateSiteProvisioningKey": "Bereitstellungsschlüssel für Standort erstellen",
|
|
||||||
"actionListSiteProvisioningKeys": "Liste der Bereitstellungsschlüssel für Standorte",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Bereitstellungsschlüssel für Standort aktualisieren",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Bereitstellungsschlüssel für Standort löschen",
|
|
||||||
"noneSelected": "Keine ausgewählt",
|
"noneSelected": "Keine ausgewählt",
|
||||||
"orgNotFound2": "Keine Organisationen gefunden.",
|
"orgNotFound2": "Keine Organisationen gefunden.",
|
||||||
"search": "Suche…",
|
"search": "Suche…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Upload fehlgeschlagen",
|
"rdpUploadFailed": "Upload fehlgeschlagen",
|
||||||
"rdpUnicodeKeyboardMode": "Unicode-Tastaturmodus",
|
"rdpUnicodeKeyboardMode": "Unicode-Tastaturmodus",
|
||||||
"sessionToolbarShow": "Werkzeugleiste zeigen",
|
"sessionToolbarShow": "Werkzeugleiste zeigen",
|
||||||
"sessionToolbarHide": "Werkzeugleiste ausblenden",
|
"sessionToolbarHide": "Werkzeugleiste ausblenden"
|
||||||
"actionUpdateSiteApprovals": "Standortgenehmigungen aktualisieren"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "List Invitations",
|
"actionListInvitations": "List Invitations",
|
||||||
"actionExportLogs": "Export Logs",
|
"actionExportLogs": "Export Logs",
|
||||||
"actionViewLogs": "View Logs",
|
"actionViewLogs": "View Logs",
|
||||||
"actionCreateSiteProvisioningKey": "Create Site Provisioning Key",
|
|
||||||
"actionListSiteProvisioningKeys": "List Site Provisioning Keys",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Update Site Provisioning Key",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Delete Site Provisioning Key",
|
|
||||||
"noneSelected": "None selected",
|
"noneSelected": "None selected",
|
||||||
"orgNotFound2": "No organizations found.",
|
"orgNotFound2": "No organizations found.",
|
||||||
"search": "Search…",
|
"search": "Search…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Upload failed",
|
"rdpUploadFailed": "Upload failed",
|
||||||
"rdpUnicodeKeyboardMode": "Unicode keyboard mode",
|
"rdpUnicodeKeyboardMode": "Unicode keyboard mode",
|
||||||
"sessionToolbarShow": "Show toolbar",
|
"sessionToolbarShow": "Show toolbar",
|
||||||
"sessionToolbarHide": "Hide toolbar",
|
"sessionToolbarHide": "Hide toolbar"
|
||||||
"actionUpdateSiteApprovals": "Update Site Approvals"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Listar invitaciones",
|
"actionListInvitations": "Listar invitaciones",
|
||||||
"actionExportLogs": "Exportar registros",
|
"actionExportLogs": "Exportar registros",
|
||||||
"actionViewLogs": "Ver registros",
|
"actionViewLogs": "Ver registros",
|
||||||
"actionCreateSiteProvisioningKey": "Crear clave de aprovisionamiento del sitio",
|
|
||||||
"actionListSiteProvisioningKeys": "Listado de claves de aprovisionamiento del sitio",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Actualizar clave de aprovisionamiento del sitio",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Eliminar clave de aprovisionamiento del sitio",
|
|
||||||
"noneSelected": "Ninguno seleccionado",
|
"noneSelected": "Ninguno seleccionado",
|
||||||
"orgNotFound2": "No se encontraron organizaciones.",
|
"orgNotFound2": "No se encontraron organizaciones.",
|
||||||
"search": "Buscar…",
|
"search": "Buscar…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Error de subida",
|
"rdpUploadFailed": "Error de subida",
|
||||||
"rdpUnicodeKeyboardMode": "Modo teclado Unicode",
|
"rdpUnicodeKeyboardMode": "Modo teclado Unicode",
|
||||||
"sessionToolbarShow": "Mostrar barra de herramientas",
|
"sessionToolbarShow": "Mostrar barra de herramientas",
|
||||||
"sessionToolbarHide": "Ocultar barra de herramientas",
|
"sessionToolbarHide": "Ocultar barra de herramientas"
|
||||||
"actionUpdateSiteApprovals": "Actualizar aprobaciones del sitio"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Lister les invitations",
|
"actionListInvitations": "Lister les invitations",
|
||||||
"actionExportLogs": "Exporter les journaux",
|
"actionExportLogs": "Exporter les journaux",
|
||||||
"actionViewLogs": "Voir les logs",
|
"actionViewLogs": "Voir les logs",
|
||||||
"actionCreateSiteProvisioningKey": "Créer une clé de provisionnement de site",
|
|
||||||
"actionListSiteProvisioningKeys": "Lister les clés de provisionnement de site",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Mettre à jour la clé de provisionnement de site",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Supprimer la clé de provisionnement de site",
|
|
||||||
"noneSelected": "Aucune sélection",
|
"noneSelected": "Aucune sélection",
|
||||||
"orgNotFound2": "Aucune organisation trouvée.",
|
"orgNotFound2": "Aucune organisation trouvée.",
|
||||||
"search": "Rechercher…",
|
"search": "Rechercher…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Échec du téléchargement",
|
"rdpUploadFailed": "Échec du téléchargement",
|
||||||
"rdpUnicodeKeyboardMode": "Mode clavier Unicode",
|
"rdpUnicodeKeyboardMode": "Mode clavier Unicode",
|
||||||
"sessionToolbarShow": "Afficher la barre d'outils",
|
"sessionToolbarShow": "Afficher la barre d'outils",
|
||||||
"sessionToolbarHide": "Masquer la barre d'outils",
|
"sessionToolbarHide": "Masquer la barre d'outils"
|
||||||
"actionUpdateSiteApprovals": "Mettre à jour les approbations de site"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Elenco Inviti",
|
"actionListInvitations": "Elenco Inviti",
|
||||||
"actionExportLogs": "Esporta Log",
|
"actionExportLogs": "Esporta Log",
|
||||||
"actionViewLogs": "Visualizza Log",
|
"actionViewLogs": "Visualizza Log",
|
||||||
"actionCreateSiteProvisioningKey": "Crea Chiave di Provisioning del Sito",
|
|
||||||
"actionListSiteProvisioningKeys": "Elenca Chiavi di Provisioning del Sito",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Aggiorna Chiave di Provisioning del Sito",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Elimina Chiave di Provisioning del Sito",
|
|
||||||
"noneSelected": "Nessuna selezione",
|
"noneSelected": "Nessuna selezione",
|
||||||
"orgNotFound2": "Nessuna organizzazione trovata.",
|
"orgNotFound2": "Nessuna organizzazione trovata.",
|
||||||
"search": "Cerca…",
|
"search": "Cerca…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Caricamento fallito",
|
"rdpUploadFailed": "Caricamento fallito",
|
||||||
"rdpUnicodeKeyboardMode": "Modalità tastiera Unicode",
|
"rdpUnicodeKeyboardMode": "Modalità tastiera Unicode",
|
||||||
"sessionToolbarShow": "Mostra barra degli strumenti",
|
"sessionToolbarShow": "Mostra barra degli strumenti",
|
||||||
"sessionToolbarHide": "Nascondi barra degli strumenti",
|
"sessionToolbarHide": "Nascondi barra degli strumenti"
|
||||||
"actionUpdateSiteApprovals": "Aggiorna Approvazioni del Sito"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "초대 목록",
|
"actionListInvitations": "초대 목록",
|
||||||
"actionExportLogs": "로그 내보내기",
|
"actionExportLogs": "로그 내보내기",
|
||||||
"actionViewLogs": "로그 보기",
|
"actionViewLogs": "로그 보기",
|
||||||
"actionCreateSiteProvisioningKey": "사이트 프로비저닝 키 생성",
|
|
||||||
"actionListSiteProvisioningKeys": "사이트 프로비저닝 키 목록",
|
|
||||||
"actionUpdateSiteProvisioningKey": "사이트 프로비저닝 키 업데이트",
|
|
||||||
"actionDeleteSiteProvisioningKey": "사이트 프로비저닝 키 삭제",
|
|
||||||
"noneSelected": "선택된 항목 없음",
|
"noneSelected": "선택된 항목 없음",
|
||||||
"orgNotFound2": "조직이 없습니다.",
|
"orgNotFound2": "조직이 없습니다.",
|
||||||
"search": "검색…",
|
"search": "검색…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "업로드 실패",
|
"rdpUploadFailed": "업로드 실패",
|
||||||
"rdpUnicodeKeyboardMode": "유니코드 키보드 모드",
|
"rdpUnicodeKeyboardMode": "유니코드 키보드 모드",
|
||||||
"sessionToolbarShow": "툴바 보기",
|
"sessionToolbarShow": "툴바 보기",
|
||||||
"sessionToolbarHide": "툴바 숨기기",
|
"sessionToolbarHide": "툴바 숨기기"
|
||||||
"actionUpdateSiteApprovals": "사이트 승인 업데이트"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Liste invitasjoner",
|
"actionListInvitations": "Liste invitasjoner",
|
||||||
"actionExportLogs": "Eksportlogger",
|
"actionExportLogs": "Eksportlogger",
|
||||||
"actionViewLogs": "Vis logger",
|
"actionViewLogs": "Vis logger",
|
||||||
"actionCreateSiteProvisioningKey": "Opprett Klargjøringsnøkkel for Sted",
|
|
||||||
"actionListSiteProvisioningKeys": "List Klargjøringsnøkler for Sted",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Oppdater Klargjøringsnøkkel for Sted",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Slett Klargjøringsnøkkel for Sted",
|
|
||||||
"noneSelected": "Ingen valgt",
|
"noneSelected": "Ingen valgt",
|
||||||
"orgNotFound2": "Ingen organisasjoner funnet.",
|
"orgNotFound2": "Ingen organisasjoner funnet.",
|
||||||
"search": "Søk…",
|
"search": "Søk…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Opplastningen mislyktes",
|
"rdpUploadFailed": "Opplastningen mislyktes",
|
||||||
"rdpUnicodeKeyboardMode": "Unicode tastaturmodus",
|
"rdpUnicodeKeyboardMode": "Unicode tastaturmodus",
|
||||||
"sessionToolbarShow": "Vis verktøylinje",
|
"sessionToolbarShow": "Vis verktøylinje",
|
||||||
"sessionToolbarHide": "Skjul verktøylinje",
|
"sessionToolbarHide": "Skjul verktøylinje"
|
||||||
"actionUpdateSiteApprovals": "Oppdater Stedsgodkjenninger"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Toon uitnodigingen",
|
"actionListInvitations": "Toon uitnodigingen",
|
||||||
"actionExportLogs": "Logboeken exporteren",
|
"actionExportLogs": "Logboeken exporteren",
|
||||||
"actionViewLogs": "Logboeken bekijken",
|
"actionViewLogs": "Logboeken bekijken",
|
||||||
"actionCreateSiteProvisioningKey": "Een sitevoorzie-ningssleutel aanmaken",
|
|
||||||
"actionListSiteProvisioningKeys": "Sitevoorzie-ningssleutels weergeven",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Sitevoorzie-ningssleutel bijwerken",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Sitevoorzie-ningssleutel verwijderen",
|
|
||||||
"noneSelected": "Niet geselecteerd",
|
"noneSelected": "Niet geselecteerd",
|
||||||
"orgNotFound2": "Geen organisaties gevonden.",
|
"orgNotFound2": "Geen organisaties gevonden.",
|
||||||
"search": "Zoeken…",
|
"search": "Zoeken…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Upload mislukt",
|
"rdpUploadFailed": "Upload mislukt",
|
||||||
"rdpUnicodeKeyboardMode": "Unicode toetsenbordmodus",
|
"rdpUnicodeKeyboardMode": "Unicode toetsenbordmodus",
|
||||||
"sessionToolbarShow": "Toon werkbalk",
|
"sessionToolbarShow": "Toon werkbalk",
|
||||||
"sessionToolbarHide": "Verberg werkbalk",
|
"sessionToolbarHide": "Verberg werkbalk"
|
||||||
"actionUpdateSiteApprovals": "Sitegoedkeuringen bijwerken"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Lista zaproszeń",
|
"actionListInvitations": "Lista zaproszeń",
|
||||||
"actionExportLogs": "Eksportuj dzienniki",
|
"actionExportLogs": "Eksportuj dzienniki",
|
||||||
"actionViewLogs": "Zobacz dzienniki",
|
"actionViewLogs": "Zobacz dzienniki",
|
||||||
"actionCreateSiteProvisioningKey": "Utwórz klucz konfiguracji strony",
|
|
||||||
"actionListSiteProvisioningKeys": "Lista kluczy konfiguracji strony",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Zaktualizuj klucz konfiguracji strony",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Usuń klucz konfiguracji strony",
|
|
||||||
"noneSelected": "Nie wybrano",
|
"noneSelected": "Nie wybrano",
|
||||||
"orgNotFound2": "Nie znaleziono organizacji.",
|
"orgNotFound2": "Nie znaleziono organizacji.",
|
||||||
"search": "Szukaj…",
|
"search": "Szukaj…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Niepowodzenie przesyłania",
|
"rdpUploadFailed": "Niepowodzenie przesyłania",
|
||||||
"rdpUnicodeKeyboardMode": "Tryb klawiatury Unicode",
|
"rdpUnicodeKeyboardMode": "Tryb klawiatury Unicode",
|
||||||
"sessionToolbarShow": "Pokaż pasek narzędzi",
|
"sessionToolbarShow": "Pokaż pasek narzędzi",
|
||||||
"sessionToolbarHide": "Ukryj pasek narzędzi",
|
"sessionToolbarHide": "Ukryj pasek narzędzi"
|
||||||
"actionUpdateSiteApprovals": "Zaktualizuj zgody na stronę"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Listar Convites",
|
"actionListInvitations": "Listar Convites",
|
||||||
"actionExportLogs": "Exportar logs",
|
"actionExportLogs": "Exportar logs",
|
||||||
"actionViewLogs": "Visualizar registros",
|
"actionViewLogs": "Visualizar registros",
|
||||||
"actionCreateSiteProvisioningKey": "Criar Chave de Provisionamento do Site",
|
|
||||||
"actionListSiteProvisioningKeys": "Listar Chaves de Provisionamento do Site",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Atualizar Chave de Provisionamento do Site",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Excluir Chave de Provisionamento do Site",
|
|
||||||
"noneSelected": "Nenhum selecionado",
|
"noneSelected": "Nenhum selecionado",
|
||||||
"orgNotFound2": "Nenhuma organização encontrada.",
|
"orgNotFound2": "Nenhuma organização encontrada.",
|
||||||
"search": "Pesquisar…",
|
"search": "Pesquisar…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Falha no upload",
|
"rdpUploadFailed": "Falha no upload",
|
||||||
"rdpUnicodeKeyboardMode": "Modo de teclado Unicode",
|
"rdpUnicodeKeyboardMode": "Modo de teclado Unicode",
|
||||||
"sessionToolbarShow": "Mostrar barra de ferramentas",
|
"sessionToolbarShow": "Mostrar barra de ferramentas",
|
||||||
"sessionToolbarHide": "Ocultar barra de ferramentas",
|
"sessionToolbarHide": "Ocultar barra de ferramentas"
|
||||||
"actionUpdateSiteApprovals": "Atualizar Aprovações do Site"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Список приглашений",
|
"actionListInvitations": "Список приглашений",
|
||||||
"actionExportLogs": "Экспорт журналов",
|
"actionExportLogs": "Экспорт журналов",
|
||||||
"actionViewLogs": "Просмотр журналов",
|
"actionViewLogs": "Просмотр журналов",
|
||||||
"actionCreateSiteProvisioningKey": "Создать ключ конфигурации сайта",
|
|
||||||
"actionListSiteProvisioningKeys": "Список ключей конфигурации сайтов",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Обновить ключ конфигурации сайта",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Удалить ключ конфигурации сайта",
|
|
||||||
"noneSelected": "Ничего не выбрано",
|
"noneSelected": "Ничего не выбрано",
|
||||||
"orgNotFound2": "Организации не найдены.",
|
"orgNotFound2": "Организации не найдены.",
|
||||||
"search": "Поиск…",
|
"search": "Поиск…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Ошибка загрузки",
|
"rdpUploadFailed": "Ошибка загрузки",
|
||||||
"rdpUnicodeKeyboardMode": "Режим клавиатуры Unicode",
|
"rdpUnicodeKeyboardMode": "Режим клавиатуры Unicode",
|
||||||
"sessionToolbarShow": "Показать панель инструментов",
|
"sessionToolbarShow": "Показать панель инструментов",
|
||||||
"sessionToolbarHide": "Скрыть панель инструментов",
|
"sessionToolbarHide": "Скрыть панель инструментов"
|
||||||
"actionUpdateSiteApprovals": "Обновить утверждения сайта"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "Davetiyeleri Listele",
|
"actionListInvitations": "Davetiyeleri Listele",
|
||||||
"actionExportLogs": "Kayıtları Dışa Aktar",
|
"actionExportLogs": "Kayıtları Dışa Aktar",
|
||||||
"actionViewLogs": "Kayıtları Görüntüle",
|
"actionViewLogs": "Kayıtları Görüntüle",
|
||||||
"actionCreateSiteProvisioningKey": "Site Sağlama Anahtarı Oluştur",
|
|
||||||
"actionListSiteProvisioningKeys": "Site Sağlama Anahtarlarını Listele",
|
|
||||||
"actionUpdateSiteProvisioningKey": "Site Sağlama Anahtarını Güncelle",
|
|
||||||
"actionDeleteSiteProvisioningKey": "Site Sağlama Anahtarını Sil",
|
|
||||||
"noneSelected": "Hiçbiri seçili değil",
|
"noneSelected": "Hiçbiri seçili değil",
|
||||||
"orgNotFound2": "Hiçbir organizasyon bulunamadı.",
|
"orgNotFound2": "Hiçbir organizasyon bulunamadı.",
|
||||||
"search": "Ara…",
|
"search": "Ara…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "Yükleme başarısız",
|
"rdpUploadFailed": "Yükleme başarısız",
|
||||||
"rdpUnicodeKeyboardMode": "Unicode klavye modu",
|
"rdpUnicodeKeyboardMode": "Unicode klavye modu",
|
||||||
"sessionToolbarShow": "Araç çubuğunu göster",
|
"sessionToolbarShow": "Araç çubuğunu göster",
|
||||||
"sessionToolbarHide": "Araç çubuğunu gizle",
|
"sessionToolbarHide": "Araç çubuğunu gizle"
|
||||||
"actionUpdateSiteApprovals": "Site Onaylarını Güncelle"
|
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -1511,10 +1511,6 @@
|
|||||||
"actionListInvitations": "邀请列表",
|
"actionListInvitations": "邀请列表",
|
||||||
"actionExportLogs": "导出日志",
|
"actionExportLogs": "导出日志",
|
||||||
"actionViewLogs": "查看日志",
|
"actionViewLogs": "查看日志",
|
||||||
"actionCreateSiteProvisioningKey": "创建站点预配密钥",
|
|
||||||
"actionListSiteProvisioningKeys": "列出站点预配密钥",
|
|
||||||
"actionUpdateSiteProvisioningKey": "更新站点预配密钥",
|
|
||||||
"actionDeleteSiteProvisioningKey": "删除站点预配密钥",
|
|
||||||
"noneSelected": "未选择",
|
"noneSelected": "未选择",
|
||||||
"orgNotFound2": "未找到组织。",
|
"orgNotFound2": "未找到组织。",
|
||||||
"search": "搜索…",
|
"search": "搜索…",
|
||||||
@@ -3815,6 +3811,5 @@
|
|||||||
"rdpUploadFailed": "上传失败",
|
"rdpUploadFailed": "上传失败",
|
||||||
"rdpUnicodeKeyboardMode": "Unicode 键盘模式",
|
"rdpUnicodeKeyboardMode": "Unicode 键盘模式",
|
||||||
"sessionToolbarShow": "显示工具栏",
|
"sessionToolbarShow": "显示工具栏",
|
||||||
"sessionToolbarHide": "隐藏工具栏",
|
"sessionToolbarHide": "隐藏工具栏"
|
||||||
"actionUpdateSiteApprovals": "更新站点审批"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -239,31 +239,6 @@ export async function updatePrivateResources(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (resourceData.alias) {
|
|
||||||
const [aliasConflict] = await trx
|
|
||||||
.select({
|
|
||||||
siteResourceId: siteResources.siteResourceId
|
|
||||||
})
|
|
||||||
.from(siteResources)
|
|
||||||
.where(
|
|
||||||
and(
|
|
||||||
eq(siteResources.orgId, orgId),
|
|
||||||
eq(siteResources.alias, resourceData.alias),
|
|
||||||
ne(
|
|
||||||
siteResources.siteResourceId,
|
|
||||||
existingResource.siteResourceId
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.limit(1);
|
|
||||||
|
|
||||||
if (aliasConflict) {
|
|
||||||
throw new Error(
|
|
||||||
`Alias ${resourceData.alias} already in use by another site resource in org ${orgId}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update existing resource
|
// Update existing resource
|
||||||
const [updatedResource] = await trx
|
const [updatedResource] = await trx
|
||||||
.update(siteResources)
|
.update(siteResources)
|
||||||
@@ -505,27 +480,6 @@ export async function updatePrivateResources(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (resourceData.alias) {
|
|
||||||
const [aliasConflict] = await trx
|
|
||||||
.select({
|
|
||||||
siteResourceId: siteResources.siteResourceId
|
|
||||||
})
|
|
||||||
.from(siteResources)
|
|
||||||
.where(
|
|
||||||
and(
|
|
||||||
eq(siteResources.orgId, orgId),
|
|
||||||
eq(siteResources.alias, resourceData.alias)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.limit(1);
|
|
||||||
|
|
||||||
if (aliasConflict) {
|
|
||||||
throw new Error(
|
|
||||||
`Alias ${resourceData.alias} already in use by another site resource in org ${orgId}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const [network] = await trx
|
const [network] = await trx
|
||||||
.insert(networks)
|
.insert(networks)
|
||||||
.values({
|
.values({
|
||||||
|
|||||||
+18
-49
@@ -8,42 +8,26 @@ const STATUS_HISTORY_CACHE_TTL = 60; // seconds
|
|||||||
function statusHistoryCacheKey(
|
function statusHistoryCacheKey(
|
||||||
entityType: string,
|
entityType: string,
|
||||||
entityId: number,
|
entityId: number,
|
||||||
days: number,
|
days: number
|
||||||
tzOffsetMinutes: number
|
|
||||||
): string {
|
): string {
|
||||||
return `statusHistory:${entityType}:${entityId}:${days}:${tzOffsetMinutes}`;
|
return `statusHistory:${entityType}:${entityId}:${days}`;
|
||||||
}
|
|
||||||
|
|
||||||
// Returns the epoch seconds of the most recent local-calendar-day midnight,
|
|
||||||
// where "local" is defined by tzOffsetMinutes (minutes to ADD to UTC to get
|
|
||||||
// local time, e.g. Australia/Sydney standard time is 600). Defaults to 0
|
|
||||||
// (UTC) so callers that don't pass a timezone keep the original behavior.
|
|
||||||
function localMidnightSec(tzOffsetMinutes: number): number {
|
|
||||||
const localNow = new Date(Date.now() + tzOffsetMinutes * 60_000);
|
|
||||||
localNow.setUTCHours(0, 0, 0, 0);
|
|
||||||
return Math.floor(localNow.getTime() / 1000) - tzOffsetMinutes * 60;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getCachedStatusHistory(
|
export async function getCachedStatusHistory(
|
||||||
entityType: string,
|
entityType: string,
|
||||||
entityId: number,
|
entityId: number,
|
||||||
days: number,
|
days: number
|
||||||
tzOffsetMinutes: number = 0
|
|
||||||
): Promise<StatusHistoryResponse> {
|
): Promise<StatusHistoryResponse> {
|
||||||
const cacheKey = statusHistoryCacheKey(
|
const cacheKey = statusHistoryCacheKey(entityType, entityId, days);
|
||||||
entityType,
|
|
||||||
entityId,
|
|
||||||
days,
|
|
||||||
tzOffsetMinutes
|
|
||||||
);
|
|
||||||
const cached = await cache.get<StatusHistoryResponse>(cacheKey);
|
const cached = await cache.get<StatusHistoryResponse>(cacheKey);
|
||||||
if (cached !== undefined) {
|
if (cached !== undefined) {
|
||||||
return cached;
|
return cached;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Anchor to local midnight (UTC when tzOffsetMinutes is 0) so the query
|
// Anchor to UTC midnight so the query window aligns with stable calendar days
|
||||||
// window aligns with stable calendar days for the requesting client
|
const utcToday = new Date();
|
||||||
const todayMidnightSec = localMidnightSec(tzOffsetMinutes);
|
utcToday.setUTCHours(0, 0, 0, 0);
|
||||||
|
const todayMidnightSec = Math.floor(utcToday.getTime() / 1000);
|
||||||
const startSec = todayMidnightSec - days * 86400;
|
const startSec = todayMidnightSec - days * 86400;
|
||||||
|
|
||||||
const events = await logsDb
|
const events = await logsDb
|
||||||
@@ -79,8 +63,7 @@ export async function getCachedStatusHistory(
|
|||||||
const { buckets, totalDowntime } = computeBuckets(
|
const { buckets, totalDowntime } = computeBuckets(
|
||||||
events,
|
events,
|
||||||
days,
|
days,
|
||||||
priorStatus,
|
priorStatus
|
||||||
tzOffsetMinutes
|
|
||||||
);
|
);
|
||||||
const totalWindow = days * 86400;
|
const totalWindow = days * 86400;
|
||||||
const overallUptime =
|
const overallUptime =
|
||||||
@@ -116,19 +99,11 @@ export const statusHistoryQuerySchema = z
|
|||||||
days: z
|
days: z
|
||||||
.string()
|
.string()
|
||||||
.optional()
|
.optional()
|
||||||
.transform((v) => (v ? parseInt(v, 10) : 90)),
|
.transform((v) => (v ? parseInt(v, 10) : 90))
|
||||||
// Minutes to add to UTC to get the requesting client's local time
|
|
||||||
// (e.g. Australia/Sydney standard time is 600). Optional and
|
|
||||||
// defaults to 0 (UTC) so older clients keep the prior behavior.
|
|
||||||
tzOffsetMinutes: z
|
|
||||||
.string()
|
|
||||||
.optional()
|
|
||||||
.transform((v) => (v ? parseInt(v, 10) : 0))
|
|
||||||
})
|
})
|
||||||
.pipe(
|
.pipe(
|
||||||
z.object({
|
z.object({
|
||||||
days: z.number().int().min(1).max(365),
|
days: z.number().int().min(1).max(365)
|
||||||
tzOffsetMinutes: z.number().int().min(-720).max(840)
|
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -158,15 +133,15 @@ export function computeBuckets(
|
|||||||
id: number;
|
id: number;
|
||||||
}[],
|
}[],
|
||||||
days: number,
|
days: number,
|
||||||
priorStatus: string | null = null,
|
priorStatus: string | null = null
|
||||||
tzOffsetMinutes: number = 0
|
|
||||||
): { buckets: StatusHistoryDayBucket[]; totalDowntime: number } {
|
): { buckets: StatusHistoryDayBucket[]; totalDowntime: number } {
|
||||||
const nowSec = Math.floor(Date.now() / 1000);
|
const nowSec = Math.floor(Date.now() / 1000);
|
||||||
|
|
||||||
// Anchor bucket boundaries to local midnight (UTC when tzOffsetMinutes is
|
// Anchor bucket boundaries to UTC midnight so dates are stable calendar days
|
||||||
// 0) so dates are stable calendar days for the requesting client and
|
// and don't drift as the cache expires and is recomputed
|
||||||
// don't drift as the cache expires and is recomputed
|
const utcToday = new Date();
|
||||||
const todayMidnightSec = localMidnightSec(tzOffsetMinutes);
|
utcToday.setUTCHours(0, 0, 0, 0);
|
||||||
|
const todayMidnightSec = Math.floor(utcToday.getTime() / 1000);
|
||||||
|
|
||||||
const buckets: StatusHistoryDayBucket[] = [];
|
const buckets: StatusHistoryDayBucket[] = [];
|
||||||
let totalDowntime = 0;
|
let totalDowntime = 0;
|
||||||
@@ -262,13 +237,7 @@ export function computeBuckets(
|
|||||||
)
|
)
|
||||||
: 100;
|
: 100;
|
||||||
|
|
||||||
// Shift by the client's offset before formatting so the label reflects
|
const dateStr = new Date(dayStartSec * 1000).toISOString().slice(0, 10);
|
||||||
// their local calendar date rather than the UTC date of dayStartSec
|
|
||||||
const dateStr = new Date(
|
|
||||||
(dayStartSec + tzOffsetMinutes * 60) * 1000
|
|
||||||
)
|
|
||||||
.toISOString()
|
|
||||||
.slice(0, 10);
|
|
||||||
|
|
||||||
const hasAnyData = currentStatus !== null || dayEvents.length > 0;
|
const hasAnyData = currentStatus !== null || dayEvents.length > 0;
|
||||||
|
|
||||||
|
|||||||
@@ -17,4 +17,3 @@ export * from "./verifyApiKeySiteResourceAccess";
|
|||||||
export * from "./verifyApiKeyIdpAccess";
|
export * from "./verifyApiKeyIdpAccess";
|
||||||
export * from "./verifyApiKeyDomainAccess";
|
export * from "./verifyApiKeyDomainAccess";
|
||||||
export * from "./verifyApiKeyResourcePolicyAccess";
|
export * from "./verifyApiKeyResourcePolicyAccess";
|
||||||
export * from "./verifyApiKeySiteProvisioningKeyAccess";
|
|
||||||
|
|||||||
@@ -1,111 +0,0 @@
|
|||||||
import { Request, Response, NextFunction } from "express";
|
|
||||||
import {
|
|
||||||
db,
|
|
||||||
siteProvisioningKeys,
|
|
||||||
siteProvisioningKeyOrg,
|
|
||||||
apiKeyOrg
|
|
||||||
} from "@server/db";
|
|
||||||
import { and, eq } from "drizzle-orm";
|
|
||||||
import createHttpError from "http-errors";
|
|
||||||
import HttpCode from "@server/types/HttpCode";
|
|
||||||
import { getFirstString } from "@server/lib/requestParams";
|
|
||||||
|
|
||||||
export async function verifyApiKeySiteProvisioningKeyAccess(
|
|
||||||
req: Request,
|
|
||||||
res: Response,
|
|
||||||
next: NextFunction
|
|
||||||
) {
|
|
||||||
try {
|
|
||||||
const apiKey = req.apiKey;
|
|
||||||
const siteProvisioningKeyId =
|
|
||||||
getFirstString(req.params.siteProvisioningKeyId) ||
|
|
||||||
getFirstString(req.body.siteProvisioningKeyId) ||
|
|
||||||
getFirstString(req.query.siteProvisioningKeyId);
|
|
||||||
const orgId = getFirstString(req.params.orgId);
|
|
||||||
|
|
||||||
if (!apiKey) {
|
|
||||||
return next(
|
|
||||||
createHttpError(HttpCode.UNAUTHORIZED, "Key not authenticated")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!orgId) {
|
|
||||||
return next(
|
|
||||||
createHttpError(HttpCode.BAD_REQUEST, "Invalid organization ID")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!siteProvisioningKeyId) {
|
|
||||||
return next(
|
|
||||||
createHttpError(HttpCode.BAD_REQUEST, "Invalid key ID")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (apiKey.isRoot) {
|
|
||||||
// Root keys can access any site provisioning key in any org
|
|
||||||
return next();
|
|
||||||
}
|
|
||||||
|
|
||||||
const [row] = await db
|
|
||||||
.select()
|
|
||||||
.from(siteProvisioningKeys)
|
|
||||||
.innerJoin(
|
|
||||||
siteProvisioningKeyOrg,
|
|
||||||
and(
|
|
||||||
eq(
|
|
||||||
siteProvisioningKeys.siteProvisioningKeyId,
|
|
||||||
siteProvisioningKeyOrg.siteProvisioningKeyId
|
|
||||||
),
|
|
||||||
eq(siteProvisioningKeyOrg.orgId, orgId)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.where(
|
|
||||||
eq(
|
|
||||||
siteProvisioningKeys.siteProvisioningKeyId,
|
|
||||||
siteProvisioningKeyId
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.limit(1);
|
|
||||||
|
|
||||||
if (!row?.siteProvisioningKeys || !row.siteProvisioningKeyOrg) {
|
|
||||||
return next(
|
|
||||||
createHttpError(
|
|
||||||
HttpCode.NOT_FOUND,
|
|
||||||
`Site provisioning key with ID ${siteProvisioningKeyId} not found for organization ${orgId}`
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!req.apiKeyOrg) {
|
|
||||||
const apiKeyOrgRes = await db
|
|
||||||
.select()
|
|
||||||
.from(apiKeyOrg)
|
|
||||||
.where(
|
|
||||||
and(
|
|
||||||
eq(apiKeyOrg.apiKeyId, apiKey.apiKeyId),
|
|
||||||
eq(apiKeyOrg.orgId, row.siteProvisioningKeyOrg.orgId)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.limit(1);
|
|
||||||
req.apiKeyOrg = apiKeyOrgRes[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!req.apiKeyOrg) {
|
|
||||||
return next(
|
|
||||||
createHttpError(
|
|
||||||
HttpCode.FORBIDDEN,
|
|
||||||
"Key does not have access to this organization"
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return next();
|
|
||||||
} catch (error) {
|
|
||||||
return next(
|
|
||||||
createHttpError(
|
|
||||||
HttpCode.INTERNAL_SERVER_ERROR,
|
|
||||||
"Error verifying site provisioning key access"
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -18,7 +18,6 @@ export enum OpenAPITags {
|
|||||||
OrgIdp = "Identity Provider (Organization Only)",
|
OrgIdp = "Identity Provider (Organization Only)",
|
||||||
Client = "Client",
|
Client = "Client",
|
||||||
ApiKey = "API Key",
|
ApiKey = "API Key",
|
||||||
SiteProvisioningKey = "Site Provisioning Key",
|
|
||||||
Domain = "Domain",
|
Domain = "Domain",
|
||||||
Blueprint = "Blueprint",
|
Blueprint = "Blueprint",
|
||||||
Ssh = "SSH",
|
Ssh = "SSH",
|
||||||
|
|||||||
@@ -55,14 +55,9 @@ export async function getHealthCheckStatusHistory(
|
|||||||
|
|
||||||
const entityType = "health_check";
|
const entityType = "health_check";
|
||||||
const entityId = parsedParams.data.healthCheckId;
|
const entityId = parsedParams.data.healthCheckId;
|
||||||
const { days, tzOffsetMinutes } = parsedQuery.data;
|
const { days } = parsedQuery.data;
|
||||||
|
|
||||||
const data = await getCachedStatusHistory(
|
const data = await getCachedStatusHistory(entityType, entityId, days);
|
||||||
entityType,
|
|
||||||
entityId,
|
|
||||||
days,
|
|
||||||
tzOffsetMinutes
|
|
||||||
);
|
|
||||||
|
|
||||||
return response<StatusHistoryResponse>(res, {
|
return response<StatusHistoryResponse>(res, {
|
||||||
data,
|
data,
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ import * as org from "#private/routers/org";
|
|||||||
import * as logs from "#private/routers/auditLogs";
|
import * as logs from "#private/routers/auditLogs";
|
||||||
import * as alertEvents from "#private/routers/alertEvents";
|
import * as alertEvents from "#private/routers/alertEvents";
|
||||||
import * as certificates from "#private/routers/certificates";
|
import * as certificates from "#private/routers/certificates";
|
||||||
import * as siteProvisioning from "#private/routers/siteProvisioning";
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
verifyApiKeyHasAction,
|
verifyApiKeyHasAction,
|
||||||
@@ -25,7 +24,6 @@ import {
|
|||||||
verifyApiKeyIdpAccess,
|
verifyApiKeyIdpAccess,
|
||||||
verifyApiKeyRoleAccess,
|
verifyApiKeyRoleAccess,
|
||||||
verifyApiKeyUserAccess,
|
verifyApiKeyUserAccess,
|
||||||
verifyApiKeySiteProvisioningKeyAccess,
|
|
||||||
verifyLimits
|
verifyLimits
|
||||||
} from "@server/middlewares";
|
} from "@server/middlewares";
|
||||||
import * as user from "#private/routers/user";
|
import * as user from "#private/routers/user";
|
||||||
@@ -217,45 +215,3 @@ authenticated.delete(
|
|||||||
logActionAudit(ActionsEnum.removeUserRole),
|
logActionAudit(ActionsEnum.removeUserRole),
|
||||||
user.removeUserRole
|
user.removeUserRole
|
||||||
);
|
);
|
||||||
|
|
||||||
authenticated.put(
|
|
||||||
"/org/:orgId/site-provisioning-key",
|
|
||||||
verifyValidLicense,
|
|
||||||
verifyValidSubscription(tierMatrix.siteProvisioningKeys),
|
|
||||||
verifyApiKeyOrgAccess,
|
|
||||||
verifyLimits,
|
|
||||||
verifyApiKeyHasAction(ActionsEnum.createSiteProvisioningKey),
|
|
||||||
logActionAudit(ActionsEnum.createSiteProvisioningKey),
|
|
||||||
siteProvisioning.createSiteProvisioningKey
|
|
||||||
);
|
|
||||||
|
|
||||||
authenticated.get(
|
|
||||||
"/org/:orgId/site-provisioning-keys",
|
|
||||||
verifyValidLicense,
|
|
||||||
verifyValidSubscription(tierMatrix.siteProvisioningKeys),
|
|
||||||
verifyApiKeyOrgAccess,
|
|
||||||
verifyApiKeyHasAction(ActionsEnum.listSiteProvisioningKeys),
|
|
||||||
siteProvisioning.listSiteProvisioningKeys
|
|
||||||
);
|
|
||||||
|
|
||||||
authenticated.delete(
|
|
||||||
"/org/:orgId/site-provisioning-key/:siteProvisioningKeyId",
|
|
||||||
verifyValidLicense,
|
|
||||||
verifyValidSubscription(tierMatrix.siteProvisioningKeys),
|
|
||||||
verifyApiKeyOrgAccess,
|
|
||||||
verifyApiKeySiteProvisioningKeyAccess,
|
|
||||||
verifyApiKeyHasAction(ActionsEnum.deleteSiteProvisioningKey),
|
|
||||||
logActionAudit(ActionsEnum.deleteSiteProvisioningKey),
|
|
||||||
siteProvisioning.deleteSiteProvisioningKey
|
|
||||||
);
|
|
||||||
|
|
||||||
authenticated.patch(
|
|
||||||
"/org/:orgId/site-provisioning-key/:siteProvisioningKeyId",
|
|
||||||
verifyValidLicense,
|
|
||||||
verifyValidSubscription(tierMatrix.siteProvisioningKeys),
|
|
||||||
verifyApiKeyOrgAccess,
|
|
||||||
verifyApiKeySiteProvisioningKeyAccess,
|
|
||||||
verifyApiKeyHasAction(ActionsEnum.updateSiteProvisioningKey),
|
|
||||||
logActionAudit(ActionsEnum.updateSiteProvisioningKey),
|
|
||||||
siteProvisioning.updateSiteProvisioningKey
|
|
||||||
);
|
|
||||||
|
|||||||
@@ -26,8 +26,6 @@ import {
|
|||||||
import logger from "@server/logger";
|
import logger from "@server/logger";
|
||||||
import { hashPassword } from "@server/auth/password";
|
import { hashPassword } from "@server/auth/password";
|
||||||
import type { CreateSiteProvisioningKeyResponse } from "@server/routers/siteProvisioning/types";
|
import type { CreateSiteProvisioningKeyResponse } from "@server/routers/siteProvisioning/types";
|
||||||
import { createApiResponseSchema } from "@server/lib/openapi/createApiResponseSchema";
|
|
||||||
import { OpenAPITags, registry } from "@server/openApi";
|
|
||||||
|
|
||||||
const paramsSchema = z.object({
|
const paramsSchema = z.object({
|
||||||
orgId: z.string().nonempty()
|
orgId: z.string().nonempty()
|
||||||
@@ -36,17 +34,10 @@ const paramsSchema = z.object({
|
|||||||
const bodySchema = z
|
const bodySchema = z
|
||||||
.strictObject({
|
.strictObject({
|
||||||
name: z.string().min(1).max(255),
|
name: z.string().min(1).max(255),
|
||||||
maxBatchSize: z
|
maxBatchSize: z.union([
|
||||||
.union([
|
z.null(),
|
||||||
z.null(),
|
z.coerce.number().int().positive().max(1_000_000)
|
||||||
z.coerce.number().int().positive().max(1_000_000)
|
]),
|
||||||
])
|
|
||||||
.openapi({
|
|
||||||
type: "number",
|
|
||||||
default: null,
|
|
||||||
description:
|
|
||||||
"Maximum number of sites that can be provisioned in a single batch. If null, there is no limit."
|
|
||||||
}),
|
|
||||||
validUntil: z.string().max(255).optional(),
|
validUntil: z.string().max(255).optional(),
|
||||||
approveNewSites: z.boolean().optional().default(true)
|
approveNewSites: z.boolean().optional().default(true)
|
||||||
})
|
})
|
||||||
@@ -66,49 +57,6 @@ const bodySchema = z
|
|||||||
|
|
||||||
export type CreateSiteProvisioningKeyBody = z.infer<typeof bodySchema>;
|
export type CreateSiteProvisioningKeyBody = z.infer<typeof bodySchema>;
|
||||||
|
|
||||||
const CreateSiteProvisioningKeyResponseDataSchema = z.object({
|
|
||||||
siteProvisioningKeyId: z.string(),
|
|
||||||
orgId: z.string(),
|
|
||||||
name: z.string(),
|
|
||||||
siteProvisioningKey: z.string(),
|
|
||||||
lastChars: z.string(),
|
|
||||||
createdAt: z.string(),
|
|
||||||
lastUsed: z.string().nullable(),
|
|
||||||
maxBatchSize: z.number().nullable(),
|
|
||||||
numUsed: z.number(),
|
|
||||||
validUntil: z.string().nullable(),
|
|
||||||
approveNewSites: z.boolean()
|
|
||||||
});
|
|
||||||
|
|
||||||
registry.registerPath({
|
|
||||||
method: "put",
|
|
||||||
path: "/org/{orgId}/site-provisioning-key",
|
|
||||||
description: "Create a new site provisioning key for the organization.",
|
|
||||||
tags: [OpenAPITags.SiteProvisioningKey],
|
|
||||||
request: {
|
|
||||||
params: paramsSchema,
|
|
||||||
body: {
|
|
||||||
content: {
|
|
||||||
"application/json": {
|
|
||||||
schema: bodySchema
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
responses: {
|
|
||||||
201: {
|
|
||||||
description: "Successful response",
|
|
||||||
content: {
|
|
||||||
"application/json": {
|
|
||||||
schema: createApiResponseSchema(
|
|
||||||
CreateSiteProvisioningKeyResponseDataSchema
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export async function createSiteProvisioningKey(
|
export async function createSiteProvisioningKey(
|
||||||
req: Request,
|
req: Request,
|
||||||
res: Response,
|
res: Response,
|
||||||
|
|||||||
@@ -13,46 +13,23 @@
|
|||||||
|
|
||||||
import { Request, Response, NextFunction } from "express";
|
import { Request, Response, NextFunction } from "express";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import { db, siteProvisioningKeyOrg, siteProvisioningKeys } from "@server/db";
|
import {
|
||||||
|
db,
|
||||||
|
siteProvisioningKeyOrg,
|
||||||
|
siteProvisioningKeys
|
||||||
|
} from "@server/db";
|
||||||
import { and, eq } from "drizzle-orm";
|
import { and, eq } from "drizzle-orm";
|
||||||
import response from "@server/lib/response";
|
import response from "@server/lib/response";
|
||||||
import HttpCode from "@server/types/HttpCode";
|
import HttpCode from "@server/types/HttpCode";
|
||||||
import createHttpError from "http-errors";
|
import createHttpError from "http-errors";
|
||||||
import logger from "@server/logger";
|
import logger from "@server/logger";
|
||||||
import { fromError } from "zod-validation-error";
|
import { fromError } from "zod-validation-error";
|
||||||
import { OpenAPITags, registry } from "@server/openApi";
|
|
||||||
|
|
||||||
const paramsSchema = z.object({
|
const paramsSchema = z.object({
|
||||||
siteProvisioningKeyId: z.string().nonempty(),
|
siteProvisioningKeyId: z.string().nonempty(),
|
||||||
orgId: z.string().nonempty()
|
orgId: z.string().nonempty()
|
||||||
});
|
});
|
||||||
|
|
||||||
registry.registerPath({
|
|
||||||
method: "delete",
|
|
||||||
path: "/org/{orgId}/site-provisioning-key/{siteProvisioningKeyId}",
|
|
||||||
description: "Delete a site provisioning key.",
|
|
||||||
tags: [OpenAPITags.SiteProvisioningKey],
|
|
||||||
request: {
|
|
||||||
params: paramsSchema
|
|
||||||
},
|
|
||||||
responses: {
|
|
||||||
200: {
|
|
||||||
description: "Successful response",
|
|
||||||
content: {
|
|
||||||
"application/json": {
|
|
||||||
schema: z.object({
|
|
||||||
data: z.record(z.string(), z.any()).nullable(),
|
|
||||||
success: z.boolean(),
|
|
||||||
error: z.boolean(),
|
|
||||||
message: z.string(),
|
|
||||||
status: z.number()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export async function deleteSiteProvisioningKey(
|
export async function deleteSiteProvisioningKey(
|
||||||
req: Request,
|
req: Request,
|
||||||
res: Response,
|
res: Response,
|
||||||
|
|||||||
@@ -11,7 +11,11 @@
|
|||||||
* This file is not licensed under the AGPLv3.
|
* This file is not licensed under the AGPLv3.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { db, siteProvisioningKeyOrg, siteProvisioningKeys } from "@server/db";
|
import {
|
||||||
|
db,
|
||||||
|
siteProvisioningKeyOrg,
|
||||||
|
siteProvisioningKeys
|
||||||
|
} from "@server/db";
|
||||||
import logger from "@server/logger";
|
import logger from "@server/logger";
|
||||||
import HttpCode from "@server/types/HttpCode";
|
import HttpCode from "@server/types/HttpCode";
|
||||||
import response from "@server/lib/response";
|
import response from "@server/lib/response";
|
||||||
@@ -21,8 +25,6 @@ import { z } from "zod";
|
|||||||
import { fromError } from "zod-validation-error";
|
import { fromError } from "zod-validation-error";
|
||||||
import { eq } from "drizzle-orm";
|
import { eq } from "drizzle-orm";
|
||||||
import type { ListSiteProvisioningKeysResponse } from "@server/routers/siteProvisioning/types";
|
import type { ListSiteProvisioningKeysResponse } from "@server/routers/siteProvisioning/types";
|
||||||
import { createApiResponseSchema } from "@server/lib/openapi/createApiResponseSchema";
|
|
||||||
import { OpenAPITags, registry } from "@server/openApi";
|
|
||||||
|
|
||||||
const paramsSchema = z.object({
|
const paramsSchema = z.object({
|
||||||
orgId: z.string().nonempty()
|
orgId: z.string().nonempty()
|
||||||
@@ -43,55 +45,11 @@ const querySchema = z.object({
|
|||||||
.pipe(z.int().nonnegative())
|
.pipe(z.int().nonnegative())
|
||||||
});
|
});
|
||||||
|
|
||||||
const ListSiteProvisioningKeysResponseDataSchema = z.object({
|
|
||||||
siteProvisioningKeys: z.array(
|
|
||||||
z.object({
|
|
||||||
siteProvisioningKeyId: z.string(),
|
|
||||||
orgId: z.string(),
|
|
||||||
lastChars: z.string(),
|
|
||||||
createdAt: z.string(),
|
|
||||||
name: z.string(),
|
|
||||||
lastUsed: z.string().nullable(),
|
|
||||||
maxBatchSize: z.number().nullable(),
|
|
||||||
numUsed: z.number(),
|
|
||||||
validUntil: z.string().nullable(),
|
|
||||||
approveNewSites: z.boolean()
|
|
||||||
})
|
|
||||||
),
|
|
||||||
pagination: z.object({
|
|
||||||
total: z.number(),
|
|
||||||
limit: z.number(),
|
|
||||||
offset: z.number()
|
|
||||||
})
|
|
||||||
});
|
|
||||||
|
|
||||||
registry.registerPath({
|
|
||||||
method: "get",
|
|
||||||
path: "/org/{orgId}/site-provisioning-keys",
|
|
||||||
description: "List all site provisioning keys for an organization.",
|
|
||||||
tags: [OpenAPITags.SiteProvisioningKey],
|
|
||||||
request: {
|
|
||||||
params: paramsSchema,
|
|
||||||
query: querySchema
|
|
||||||
},
|
|
||||||
responses: {
|
|
||||||
200: {
|
|
||||||
description: "Successful response",
|
|
||||||
content: {
|
|
||||||
"application/json": {
|
|
||||||
schema: createApiResponseSchema(
|
|
||||||
ListSiteProvisioningKeysResponseDataSchema
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
function querySiteProvisioningKeys(orgId: string) {
|
function querySiteProvisioningKeys(orgId: string) {
|
||||||
return db
|
return db
|
||||||
.select({
|
.select({
|
||||||
siteProvisioningKeyId: siteProvisioningKeys.siteProvisioningKeyId,
|
siteProvisioningKeyId:
|
||||||
|
siteProvisioningKeys.siteProvisioningKeyId,
|
||||||
orgId: siteProvisioningKeyOrg.orgId,
|
orgId: siteProvisioningKeyOrg.orgId,
|
||||||
lastChars: siteProvisioningKeys.lastChars,
|
lastChars: siteProvisioningKeys.lastChars,
|
||||||
createdAt: siteProvisioningKeys.createdAt,
|
createdAt: siteProvisioningKeys.createdAt,
|
||||||
|
|||||||
@@ -13,7 +13,11 @@
|
|||||||
|
|
||||||
import { Request, Response, NextFunction } from "express";
|
import { Request, Response, NextFunction } from "express";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import { db, siteProvisioningKeyOrg, siteProvisioningKeys } from "@server/db";
|
import {
|
||||||
|
db,
|
||||||
|
siteProvisioningKeyOrg,
|
||||||
|
siteProvisioningKeys
|
||||||
|
} from "@server/db";
|
||||||
import { and, eq } from "drizzle-orm";
|
import { and, eq } from "drizzle-orm";
|
||||||
import response from "@server/lib/response";
|
import response from "@server/lib/response";
|
||||||
import HttpCode from "@server/types/HttpCode";
|
import HttpCode from "@server/types/HttpCode";
|
||||||
@@ -21,8 +25,6 @@ import createHttpError from "http-errors";
|
|||||||
import logger from "@server/logger";
|
import logger from "@server/logger";
|
||||||
import { fromError } from "zod-validation-error";
|
import { fromError } from "zod-validation-error";
|
||||||
import type { UpdateSiteProvisioningKeyResponse } from "@server/routers/siteProvisioning/types";
|
import type { UpdateSiteProvisioningKeyResponse } from "@server/routers/siteProvisioning/types";
|
||||||
import { createApiResponseSchema } from "@server/lib/openapi/createApiResponseSchema";
|
|
||||||
import { OpenAPITags, registry } from "@server/openApi";
|
|
||||||
|
|
||||||
const paramsSchema = z.object({
|
const paramsSchema = z.object({
|
||||||
siteProvisioningKeyId: z.string().nonempty(),
|
siteProvisioningKeyId: z.string().nonempty(),
|
||||||
@@ -36,13 +38,7 @@ const bodySchema = z
|
|||||||
z.null(),
|
z.null(),
|
||||||
z.coerce.number().int().positive().max(1_000_000)
|
z.coerce.number().int().positive().max(1_000_000)
|
||||||
])
|
])
|
||||||
.optional()
|
.optional(),
|
||||||
.openapi({
|
|
||||||
type: "number",
|
|
||||||
default: null,
|
|
||||||
description:
|
|
||||||
"Maximum number of sites that can be provisioned in a single batch. If null, there is no limit."
|
|
||||||
}),
|
|
||||||
validUntil: z.string().max(255).optional(),
|
validUntil: z.string().max(255).optional(),
|
||||||
approveNewSites: z.boolean().optional()
|
approveNewSites: z.boolean().optional()
|
||||||
})
|
})
|
||||||
@@ -54,8 +50,7 @@ const bodySchema = z
|
|||||||
) {
|
) {
|
||||||
ctx.addIssue({
|
ctx.addIssue({
|
||||||
code: "custom",
|
code: "custom",
|
||||||
message:
|
message: "Provide maxBatchSize and/or validUntil and/or approveNewSites",
|
||||||
"Provide maxBatchSize and/or validUntil and/or approveNewSites",
|
|
||||||
path: ["maxBatchSize"]
|
path: ["maxBatchSize"]
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -74,48 +69,6 @@ const bodySchema = z
|
|||||||
|
|
||||||
export type UpdateSiteProvisioningKeyBody = z.infer<typeof bodySchema>;
|
export type UpdateSiteProvisioningKeyBody = z.infer<typeof bodySchema>;
|
||||||
|
|
||||||
const UpdateSiteProvisioningKeyResponseDataSchema = z.object({
|
|
||||||
siteProvisioningKeyId: z.string(),
|
|
||||||
orgId: z.string(),
|
|
||||||
name: z.string(),
|
|
||||||
lastChars: z.string(),
|
|
||||||
createdAt: z.string(),
|
|
||||||
lastUsed: z.string().nullable(),
|
|
||||||
maxBatchSize: z.number().nullable(),
|
|
||||||
numUsed: z.number(),
|
|
||||||
validUntil: z.string().nullable(),
|
|
||||||
approveNewSites: z.boolean()
|
|
||||||
});
|
|
||||||
|
|
||||||
registry.registerPath({
|
|
||||||
method: "patch",
|
|
||||||
path: "/org/{orgId}/site-provisioning-key/{siteProvisioningKeyId}",
|
|
||||||
description: "Update a site provisioning key.",
|
|
||||||
tags: [OpenAPITags.SiteProvisioningKey],
|
|
||||||
request: {
|
|
||||||
params: paramsSchema,
|
|
||||||
body: {
|
|
||||||
content: {
|
|
||||||
"application/json": {
|
|
||||||
schema: bodySchema
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
responses: {
|
|
||||||
200: {
|
|
||||||
description: "Successful response",
|
|
||||||
content: {
|
|
||||||
"application/json": {
|
|
||||||
schema: createApiResponseSchema(
|
|
||||||
UpdateSiteProvisioningKeyResponseDataSchema
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export async function updateSiteProvisioningKey(
|
export async function updateSiteProvisioningKey(
|
||||||
req: Request,
|
req: Request,
|
||||||
res: Response,
|
res: Response,
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ export async function requestPasswordReset(
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const url = `${config.getRawConfig().app.dashboard_url}/auth/reset-password?email=${encodeURIComponent(email)}&token=${token}`;
|
const url = `${config.getRawConfig().app.dashboard_url}/auth/reset-password?email=${email}&token=${token}`;
|
||||||
|
|
||||||
if (!config.getRawConfig().email) {
|
if (!config.getRawConfig().email) {
|
||||||
logger.info(
|
logger.info(
|
||||||
|
|||||||
@@ -42,14 +42,9 @@ export async function getResourceStatusHistory(
|
|||||||
|
|
||||||
const entityType = "resource";
|
const entityType = "resource";
|
||||||
const entityId = parsedParams.data.resourceId;
|
const entityId = parsedParams.data.resourceId;
|
||||||
const { days, tzOffsetMinutes } = parsedQuery.data;
|
const { days } = parsedQuery.data;
|
||||||
|
|
||||||
const data = await getCachedStatusHistory(
|
const data = await getCachedStatusHistory(entityType, entityId, days);
|
||||||
entityType,
|
|
||||||
entityId,
|
|
||||||
days,
|
|
||||||
tzOffsetMinutes
|
|
||||||
);
|
|
||||||
|
|
||||||
return response<StatusHistoryResponse>(res, {
|
return response<StatusHistoryResponse>(res, {
|
||||||
data,
|
data,
|
||||||
|
|||||||
@@ -42,14 +42,9 @@ export async function getSiteStatusHistory(
|
|||||||
|
|
||||||
const entityType = "site";
|
const entityType = "site";
|
||||||
const entityId = parsedParams.data.siteId;
|
const entityId = parsedParams.data.siteId;
|
||||||
const { days, tzOffsetMinutes } = parsedQuery.data;
|
const { days } = parsedQuery.data;
|
||||||
|
|
||||||
const data = await getCachedStatusHistory(
|
const data = await getCachedStatusHistory(entityType, entityId, days);
|
||||||
entityType,
|
|
||||||
entityId,
|
|
||||||
days,
|
|
||||||
tzOffsetMinutes
|
|
||||||
);
|
|
||||||
|
|
||||||
return response<StatusHistoryResponse>(res, {
|
return response<StatusHistoryResponse>(res, {
|
||||||
data,
|
data,
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ export async function adminGeneratePasswordResetCode(
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const url = `${config.getRawConfig().app.dashboard_url}/auth/reset-password?email=${encodeURIComponent(existingUser[0].email!)}&token=${token}`;
|
const url = `${config.getRawConfig().app.dashboard_url}/auth/reset-password?email=${existingUser[0].email}&token=${token}`;
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
`Admin generated password reset code for user ${existingUser[0].email} (${userId})`
|
`Admin generated password reset code for user ${existingUser[0].email} (${userId})`
|
||||||
|
|||||||
@@ -287,7 +287,7 @@ export async function inviteUser(
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
const inviteLink = `${config.getRawConfig().app.dashboard_url}/invite?token=${inviteId}-${token}&email=${encodeURIComponent(email)}`;
|
const inviteLink = `${config.getRawConfig().app.dashboard_url}/invite?token=${inviteId}-${token}&email=${email}`;
|
||||||
|
|
||||||
if (doEmail) {
|
if (doEmail) {
|
||||||
await sendEmail(
|
await sendEmail(
|
||||||
@@ -341,7 +341,7 @@ export async function inviteUser(
|
|||||||
.values(uniqueRoleIds.map((roleId) => ({ inviteId, roleId })));
|
.values(uniqueRoleIds.map((roleId) => ({ inviteId, roleId })));
|
||||||
});
|
});
|
||||||
|
|
||||||
const inviteLink = `${config.getRawConfig().app.dashboard_url}/invite?token=${inviteId}-${token}&email=${encodeURIComponent(email)}`;
|
const inviteLink = `${config.getRawConfig().app.dashboard_url}/invite?token=${inviteId}-${token}&email=${email}`;
|
||||||
|
|
||||||
if (doEmail) {
|
if (doEmail) {
|
||||||
await sendEmail(
|
await sendEmail(
|
||||||
|
|||||||
@@ -93,20 +93,14 @@ export default function InviteStatusCard({
|
|||||||
setType(type);
|
setType(type);
|
||||||
|
|
||||||
if (!user && type === "user_does_not_exist") {
|
if (!user && type === "user_does_not_exist") {
|
||||||
const inviteRedirect = encodeURIComponent(
|
|
||||||
`/invite?token=${tokenParam}`
|
|
||||||
);
|
|
||||||
const redirectUrl = email
|
const redirectUrl = email
|
||||||
? `/auth/signup?redirect=${inviteRedirect}&email=${encodeURIComponent(email)}`
|
? `/auth/signup?redirect=/invite?token=${tokenParam}&email=${email}`
|
||||||
: `/auth/signup?redirect=${inviteRedirect}`;
|
: `/auth/signup?redirect=/invite?token=${tokenParam}`;
|
||||||
router.push(redirectUrl);
|
router.push(redirectUrl);
|
||||||
} else if (!user && type === "not_logged_in") {
|
} else if (!user && type === "not_logged_in") {
|
||||||
const inviteRedirect = encodeURIComponent(
|
|
||||||
`/invite?token=${tokenParam}`
|
|
||||||
);
|
|
||||||
const redirectUrl = email
|
const redirectUrl = email
|
||||||
? `/auth/login?redirect=${inviteRedirect}&user=${encodeURIComponent(email)}`
|
? `/auth/login?redirect=/invite?token=${tokenParam}&user=${email}`
|
||||||
: `/auth/login?redirect=${inviteRedirect}`;
|
: `/auth/login?redirect=/invite?token=${tokenParam}`;
|
||||||
router.push(redirectUrl);
|
router.push(redirectUrl);
|
||||||
} else {
|
} else {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
@@ -118,23 +112,17 @@ export default function InviteStatusCard({
|
|||||||
|
|
||||||
async function goToLogin() {
|
async function goToLogin() {
|
||||||
await api.post("/auth/logout", {});
|
await api.post("/auth/logout", {});
|
||||||
const inviteRedirect = encodeURIComponent(
|
|
||||||
`/invite?token=${tokenParam}`
|
|
||||||
);
|
|
||||||
const redirectUrl = email
|
const redirectUrl = email
|
||||||
? `/auth/login?redirect=${inviteRedirect}&user=${encodeURIComponent(email)}`
|
? `/auth/login?redirect=/invite?token=${tokenParam}&user=${email}`
|
||||||
: `/auth/login?redirect=${inviteRedirect}`;
|
: `/auth/login?redirect=/invite?token=${tokenParam}`;
|
||||||
router.push(redirectUrl);
|
router.push(redirectUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function goToSignup() {
|
async function goToSignup() {
|
||||||
await api.post("/auth/logout", {});
|
await api.post("/auth/logout", {});
|
||||||
const inviteRedirect = encodeURIComponent(
|
|
||||||
`/invite?token=${tokenParam}`
|
|
||||||
);
|
|
||||||
const redirectUrl = email
|
const redirectUrl = email
|
||||||
? `/auth/signup?redirect=${inviteRedirect}&email=${encodeURIComponent(email)}`
|
? `/auth/signup?redirect=/invite?token=${tokenParam}&email=${email}`
|
||||||
: `/auth/signup?redirect=${inviteRedirect}`;
|
: `/auth/signup?redirect=/invite?token=${tokenParam}`;
|
||||||
router.push(redirectUrl);
|
router.push(redirectUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -143,13 +143,6 @@ function getActionsCategories(root: boolean) {
|
|||||||
Logs: {
|
Logs: {
|
||||||
[t("actionExportLogs")]: "exportLogs",
|
[t("actionExportLogs")]: "exportLogs",
|
||||||
[t("actionViewLogs")]: "viewLogs"
|
[t("actionViewLogs")]: "viewLogs"
|
||||||
},
|
|
||||||
|
|
||||||
"Site Provisioning Key": {
|
|
||||||
[t("actionCreateSiteProvisioningKey")]: "createSiteProvisioningKey",
|
|
||||||
[t("actionListSiteProvisioningKeys")]: "listSiteProvisioningKeys",
|
|
||||||
[t("actionUpdateSiteProvisioningKey")]: "updateSiteProvisioningKey",
|
|
||||||
[t("actionDeleteSiteProvisioningKey")]: "deleteSiteProvisioningKey"
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+5
-12
@@ -650,13 +650,9 @@ export const orgQueries = {
|
|||||||
queryOptions({
|
queryOptions({
|
||||||
queryKey: ["SITE_STATUS_HISTORY", siteId, days] as const,
|
queryKey: ["SITE_STATUS_HISTORY", siteId, days] as const,
|
||||||
queryFn: async ({ signal, meta }) => {
|
queryFn: async ({ signal, meta }) => {
|
||||||
const tzOffsetMinutes = -new Date().getTimezoneOffset();
|
|
||||||
const res = await meta!.api.get<
|
const res = await meta!.api.get<
|
||||||
AxiosResponse<StatusHistoryResponse>
|
AxiosResponse<StatusHistoryResponse>
|
||||||
>(
|
>(`/site/${siteId}/status-history?days=${days}`, { signal });
|
||||||
`/site/${siteId}/status-history?days=${days}&tzOffsetMinutes=${tzOffsetMinutes}`,
|
|
||||||
{ signal }
|
|
||||||
);
|
|
||||||
return res.data.data;
|
return res.data.data;
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
@@ -671,13 +667,11 @@ export const orgQueries = {
|
|||||||
queryOptions({
|
queryOptions({
|
||||||
queryKey: ["RESOURCE_STATUS_HISTORY", resourceId, days] as const,
|
queryKey: ["RESOURCE_STATUS_HISTORY", resourceId, days] as const,
|
||||||
queryFn: async ({ signal, meta }) => {
|
queryFn: async ({ signal, meta }) => {
|
||||||
const tzOffsetMinutes = -new Date().getTimezoneOffset();
|
|
||||||
const res = await meta!.api.get<
|
const res = await meta!.api.get<
|
||||||
AxiosResponse<StatusHistoryResponse>
|
AxiosResponse<StatusHistoryResponse>
|
||||||
>(
|
>(`/resource/${resourceId}/status-history?days=${days}`, {
|
||||||
`/resource/${resourceId}/status-history?days=${days}&tzOffsetMinutes=${tzOffsetMinutes}`,
|
signal
|
||||||
{ signal }
|
});
|
||||||
);
|
|
||||||
return res.data.data;
|
return res.data.data;
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
@@ -699,11 +693,10 @@ export const orgQueries = {
|
|||||||
days
|
days
|
||||||
] as const,
|
] as const,
|
||||||
queryFn: async ({ signal, meta }) => {
|
queryFn: async ({ signal, meta }) => {
|
||||||
const tzOffsetMinutes = -new Date().getTimezoneOffset();
|
|
||||||
const res = await meta!.api.get<
|
const res = await meta!.api.get<
|
||||||
AxiosResponse<StatusHistoryResponse>
|
AxiosResponse<StatusHistoryResponse>
|
||||||
>(
|
>(
|
||||||
`/org/${orgId}/health-check/${healthCheckId}/status-history?days=${days}&tzOffsetMinutes=${tzOffsetMinutes}`,
|
`/org/${orgId}/health-check/${healthCheckId}/status-history?days=${days}`,
|
||||||
{ signal }
|
{ signal }
|
||||||
);
|
);
|
||||||
return res.data.data;
|
return res.data.data;
|
||||||
|
|||||||
Reference in New Issue
Block a user