From dc2538f59d9e3ebda4f1f985549a97ab19ce6a15 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 11 May 2021 21:53:19 +0200 Subject: [PATCH] web/admin: fix outpost health not updating on refresh Signed-off-by: Jens Langhammer --- web/src/locales/en.po | 99 ++++++++++++++++--------- web/src/locales/pseudo-LOCALE.po | 97 +++++++++++++++--------- web/src/pages/outposts/OutpostHealth.ts | 77 +++++++++++-------- 3 files changed, 171 insertions(+), 102 deletions(-) diff --git a/web/src/locales/en.po b/web/src/locales/en.po index b6b9bc704..30503ad9a 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -41,7 +41,7 @@ msgid "A policy used for testing. Always returns the same result as specified be msgstr "A policy used for testing. Always returns the same result as specified below after waiting a random duration." #: src/pages/providers/saml/SAMLProviderForm.ts:81 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:84 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:85 msgid "ACS URL" msgstr "ACS URL" @@ -156,6 +156,10 @@ msgstr "Allow up to N occurrences in the HIBP database." msgid "Allow users to use Applications based on properties, enforce Password Criteria and selectively apply Stages." msgstr "Allow users to use Applications based on properties, enforce Password Criteria and selectively apply Stages." +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:156 +msgid "Allowed Redirect URIs" +msgstr "Allowed Redirect URIs" + #: src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts:84 msgid "Allowed count" msgstr "Allowed count" @@ -241,8 +245,8 @@ msgstr "Assertions is empty" #: src/pages/providers/ProviderListPage.ts:66 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:72 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:81 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:72 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:74 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:70 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:75 msgid "Assigned to application" msgstr "Assigned to application" @@ -265,7 +269,7 @@ msgid "Attributes" msgstr "Attributes" #: src/pages/providers/saml/SAMLProviderForm.ts:107 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:92 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:93 msgid "Audience" msgstr "Audience" @@ -364,7 +368,7 @@ msgstr "Based on the User's UPN, only works if user has a 'upn' attribute set. U msgid "Based on the username" msgstr "Based on the username" -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:98 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:96 msgid "Basic-Auth" msgstr "Basic-Auth" @@ -480,8 +484,8 @@ msgstr "Change your password" #: src/pages/flows/FlowViewPage.ts:110 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:111 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:136 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:135 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:129 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:170 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:130 #: src/pages/sources/ldap/LDAPSourceViewPage.ts:113 #: src/pages/sources/oauth/OAuthSourceViewPage.ts:133 #: src/pages/sources/plex/PlexSourceViewPage.ts:92 @@ -706,11 +710,15 @@ msgstr "Copy" msgid "Copy Key" msgstr "Copy Key" +#: src/pages/providers/saml/SAMLProviderViewPage.ts:166 +msgid "Copy download URL" +msgstr "Copy download URL" + #: src/pages/applications/ApplicationForm.ts:125 #: src/pages/applications/ApplicationListPage.ts:121 #: src/pages/applications/ApplicationListPage.ts:129 -#: src/pages/crypto/CertificateKeyPairListPage.ts:122 -#: src/pages/crypto/CertificateKeyPairListPage.ts:130 +#: src/pages/crypto/CertificateKeyPairListPage.ts:139 +#: src/pages/crypto/CertificateKeyPairListPage.ts:147 #: src/pages/events/RuleListPage.ts:91 #: src/pages/events/RuleListPage.ts:99 #: src/pages/events/TransportListPage.ts:95 @@ -766,7 +774,7 @@ msgstr "Create Application" msgid "Create Binding" msgstr "Create Binding" -#: src/pages/crypto/CertificateKeyPairListPage.ts:125 +#: src/pages/crypto/CertificateKeyPairListPage.ts:142 msgid "Create Certificate-Key Pair" msgstr "Create Certificate-Key Pair" @@ -1013,11 +1021,20 @@ msgstr "Disconnect" msgid "Docker URL" msgstr "Docker URL" -#: src/pages/providers/saml/SAMLProviderViewPage.ts:155 +#: src/pages/crypto/CertificateKeyPairListPage.ts:114 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:156 #: src/pages/sources/saml/SAMLSourceViewPage.ts:143 msgid "Download" msgstr "Download" +#: src/pages/crypto/CertificateKeyPairListPage.ts:120 +msgid "Download Certificate" +msgstr "Download Certificate" + +#: src/pages/crypto/CertificateKeyPairListPage.ts:124 +msgid "Download Private key" +msgstr "Download Private key" + #: src/pages/stages/dummy/DummyStageForm.ts:49 msgid "Dummy stage used for testing. Shows a simple continue button and always passes." msgstr "Dummy stage used for testing. Shows a simple continue button and always passes." @@ -1041,8 +1058,8 @@ msgstr "Each provider has a different issuer, based on the application slug." #: src/pages/providers/ProviderListPage.ts:87 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:103 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:128 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:127 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:121 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:141 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:122 #: src/pages/sources/SourcesListPage.ts:83 #: src/pages/sources/ldap/LDAPSourceViewPage.ts:105 #: src/pages/sources/oauth/OAuthSourceViewPage.ts:125 @@ -1283,7 +1300,7 @@ msgstr "Expression using Python." msgid "External Applications which use authentik as Identity-Provider, utilizing protocols like OAuth2 and SAML. All applications are shown here, even ones you cannot access." msgstr "External Applications which use authentik as Identity-Provider, utilizing protocols like OAuth2 and SAML. All applications are shown here, even ones you cannot access." -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:90 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:88 msgid "External Host" msgstr "External Host" @@ -1419,6 +1436,10 @@ msgstr "Forgot username or password?" msgid "Form didn't return a promise for submitting" msgstr "Form didn't return a promise for submitting" +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:112 +msgid "Forward auth" +msgstr "Forward auth" + #: src/pages/property-mappings/PropertyMappingSAMLForm.ts:65 msgid "Friendly Name" msgstr "Friendly Name" @@ -1431,12 +1452,12 @@ msgstr "From address" msgid "General system status" msgstr "General system status" -#: src/pages/crypto/CertificateKeyPairListPage.ts:135 -#: src/pages/crypto/CertificateKeyPairListPage.ts:143 +#: src/pages/crypto/CertificateKeyPairListPage.ts:152 +#: src/pages/crypto/CertificateKeyPairListPage.ts:160 msgid "Generate" msgstr "Generate" -#: src/pages/crypto/CertificateKeyPairListPage.ts:138 +#: src/pages/crypto/CertificateKeyPairListPage.ts:155 msgid "Generate Certificate-Key Pair" msgstr "Generate Certificate-Key Pair" @@ -1604,7 +1625,7 @@ msgstr "Include User claims from scopes in the id_token, for applications that d msgid "Include claims in id_token" msgstr "Include claims in id_token" -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:82 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:80 msgid "Internal Host" msgstr "Internal Host" @@ -1638,7 +1659,7 @@ msgid "Is superuser" msgstr "Is superuser" #: src/pages/providers/saml/SAMLProviderForm.ts:87 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:100 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:101 #: src/pages/sources/saml/SAMLSourceForm.ts:91 #: src/pages/sources/saml/SAMLSourceViewPage.ts:90 msgid "Issuer" @@ -1695,7 +1716,7 @@ msgstr "Last login" msgid "Last run" msgstr "Last run" -#: src/pages/outposts/OutpostHealth.ts:41 +#: src/pages/outposts/OutpostHealth.ts:54 msgid "Last seen: {0}" msgstr "Last seen: {0}" @@ -1890,7 +1911,7 @@ msgstr "Messages" #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:147 #: src/pages/providers/saml/SAMLProviderImportForm.ts:61 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:141 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:142 #: src/pages/sources/saml/SAMLSourceViewPage.ts:130 msgid "Metadata" msgstr "Metadata" @@ -1967,10 +1988,10 @@ msgstr "My Applications" #: src/pages/providers/oauth2/OAuth2ProviderForm.ts:56 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:73 #: src/pages/providers/proxy/ProxyProviderForm.ts:98 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:64 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:62 #: src/pages/providers/saml/SAMLProviderForm.ts:52 #: src/pages/providers/saml/SAMLProviderImportForm.ts:38 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:66 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:67 #: src/pages/sources/SourcesListPage.ts:52 #: src/pages/sources/ldap/LDAPSourceForm.ts:52 #: src/pages/sources/ldap/LDAPSourceViewPage.ts:64 @@ -2031,7 +2052,8 @@ msgstr "New version available!" #: src/pages/outposts/ServiceConnectionListPage.ts:64 #: src/pages/policies/BoundPoliciesList.ts:122 #: src/pages/policies/PolicyTestForm.ts:39 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:108 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:106 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:122 #: src/pages/tokens/TokenListPage.ts:56 #: src/pages/user-settings/tokens/UserTokenList.ts:83 #: src/pages/users/UserListPage.ts:67 @@ -2092,7 +2114,7 @@ msgstr "No workers connected. Background tasks will not run." msgid "None (rule disabled)" msgstr "None (rule disabled)" -#: src/pages/outposts/OutpostHealth.ts:31 +#: src/pages/outposts/OutpostHealth.ts:44 msgid "Not available" msgstr "Not available" @@ -2277,8 +2299,8 @@ msgstr "Outposts are deployments of authentik components to support different en #: src/pages/applications/ApplicationViewPage.ts:59 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:56 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:65 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:56 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:58 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:54 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:59 #: src/pages/sources/ldap/LDAPSourceViewPage.ts:56 #: src/pages/sources/oauth/OAuthSourceViewPage.ts:56 #: src/pages/sources/plex/PlexSourceViewPage.ts:55 @@ -2461,6 +2483,10 @@ msgstr "Property mappings used to group creation." msgid "Property mappings used to user creation." msgstr "Property mappings used to user creation." +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:150 +msgid "Protocol Settings" +msgstr "Protocol Settings" + #: src/pages/providers/ldap/LDAPProviderForm.ts:91 #: src/pages/providers/oauth2/OAuth2ProviderForm.ts:81 #: src/pages/providers/proxy/ProxyProviderForm.ts:123 @@ -3403,8 +3429,8 @@ msgid "The URL \"{0}\" was not found." msgstr "The URL \"{0}\" was not found." #: src/pages/providers/proxy/ProxyProviderForm.ts:131 -msgid "The external URL you'll access the outpost at." -msgstr "The external URL you'll access the outpost at." +msgid "The external URL you'll access the application at" +msgstr "The external URL you'll access the application at" #: src/pages/policies/dummy/DummyPolicyForm.ts:88 msgid "The policy takes a random time to execute. This controls the minimum time it will take." @@ -3627,8 +3653,8 @@ msgstr "Up-to-date!" #: src/pages/providers/ProviderListPage.ts:74 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:93 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:118 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:117 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:111 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:131 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:112 #: src/pages/sources/SourcesListPage.ts:70 #: src/pages/sources/ldap/LDAPSourceViewPage.ts:95 #: src/pages/sources/oauth/OAuthSourceViewPage.ts:115 @@ -3705,11 +3731,11 @@ msgstr "Update Plex Source" msgid "Update Prompt" msgstr "Update Prompt" -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:120 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:134 msgid "Update Proxy Provider" msgstr "Update Proxy Provider" -#: src/pages/providers/saml/SAMLProviderViewPage.ts:114 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:115 msgid "Update SAML Provider" msgstr "Update SAML Provider" @@ -3930,7 +3956,7 @@ msgstr "Verify the user's email address by sending them a one-time-link. Can als msgid "Version" msgstr "Version" -#: src/pages/outposts/OutpostHealth.ts:47 +#: src/pages/outposts/OutpostHealth.ts:60 msgid "Version: {0}" msgstr "Version: {0}" @@ -4047,7 +4073,8 @@ msgstr "X509 Subject" #: src/pages/outposts/ServiceConnectionListPage.ts:64 #: src/pages/policies/BoundPoliciesList.ts:122 #: src/pages/policies/PolicyTestForm.ts:39 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:105 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:103 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:119 #: src/pages/tokens/TokenListPage.ts:56 #: src/pages/user-settings/tokens/UserTokenList.ts:83 #: src/pages/users/UserListPage.ts:67 @@ -4095,7 +4122,7 @@ msgstr "{0} is available!" msgid "{0} unread" msgstr "{0} unread" -#: src/pages/outposts/OutpostHealth.ts:46 +#: src/pages/outposts/OutpostHealth.ts:59 msgid "{0}, should be {1}" msgstr "{0}, should be {1}" diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 80adb8ca2..e0c274ac9 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -41,7 +41,7 @@ msgid "A policy used for testing. Always returns the same result as specified be msgstr "" #: src/pages/providers/saml/SAMLProviderForm.ts:81 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:84 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:85 msgid "ACS URL" msgstr "" @@ -156,6 +156,10 @@ msgstr "" msgid "Allow users to use Applications based on properties, enforce Password Criteria and selectively apply Stages." msgstr "" +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:156 +msgid "Allowed Redirect URIs" +msgstr "" + #: src/pages/policies/hibp/HaveIBeenPwnedPolicyForm.ts:84 msgid "Allowed count" msgstr "" @@ -241,8 +245,8 @@ msgstr "" #: src/pages/providers/ProviderListPage.ts:66 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:72 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:81 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:72 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:74 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:70 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:75 msgid "Assigned to application" msgstr "" @@ -265,7 +269,7 @@ msgid "Attributes" msgstr "" #: src/pages/providers/saml/SAMLProviderForm.ts:107 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:92 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:93 msgid "Audience" msgstr "" @@ -364,7 +368,7 @@ msgstr "" msgid "Based on the username" msgstr "" -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:98 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:96 msgid "Basic-Auth" msgstr "" @@ -480,8 +484,8 @@ msgstr "" #: src/pages/flows/FlowViewPage.ts:110 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:111 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:136 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:135 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:129 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:170 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:130 #: src/pages/sources/ldap/LDAPSourceViewPage.ts:113 #: src/pages/sources/oauth/OAuthSourceViewPage.ts:133 #: src/pages/sources/plex/PlexSourceViewPage.ts:92 @@ -704,11 +708,15 @@ msgstr "" msgid "Copy Key" msgstr "" +#: src/pages/providers/saml/SAMLProviderViewPage.ts:166 +msgid "Copy download URL" +msgstr "" + #: src/pages/applications/ApplicationForm.ts:125 #: src/pages/applications/ApplicationListPage.ts:121 #: src/pages/applications/ApplicationListPage.ts:129 -#: src/pages/crypto/CertificateKeyPairListPage.ts:122 -#: src/pages/crypto/CertificateKeyPairListPage.ts:130 +#: src/pages/crypto/CertificateKeyPairListPage.ts:139 +#: src/pages/crypto/CertificateKeyPairListPage.ts:147 #: src/pages/events/RuleListPage.ts:91 #: src/pages/events/RuleListPage.ts:99 #: src/pages/events/TransportListPage.ts:95 @@ -764,7 +772,7 @@ msgstr "" msgid "Create Binding" msgstr "" -#: src/pages/crypto/CertificateKeyPairListPage.ts:125 +#: src/pages/crypto/CertificateKeyPairListPage.ts:142 msgid "Create Certificate-Key Pair" msgstr "" @@ -1009,11 +1017,20 @@ msgstr "" msgid "Docker URL" msgstr "" -#: src/pages/providers/saml/SAMLProviderViewPage.ts:155 +#: src/pages/crypto/CertificateKeyPairListPage.ts:114 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:156 #: src/pages/sources/saml/SAMLSourceViewPage.ts:143 msgid "Download" msgstr "" +#: src/pages/crypto/CertificateKeyPairListPage.ts:120 +msgid "Download Certificate" +msgstr "" + +#: src/pages/crypto/CertificateKeyPairListPage.ts:124 +msgid "Download Private key" +msgstr "" + #: src/pages/stages/dummy/DummyStageForm.ts:49 msgid "Dummy stage used for testing. Shows a simple continue button and always passes." msgstr "" @@ -1037,8 +1054,8 @@ msgstr "" #: src/pages/providers/ProviderListPage.ts:87 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:103 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:128 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:127 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:121 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:141 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:122 #: src/pages/sources/SourcesListPage.ts:83 #: src/pages/sources/ldap/LDAPSourceViewPage.ts:105 #: src/pages/sources/oauth/OAuthSourceViewPage.ts:125 @@ -1279,7 +1296,7 @@ msgstr "" msgid "External Applications which use authentik as Identity-Provider, utilizing protocols like OAuth2 and SAML. All applications are shown here, even ones you cannot access." msgstr "" -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:90 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:88 msgid "External Host" msgstr "" @@ -1415,6 +1432,10 @@ msgstr "" msgid "Form didn't return a promise for submitting" msgstr "" +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:112 +msgid "Forward auth" +msgstr "" + #: src/pages/property-mappings/PropertyMappingSAMLForm.ts:65 msgid "Friendly Name" msgstr "" @@ -1427,12 +1448,12 @@ msgstr "" msgid "General system status" msgstr "" -#: src/pages/crypto/CertificateKeyPairListPage.ts:135 -#: src/pages/crypto/CertificateKeyPairListPage.ts:143 +#: src/pages/crypto/CertificateKeyPairListPage.ts:152 +#: src/pages/crypto/CertificateKeyPairListPage.ts:160 msgid "Generate" msgstr "" -#: src/pages/crypto/CertificateKeyPairListPage.ts:138 +#: src/pages/crypto/CertificateKeyPairListPage.ts:155 msgid "Generate Certificate-Key Pair" msgstr "" @@ -1600,7 +1621,7 @@ msgstr "" msgid "Include claims in id_token" msgstr "" -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:82 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:80 msgid "Internal Host" msgstr "" @@ -1634,7 +1655,7 @@ msgid "Is superuser" msgstr "" #: src/pages/providers/saml/SAMLProviderForm.ts:87 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:100 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:101 #: src/pages/sources/saml/SAMLSourceForm.ts:91 #: src/pages/sources/saml/SAMLSourceViewPage.ts:90 msgid "Issuer" @@ -1691,7 +1712,7 @@ msgstr "" msgid "Last run" msgstr "" -#: src/pages/outposts/OutpostHealth.ts:41 +#: src/pages/outposts/OutpostHealth.ts:54 msgid "Last seen: {0}" msgstr "" @@ -1886,7 +1907,7 @@ msgstr "" #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:147 #: src/pages/providers/saml/SAMLProviderImportForm.ts:61 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:141 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:142 #: src/pages/sources/saml/SAMLSourceViewPage.ts:130 msgid "Metadata" msgstr "" @@ -1963,10 +1984,10 @@ msgstr "" #: src/pages/providers/oauth2/OAuth2ProviderForm.ts:56 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:73 #: src/pages/providers/proxy/ProxyProviderForm.ts:98 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:64 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:62 #: src/pages/providers/saml/SAMLProviderForm.ts:52 #: src/pages/providers/saml/SAMLProviderImportForm.ts:38 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:66 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:67 #: src/pages/sources/SourcesListPage.ts:52 #: src/pages/sources/ldap/LDAPSourceForm.ts:52 #: src/pages/sources/ldap/LDAPSourceViewPage.ts:64 @@ -2027,7 +2048,8 @@ msgstr "" #: src/pages/outposts/ServiceConnectionListPage.ts:64 #: src/pages/policies/BoundPoliciesList.ts:122 #: src/pages/policies/PolicyTestForm.ts:39 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:108 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:106 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:122 #: src/pages/tokens/TokenListPage.ts:56 #: src/pages/user-settings/tokens/UserTokenList.ts:83 #: src/pages/users/UserListPage.ts:67 @@ -2088,7 +2110,7 @@ msgstr "" msgid "None (rule disabled)" msgstr "" -#: src/pages/outposts/OutpostHealth.ts:31 +#: src/pages/outposts/OutpostHealth.ts:44 msgid "Not available" msgstr "" @@ -2273,8 +2295,8 @@ msgstr "" #: src/pages/applications/ApplicationViewPage.ts:59 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:56 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:65 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:56 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:58 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:54 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:59 #: src/pages/sources/ldap/LDAPSourceViewPage.ts:56 #: src/pages/sources/oauth/OAuthSourceViewPage.ts:56 #: src/pages/sources/plex/PlexSourceViewPage.ts:55 @@ -2457,6 +2479,10 @@ msgstr "" msgid "Property mappings used to user creation." msgstr "" +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:150 +msgid "Protocol Settings" +msgstr "" + #: src/pages/providers/ldap/LDAPProviderForm.ts:91 #: src/pages/providers/oauth2/OAuth2ProviderForm.ts:81 #: src/pages/providers/proxy/ProxyProviderForm.ts:123 @@ -3399,7 +3425,7 @@ msgid "The URL \"{0}\" was not found." msgstr "" #: src/pages/providers/proxy/ProxyProviderForm.ts:131 -msgid "The external URL you'll access the outpost at." +msgid "The external URL you'll access the application at" msgstr "" #: src/pages/policies/dummy/DummyPolicyForm.ts:88 @@ -3619,8 +3645,8 @@ msgstr "" #: src/pages/providers/ProviderListPage.ts:74 #: src/pages/providers/ldap/LDAPProviderViewPage.ts:93 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts:118 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:117 -#: src/pages/providers/saml/SAMLProviderViewPage.ts:111 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:131 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:112 #: src/pages/sources/SourcesListPage.ts:70 #: src/pages/sources/ldap/LDAPSourceViewPage.ts:95 #: src/pages/sources/oauth/OAuthSourceViewPage.ts:115 @@ -3697,11 +3723,11 @@ msgstr "" msgid "Update Prompt" msgstr "" -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:120 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:134 msgid "Update Proxy Provider" msgstr "" -#: src/pages/providers/saml/SAMLProviderViewPage.ts:114 +#: src/pages/providers/saml/SAMLProviderViewPage.ts:115 msgid "Update SAML Provider" msgstr "" @@ -3922,7 +3948,7 @@ msgstr "" msgid "Version" msgstr "" -#: src/pages/outposts/OutpostHealth.ts:47 +#: src/pages/outposts/OutpostHealth.ts:60 msgid "Version: {0}" msgstr "" @@ -4037,7 +4063,8 @@ msgstr "" #: src/pages/outposts/ServiceConnectionListPage.ts:64 #: src/pages/policies/BoundPoliciesList.ts:122 #: src/pages/policies/PolicyTestForm.ts:39 -#: src/pages/providers/proxy/ProxyProviderViewPage.ts:105 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:103 +#: src/pages/providers/proxy/ProxyProviderViewPage.ts:119 #: src/pages/tokens/TokenListPage.ts:56 #: src/pages/user-settings/tokens/UserTokenList.ts:83 #: src/pages/users/UserListPage.ts:67 @@ -4085,7 +4112,7 @@ msgstr "" msgid "{0} unread" msgstr "" -#: src/pages/outposts/OutpostHealth.ts:46 +#: src/pages/outposts/OutpostHealth.ts:59 msgid "{0}, should be {1}" msgstr "" diff --git a/web/src/pages/outposts/OutpostHealth.ts b/web/src/pages/outposts/OutpostHealth.ts index 0e7993179..46524fe69 100644 --- a/web/src/pages/outposts/OutpostHealth.ts +++ b/web/src/pages/outposts/OutpostHealth.ts @@ -1,55 +1,70 @@ import { t } from "@lingui/macro"; import { CSSResult, customElement, html, LitElement, property, TemplateResult } from "lit-element"; -import { until } from "lit-html/directives/until"; -import { OutpostsApi } from "authentik-api"; +import { OutpostHealth, OutpostsApi } from "authentik-api"; import { DEFAULT_CONFIG } from "../../api/Config"; import PFBase from "@patternfly/patternfly/patternfly-base.css"; import "../../elements/Spinner"; import AKGlobal from "../../authentik.css"; import { PFColor } from "../../elements/Label"; +import { EVENT_REFRESH } from "../../constants"; @customElement("ak-outpost-health") -export class OutpostHealth extends LitElement { +export class OutpostHealthElement extends LitElement { @property() outpostId?: string; + @property({attribute: false}) + outpostHealth: OutpostHealth[] = []; + static get styles(): CSSResult[] { return [PFBase, AKGlobal]; } + constructor() { + super(); + this.addEventListener(EVENT_REFRESH, () => { + this.firstUpdated(); + }); + } + + firstUpdated(): void { + if (!this.outpostId) return; + new OutpostsApi(DEFAULT_CONFIG).outpostsOutpostsHealth({ + uuid: this.outpostId + }).then(health => { + this.outpostHealth = health; + }); + } + render(): TemplateResult { if (!this.outpostId) { return html``; } - return html``; + if (this.outpostHealth.length === 0) { + return html`
  • +
      +
    • + +
      • +
    +
    • `; + } + return html`${this.outpostHealth.map((h) => { + return html`
  • +
      +
    • + +
      • +
    • + ${h.versionOutdated ? + html`` : + html``} +
      • +
    +
    • `; + })}`; } }