-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into 60-remove-link-to-fro…
…ntend-url-in-all-connectors-view-for-authority-and-operator-admins
- Loading branch information
Showing
13 changed files
with
186 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
...ity-portal-db/src/main/resources/db/migration/V12__Fix_Service_Provider_User_Deletion.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| alter table connector alter column created_by drop not null; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
authority-portal-frontend/src/app/shared/pipes-and-directives/external-url-directive.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Copyright (c) 2024 sovity GmbH | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Apache License, Version 2.0 which is available at | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * Contributors: | ||
| * sovity GmbH - initial implementation | ||
| */ | ||
| import {ElementRef, HostListener} from '@angular/core'; | ||
| import {Router} from '@angular/router'; | ||
|
|
||
| export class ExternalUrlDirective { | ||
| constructor(private el: ElementRef, private router: Router) {} | ||
|
|
||
| @HostListener('click', ['$event']) | ||
| clicked(event: Event) { | ||
| const url = this.el.nativeElement.href; | ||
|
|
||
| if (!url) { | ||
| return; | ||
| } | ||
|
|
||
| this.router.navigate(['/externalRedirect', {externalUrl: url}], { | ||
| skipLocationChange: true, | ||
| }); | ||
|
|
||
| event.preventDefault(); | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
authority-portal-keycloak/sovity-theme/login/login-update-password.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| <#import "template.ftl" as layout> | ||
| <#import "password-commons.ftl" as passwordCommons> | ||
| <@layout.registrationLayout displayMessage=!messagesPerField.existsError('password','password-confirm'); section> | ||
| <#if section = "header"> | ||
| ${msg("updatePasswordTitle")} | ||
| <#elseif section = "form"> | ||
| <form id="kc-passwd-update-form" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post"> | ||
| <div class="${properties.kcFormGroupClass!}"> | ||
| <input type="password" id="password-new" name="password-new" class="text-input" | ||
| autofocus autocomplete="new-password" placeholder="New Password" | ||
| aria-invalid="<#if messagesPerField.existsError('password','password-confirm')>true</#if>" | ||
| /> | ||
| </div> | ||
|
|
||
| <#if messagesPerField.existsError('password')> | ||
| <span id="input-error-password" class="${properties.kcInputErrorMessageClass!}" aria-live="polite"> | ||
| ${kcSanitize(messagesPerField.get('password'))?no_esc} | ||
| </span> | ||
| </#if> | ||
|
|
||
| <div class="${properties.kcFormGroupClass!}"> | ||
| <input type="password" id="password-confirm" name="password-confirm" | ||
| class="text-input" | ||
| autocomplete="new-password" placeholder="Confirm Password" | ||
| aria-invalid="<#if messagesPerField.existsError('password-confirm')>true</#if>" | ||
| /> | ||
| </div> | ||
|
|
||
| <#if messagesPerField.existsError('password-confirm')> | ||
| <span id="input-error-password-confirm" class="${properties.kcInputErrorMessageClass!}" | ||
| aria-live="polite"> | ||
| ${kcSanitize(messagesPerField.get('password-confirm'))?no_esc} | ||
| </span> | ||
| </#if> | ||
|
|
||
| <div class="${properties.kcFormGroupClass!}"> | ||
| <@passwordCommons.logoutOtherSessions/> | ||
|
|
||
| <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}"> | ||
| <#if isAppInitiatedAction??> | ||
| <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!} ${properties.kcButtonBlockClass!}" | ||
| type="submit" value="${msg("doSubmit")}"/> | ||
| <button | ||
| class="${properties.kcButtonClass!} ${properties.kcButtonCancelClass!} ${properties.kcButtonLargeClass!} ${properties.kcButtonBlockClass!}" | ||
| type="submit" name="cancel-aia" value="true" />${msg("doCancel")}</button> | ||
| <#else> | ||
| <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonBlockClass!} ${properties.kcButtonLargeClass!} ${properties.kcButtonFullWidthClass!}" | ||
| type="submit" value="${msg("doSubmit")}"/> | ||
| </#if> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| </#if> | ||
| </@layout.registrationLayout> |
12 changes: 12 additions & 0 deletions
12
authority-portal-keycloak/sovity-theme/login/password-commons.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <#macro logoutOtherSessions> | ||
| <div id="kc-form-options" class="${properties.kcFormOptionsClass!}"> | ||
| <div class="${properties.kcFormOptionsWrapperClass!}"> | ||
| <div class="checkbox"> | ||
| <label> | ||
| <input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" checked> | ||
| ${msg("logoutOtherSessions")} | ||
| </label> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </#macro> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters