Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KNOX-3017 - Avoid showing lifetime adjustment popup when TTL is set to -1 #877

Merged
merged 1 commit into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h3>Token Generation</h3>
<label *ngIf="comment.invalid" style="color: red;"><i class="icon-warning"></i>Invalid comment!</label>

<label><i class="icon-info"></i> Configured maximum lifetime: </label>
<label>{{tssStatus.maximumLifetimeText}}</label>
<label>{{tssStatus.maximumLifetimeText}} <i class="icon-exclamation" *ngIf="'Unlimited lifetime' === tssStatus.maximumLifetimeText"></i></label>
<div *ngIf="tssStatus.lifespanInputEnabled">
<label><i class="icon-time"></i> Lifetime (days, hours, mins):</label>
<table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ export class TokenGenService {
return {
tokenManagementEnabled: responseData.tokenManagementEnabled === 'true',
maximumLifetimeText: responseData.maximumLifetimeText,
maximumLifetimeSeconds: responseData.maximumLifetimeSeconds,
// the '+' character at the beginning converts the incoming string to a number
maximumLifetimeSeconds: +responseData.maximumLifetimeSeconds,
lifespanInputEnabled: responseData.lifespanInputEnabled === 'true',
impersonationEnabled: responseData.impersonationEnabled === 'true',
configuredTssBackend: responseData.configuredTssBackend,
Expand Down
Loading