Skip to content

Commit

Permalink
fix(theme): fix password update theme (#101)
Browse files Browse the repository at this point in the history
- fix password update theme
- chore(consortia): change rc env to use main tag for init container
  • Loading branch information
oyo authored Apr 18, 2024
1 parent 6a0e82b commit ceb8d81
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 30 deletions.
4 changes: 2 additions & 2 deletions consortia/environments/centralidp/values-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ keycloak:
proxy: edge
initContainers:
- name: import
image: docker.io/tractusx/portal-iam-consortia:v3.0.0-rc.1
image: docker.io/tractusx/portal-iam-consortia:main
imagePullPolicy: Always
command:
- sh
Expand Down Expand Up @@ -69,7 +69,7 @@ seeding:
enabled: false
initContainers:
- name: init-cx-central
image: docker.io/tractusx/portal-iam-consortia:v3.0.0-rc.1
image: docker.io/tractusx/portal-iam-consortia:main
imagePullPolicy: Always
command:
- sh
Expand Down
2 changes: 1 addition & 1 deletion consortia/environments/sharedidp/values-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ keycloak:
mountPath: "/secrets"
initContainers:
- name: import
image: docker.io/tractusx/portal-iam-consortia:v3.0.0-rc.1
image: docker.io/tractusx/portal-iam-consortia:main
imagePullPolicy: Always
command:
- sh
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
* Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down Expand Up @@ -189,6 +189,15 @@ form a {
padding: 16px 0 0 0;
}

button[aria-controls="password-new"],
button[aria-controls="password-confirm"] {
display: none;
}

#logout-sessions {
width: 20px;
}

.password-policy-hint {
text-align: left;
line-height: 20px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
* Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
Expand Down Expand Up @@ -374,7 +374,7 @@ class FormUpdate extends Form {
}
this.button = document.querySelectorAll('input[type=submit]')[0]
this.button.setAttribute('disabled', '')
State.getInstance().setUsername(document.getElementById('username').value)
State.getInstance().setUsername(document.getElementById('username')?.value ?? '')
Validator.getInstance()
return this
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/********************************************************************************
* Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
*
* 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.
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
* SPDX-License-Identifier: Apache-2.0
********************************************************************************/

// intentionally empty to prevent loading 404 error
66 changes: 42 additions & 24 deletions import/keycloak-themes/catenax-shared/login/test-update.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
- Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
-
- See the NOTICE file(s) distributed with this work for additional
- information regarding copyright ownership.
Expand All @@ -17,16 +17,14 @@
- SPDX-License-Identifier: Apache-2.0
-->

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" class="">

<head>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="robots" content="noindex, nofollow">

<title>Sign in to Martins Global Enterprise</title>
<link rel="icon" href="/auth/resources/2wb2s/login/catenax-shared-portal/img/favicon.ico" />
<title>Sign in to Test Company</title>
<link href="./resources/css/Main.css" rel="stylesheet" />
<script src="./resources/js/Main.js"></script>
</head>
Expand All @@ -35,7 +33,7 @@
<div class="">
<div id="kc-header" class="">
<div id="kc-header-wrapper"
class="">Martins Global Enterprise</div>
class="">Test Company</div>
</div>
<div class="">
<header class="">
Expand All @@ -55,20 +53,24 @@ <h1 id="kc-page-title"> Update password
<span class="">You need to change your password to activate your account.</span>
</div>

<form id="kc-passwd-update-form" class="" action="https://sharedidp.dev.demo.catena-x.net/auth/realms/idp26/login-actions/required-action?session_code=4gyDbhhLYVwn692-3SZGOIIf0dJDXP9jWdMQgtlxuu0&amp;execution=UPDATE_PASSWORD&amp;client_id=central-idp&amp;tab_id=mNoDfxcVxcc" method="post">
<input type="text" id="username" name="username" value="[email protected]" autocomplete="username"
readonly="readonly" style="display:none;"/>
<input type="password" id="password" name="password" autocomplete="current-password" style="display:none;"/>

<form id="kc-passwd-update-form" class="" action="https://sharedidp-rc.dev.demo.catena-x.net/auth/realms/idp8/login-actions/required-action?session_code=XNVYRo3eoPdMlMrlUUj0iFVZLPZADBcjxHTnQB9D_68&amp;execution=UPDATE_PASSWORD&amp;client_id=central-idp&amp;tab_id=nqQOPk24W9A" method="post">
<div class="">
<div class="">
<label for="password-new" class="">New Password</label>
</div>
<div class="">
<input type="password" id="password-new" name="password-new" class=""
autofocus autocomplete="new-password"
aria-invalid=""
/>
<div class="">
<input type="password" id="password-new" name="password-new" class=""
autofocus autocomplete="new-password"
aria-invalid=""
/>
<button class="" type="button" aria-label="Show password"
aria-controls="password-new" data-password-toggle
data-icon-show="" data-icon-hide=""
data-label-show="Show password" data-label-hide="Hide password">
<i class="" aria-hidden="true"></i>
</button>
</div>

</div>
</div>
Expand All @@ -78,27 +80,43 @@ <h1 id="kc-page-title"> Update password
<label for="password-confirm" class="">Confirm password</label>
</div>
<div class="">
<input type="password" id="password-confirm" name="password-confirm"
class=""
autocomplete="new-password"
aria-invalid=""
/>
<div class="">
<input type="password" id="password-confirm" name="password-confirm"
class=""
autocomplete="new-password"
aria-invalid=""
/>
<button class="" type="button" aria-label="Show password"
aria-controls="password-confirm" data-password-toggle
data-icon-show="" data-icon-hide=""
data-label-show="Show password" data-label-hide="Hide password">
<i class="" aria-hidden="true"></i>
</button>
</div>


</div>
</div>

<div class="">
<div id="kc-form-options" class="">
<div class="">
</div>
</div>
<div id="kc-form-options" class="">
<div class="">
<div class="checkbox">
<label>
<input type="checkbox" id="logout-sessions" name="logout-sessions" value="on" checked>
Sign out from other devices
</label>
</div>
</div>
</div>

<div id="kc-form-buttons" class="">
<input class=" " type="submit" value="Submit" />
</div>
</div>
</form>
<script type="module" src="./resources/js/passwordVisibility.js"></script>



</div>
Expand Down

0 comments on commit ceb8d81

Please sign in to comment.