From bd63fcd15d6330ab26a4272e1d47d9df582b4c70 Mon Sep 17 00:00:00 2001 From: Miguel Cabrerizo <30386061+doncicuto@users.noreply.github.com> Date: Mon, 13 Nov 2023 18:49:55 +0100 Subject: [PATCH] feat(console): add SAML certificate link and endpoints (#6841) * feat(console): add SAML certificate link and endpoints * fix: add missing translations for cs and ru * fix: add @eliobischof review suggestions --------- Co-authored-by: Elio Bischof --- .../apps/app-create/app-create.component.html | 13 ++++ .../apps/app-create/app-create.component.scss | 12 ++++ .../apps/app-create/app-create.component.ts | 6 +- .../apps/app-detail/app-detail.component.html | 62 ++++++++++++++++++- .../apps/app-detail/app-detail.component.scss | 11 ++++ .../apps/app-detail/app-detail.component.ts | 8 ++- console/src/assets/i18n/bg.json | 2 + console/src/assets/i18n/cs.json | 2 + console/src/assets/i18n/de.json | 2 + console/src/assets/i18n/en.json | 2 + console/src/assets/i18n/es.json | 2 + console/src/assets/i18n/fr.json | 2 + console/src/assets/i18n/it.json | 2 + console/src/assets/i18n/ja.json | 2 + console/src/assets/i18n/mk.json | 2 + console/src/assets/i18n/pl.json | 2 + console/src/assets/i18n/pt.json | 2 + console/src/assets/i18n/ru.json | 7 ++- console/src/assets/i18n/zh.json | 2 + 19 files changed, 138 insertions(+), 5 deletions(-) diff --git a/console/src/app/pages/projects/apps/app-create/app-create.component.html b/console/src/app/pages/projects/apps/app-create/app-create.component.html index 04a1da6d5..78cf1e55b 100644 --- a/console/src/app/pages/projects/apps/app-create/app-create.component.html +++ b/console/src/app/pages/projects/apps/app-create/app-create.component.html @@ -381,6 +381,19 @@ +
+ + {{ 'APP.SAML.CERTIFICATE' | translate }} + + {{ 'APP.SAML.DOWNLOADCERT' | translate }} +
diff --git a/console/src/app/pages/projects/apps/app-create/app-create.component.scss b/console/src/app/pages/projects/apps/app-create/app-create.component.scss index 8d070f403..42fdfb729 100644 --- a/console/src/app/pages/projects/apps/app-create/app-create.component.scss +++ b/console/src/app/pages/projects/apps/app-create/app-create.component.scss @@ -161,3 +161,15 @@ p.desc { font-size: 14px; } } + +.cert { + font-size: 14px; + cursor: pointer; + text-decoration: none; + color: inherit; + font-family: inherit; + + &:hover { + text-decoration: underline; + } +} diff --git a/console/src/app/pages/projects/apps/app-create/app-create.component.ts b/console/src/app/pages/projects/apps/app-create/app-create.component.ts index d8e920a75..ae1c5d8b7 100644 --- a/console/src/app/pages/projects/apps/app-create/app-create.component.ts +++ b/console/src/app/pages/projects/apps/app-create/app-create.component.ts @@ -7,7 +7,7 @@ import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { Buffer } from 'buffer'; import { Subject, Subscription } from 'rxjs'; -import { debounceTime, takeUntil } from 'rxjs/operators'; +import { debounceTime, map, takeUntil } from 'rxjs/operators'; import { RadioItemAuthType } from 'src/app/modules/app-radio/app-auth-method-radio/app-auth-method-radio.component'; import { requiredValidator } from 'src/app/modules/form-field/validators/validators'; import { @@ -28,7 +28,6 @@ import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; -import { MatLegacySlideToggleChange } from '@angular/material/legacy-slide-toggle'; import { AppSecretDialogComponent } from '../app-secret-dialog/app-secret-dialog.component'; import { BASIC_AUTH_METHOD, @@ -41,6 +40,7 @@ import { POST_METHOD, } from '../authmethods'; import { API_TYPE, AppCreateType, NATIVE_TYPE, RadioItemAppType, SAML_TYPE, USER_AGENT_TYPE, WEB_TYPE } from '../authtypes'; +import { EnvironmentService } from 'src/app/services/environment.service'; const MAX_ALLOWED_SIZE = 1 * 1024 * 1024; @@ -119,6 +119,7 @@ export class AppCreateComponent implements OnInit, OnDestroy { public readonly separatorKeysCodes: number[] = [ENTER, COMMA, SPACE]; public requestRedirectValuesSubject$: Subject = new Subject(); + public samlCertificateURL$ = this.envSvc.env.pipe(map((env) => `${env.issuer}/saml/v2/certificate`)); constructor( private router: Router, @@ -129,6 +130,7 @@ export class AppCreateComponent implements OnInit, OnDestroy { private fb: UntypedFormBuilder, private _location: Location, private breadcrumbService: BreadcrumbService, + private envSvc: EnvironmentService, ) { this.form = this.fb.group({ name: ['', [requiredValidator]], diff --git a/console/src/app/pages/projects/apps/app-detail/app-detail.component.html b/console/src/app/pages/projects/apps/app-detail/app-detail.component.html index 4a6586077..25c657a12 100644 --- a/console/src/app/pages/projects/apps/app-detail/app-detail.component.html +++ b/console/src/app/pages/projects/apps/app-detail/app-detail.component.html @@ -414,10 +414,11 @@ - +
+ + +
+
+

{{ 'APP.SAML.CERTIFICATE' | translate }}

+
+
+ +
+
+
+ +
+

Single Sign On (SSO)

+
+
+ +
+
+
+ +
+

Single Logoout (SLO)

+
+
+ +
+
+
+
+ + + element !== CUSTOM_METHOD); } } else if (this.app.samlConfig) { - this.settingsList = [{ id: 'configuration', i18nKey: 'APP.CONFIGURATION' }]; + this.settingsList = [ + { id: 'configuration', i18nKey: 'APP.CONFIGURATION' }, + { id: 'urls', i18nKey: 'APP.URLS' }, + ]; } if (allowed) { diff --git a/console/src/assets/i18n/bg.json b/console/src/assets/i18n/bg.json index 8f8b277ee..bd9c3176d 100644 --- a/console/src/assets/i18n/bg.json +++ b/console/src/assets/i18n/bg.json @@ -2086,6 +2086,8 @@ "UPLOAD": "Качете XML файл", "METADATA": "Метаданни", "METADATAFROMFILE": "Метаданни от файл", + "CERTIFICATE": "SAML сертификат", + "DOWNLOADCERT": "Изтеглете SAML сертификат", "CREATEMETADATA": "Създайте метаданни", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL" diff --git a/console/src/assets/i18n/cs.json b/console/src/assets/i18n/cs.json index 95d6ccf6b..55e6c0641 100644 --- a/console/src/assets/i18n/cs.json +++ b/console/src/assets/i18n/cs.json @@ -2104,6 +2104,8 @@ "UPLOAD": "Nahrát XML soubor", "METADATA": "Metadata", "METADATAFROMFILE": "Metadata ze souboru", + "CERTIFICATE": "certifikát SAML", + "DOWNLOADCERT": "Stáhněte si certifikát SAML", "CREATEMETADATA": "Vytvořit metadata", "ENTITYID": "Entity ID", "ACSURL": "ACS koncová URL" diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json index 85ca46451..1027aa641 100644 --- a/console/src/assets/i18n/de.json +++ b/console/src/assets/i18n/de.json @@ -2095,6 +2095,8 @@ "UPLOAD": "XML-Datei hochladen", "METADATA": "Metadaten", "METADATAFROMFILE": "Metadata aus Datei", + "CERTIFICATE": "SAML-Zertifikat", + "DOWNLOADCERT": "Laden Sie das SAML-Zertifikat herunter", "CREATEMETADATA": "Create metadata", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL" diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index ca1b5ae00..a3eee139d 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -2114,6 +2114,8 @@ "UPLOAD": "Upload XML file", "METADATA": "Metadata", "METADATAFROMFILE": "Metadata from file", + "CERTIFICATE": "SAML certificate", + "DOWNLOADCERT": "Download SAML certificate", "CREATEMETADATA": "Create metadata", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL" diff --git a/console/src/assets/i18n/es.json b/console/src/assets/i18n/es.json index 7fdae41e2..5f8435d72 100644 --- a/console/src/assets/i18n/es.json +++ b/console/src/assets/i18n/es.json @@ -2092,6 +2092,8 @@ "UPLOAD": "Subir fichero XML", "METADATA": "Metadatos", "METADATAFROMFILE": "Metadatos desde un fichero", + "CERTIFICATE": "Certificado SAML", + "DOWNLOADCERT": "Descargar certificado SAML", "CREATEMETADATA": "Crear metadatos", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL" diff --git a/console/src/assets/i18n/fr.json b/console/src/assets/i18n/fr.json index a56376297..821f7b87b 100644 --- a/console/src/assets/i18n/fr.json +++ b/console/src/assets/i18n/fr.json @@ -2096,6 +2096,8 @@ "UPLOAD": "Télécharger le fichier XML", "METADATA": "Métadonnées", "METADATAFROMFILE": "Métadonnées du fichier", + "CERTIFICATE": "Certificat SAML", + "DOWNLOADCERT": "Télécharger le certificat SAML", "CREATEMETADATA": "Créer des métadonnées", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL" diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json index 177990395..59c61628e 100644 --- a/console/src/assets/i18n/it.json +++ b/console/src/assets/i18n/it.json @@ -2096,6 +2096,8 @@ "UPLOAD": "Carica il file XML", "METADATA": "Metadata", "METADATAFROMFILE": "Metadati dal file", + "CERTIFICATE": "Certificato SAML", + "DOWNLOADCERT": "Scarica il certificato SAML", "CREATEMETADATA": "Crea metadati", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL" diff --git a/console/src/assets/i18n/ja.json b/console/src/assets/i18n/ja.json index dfb0c1bf1..2ce024f57 100644 --- a/console/src/assets/i18n/ja.json +++ b/console/src/assets/i18n/ja.json @@ -2087,6 +2087,8 @@ "UPLOAD": "XMLファイルをアップロードする", "METADATA": "メタデータ", "METADATAFROMFILE": "ファイルからのメタデータ", + "CERTIFICATE": "SAML証明書", + "DOWNLOADCERT": "SAML証明書をダウンロードする", "CREATEMETADATA": "メタデータの作成", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL" diff --git a/console/src/assets/i18n/mk.json b/console/src/assets/i18n/mk.json index 1c1fa479b..1312d08d0 100644 --- a/console/src/assets/i18n/mk.json +++ b/console/src/assets/i18n/mk.json @@ -2093,6 +2093,8 @@ "UPLOAD": "Поставете XML датотека", "METADATA": "Метаподатоци", "METADATAFROMFILE": "Метаподатоци од датотека", + "CERTIFICATE": "SAML сертификат", + "DOWNLOADCERT": "Преземете SAML сертификат", "CREATEMETADATA": "Креирајте метаподатоци", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL" diff --git a/console/src/assets/i18n/pl.json b/console/src/assets/i18n/pl.json index 0c5bd73ad..dbac4ac9a 100644 --- a/console/src/assets/i18n/pl.json +++ b/console/src/assets/i18n/pl.json @@ -2096,6 +2096,8 @@ "UPLOAD": "Prześlij plik XML", "METADATA": "Metadane", "METADATAFROMFILE": "Metadane z pliku", + "CERTIFICATE": "Certyfikat SAML-a", + "DOWNLOADCERT": "Pobierz certyfikat SAML", "CREATEMETADATA": "Utwórz metadane", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL" diff --git a/console/src/assets/i18n/pt.json b/console/src/assets/i18n/pt.json index c4472c05e..3f66d9458 100644 --- a/console/src/assets/i18n/pt.json +++ b/console/src/assets/i18n/pt.json @@ -2091,6 +2091,8 @@ "UPLOAD": "Prześlij plik XML", "METADATA": "Metadados", "METADATAFROMFILE": "Metadados do Arquivo", + "CERTIFICATE": "Certificado SAML", + "DOWNLOADCERT": "Baixar certificado SAML", "CREATEMETADATA": "Criar metadados", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL" diff --git a/console/src/assets/i18n/ru.json b/console/src/assets/i18n/ru.json index 64da76a08..950c26592 100644 --- a/console/src/assets/i18n/ru.json +++ b/console/src/assets/i18n/ru.json @@ -2084,7 +2084,12 @@ "OR": "или", "XML": "Загрузить XML-метаданные", "METADATA": "Метаданные", - "METADATAFROMFILE": "Метаданные из файла" + "METADATAFROMFILE": "Метаданные из файла", + "CERTIFICATE": "SAML-сертификат", + "DOWNLOADCERT": "Скачать сертификат SAML", + "CREATEMETADATA": "Создать метаданные", + "ENTITYID": "Идентификатор объекта", + "ACSURL": "URL-адрес конечной точки ACS" }, "AUTHMETHODS": { "CODE": { diff --git a/console/src/assets/i18n/zh.json b/console/src/assets/i18n/zh.json index dd8a3bf26..2f551c780 100644 --- a/console/src/assets/i18n/zh.json +++ b/console/src/assets/i18n/zh.json @@ -2095,6 +2095,8 @@ "UPLOAD": "上传 XML 文件", "METADATA": "元数据", "METADATAFROMFILE": "文件中的元数据", + "CERTIFICATE": "SAML证书", + "DOWNLOADCERT": "下载 SAML 证书", "CREATEMETADATA": "创建元数据", "ENTITYID": "Entity ID", "ACSURL": "ACS endpoint URL"