Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conditionally show Client Offline Session Max #30802

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.

Sign up for GitHub

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

Merged
hmlnarik merged 1 commit into from
Jun 26, 2024
Merged

Conditionally show Client Offline Session Max #30802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions js/apps/admin-ui/cypress/e2e/clients_test.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import CommonPage from "../support/pages/CommonPage";
import AttributesTab from "../support/pages/admin-ui/manage/AttributesTab";
import DedicatedScopesMappersTab from "../support/pages/admin-ui/manage/clients/client_details/DedicatedScopesMappersTab";
import { ClientRegistrationPage } from "../support/pages/admin-ui/manage/clients/ClientRegistrationPage";
import RealmSettingsPage from "../support/pages/admin-ui/manage/realm_settings/RealmSettingsPage";

let itemId = "client_crud";
const loginPage = new LoginPage();
Expand All @@ -30,6 +31,7 @@ const commonPage = new CommonPage();
const listingPage = new ListingPage();
const attributesTab = new AttributesTab();
const dedicatedScopesMappersTab = new DedicatedScopesMappersTab();
const realmSettings = new RealmSettingsPage();

describe("Clients test", () => {
const realmName = `clients-realm-${uuid()}`;
Expand Down Expand Up @@ -880,6 +882,30 @@ describe("Clients test", () => {
advancedTab.revertCompatibility();
});

it("Client Offline Session Max", () => {
configureOfflineSessionMaxInRealmSettings(true);

cy.findByTestId("token-lifespan-clientOfflineSessionMax").should("exist");

configureOfflineSessionMaxInRealmSettings(false);

cy.findByTestId("token-lifespan-clientOfflineSessionMax").should(
"not.exist",
);

function configureOfflineSessionMaxInRealmSettings(enabled: boolean) {
commonPage.sidebar().goToRealmSettings();
realmSettings.goToSessionsTab();
realmSettings.setOfflineSessionMaxSwitch(enabled);
realmSettings.saveSessions();

commonPage.sidebar().goToClients();
commonPage.tableToolbarUtils().searchItem(client);
commonPage.tableUtils().clickRowItemLink(client);
clientDetailsPage.goToAdvancedTab();
}
});

it("Advanced settings", () => {
advancedTab.jumpToAdvanced();

Expand Down
12 changes: 12 additions & 0 deletions js/apps/admin-ui/cypress/support/pages/admin-ui/manage/realm_settings/RealmSettingsPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default class RealmSettingsPage extends CommonPage {
generalSaveBtn = "realmSettingsGeneralTab-save";
generalRevertBtn = "realmSettingsGeneralTab-revert";
themesSaveBtn = "themes-tab-save";
sessionsSaveBtn = "sessions-tab-save";
loginTab = "rs-login-tab";
emailTab = "rs-email-tab";
themesTab = "rs-themes-tab";
Expand Down Expand Up @@ -402,6 +403,12 @@ export default class RealmSettingsPage extends CommonPage {
return this;
}

saveSessions() {
cy.findByTestId(this.sessionsSaveBtn).click();

return this;
}

addSenderEmail(senderEmail: string) {
this.getFromInput().clear();

Expand Down Expand Up @@ -710,6 +717,11 @@ export default class RealmSettingsPage extends CommonPage {
return this;
}

setOfflineSessionMaxSwitch(value: boolean) {
this.setSwitch(this.offlineSessionMaxSwitch, value);
return this;
}

clickAdd() {
cy.findByTestId("addEventTypeConfirm").click();
return this;
Expand Down
15 changes: 15 additions & 0 deletions js/apps/admin-ui/src/clients/advanced/AdvancedSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,21 @@ export const AdvancedSettings = ({
defaultValue={realm?.offlineSessionIdleTimeout}
units={["minute", "day", "hour"]}
/>

{realm?.offlineSessionMaxLifespanEnabled && (
<TokenLifespan
id="clientOfflineSessionMax"
name={convertAttributeNameToForm(
"attributes.client.offline.session.max.lifespan",
)}
defaultValue={
realm?.offlineSessionMaxLifespanEnabled
? realm.offlineSessionMaxLifespan
: undefined
}
units={["minute", "day", "hour"]}
/>
)}
<DefaultSwitchControl
name={convertAttributeNameToForm<FormFields>(
"attributes.tls.client.certificate.bound.access.tokens",
Expand Down
1 change: 1 addition & 0 deletions js/apps/admin-ui/src/clients/advanced/TokenLifespan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export const TokenLifespan = ({
label={t(id)}
fieldId={id}
labelIcon={<HelpItem helpText={t(`${id}Help`)} fieldLabelId={id} />}
data-testid={`token-lifespan-${id}`}
>
<Controller
name={name}
Expand Down