From b0154b39a30bc5c30cd921e936285c020cea87fc Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Tue, 10 Aug 2021 13:49:08 +0200
Subject: [PATCH] added component to set lifespan of token (#955)

---
 src/clients/advanced/AdvancedSettings.tsx | 34 ++-------
 src/clients/advanced/TokenLifespan.tsx    | 89 +++++++++++++++++++++++
 src/clients/messages.ts                   |  4 +
 3 files changed, 101 insertions(+), 26 deletions(-)
 create mode 100644 src/clients/advanced/TokenLifespan.tsx

diff --git a/src/clients/advanced/AdvancedSettings.tsx b/src/clients/advanced/AdvancedSettings.tsx
index ebbd05b16e..cf364b0adc 100644
--- a/src/clients/advanced/AdvancedSettings.tsx
+++ b/src/clients/advanced/AdvancedSettings.tsx
@@ -14,6 +14,7 @@ import {
 import { FormAccess } from "../../components/form-access/FormAccess";
 import { HelpItem } from "../../components/help-enabler/HelpItem";
 import { TimeSelector } from "../../components/time-selector/TimeSelector";
+import { TokenLifespan } from "./TokenLifespan";
 
 type AdvancedSettingsProps = {
   control: Control<Record<string, any>>;
@@ -60,32 +61,13 @@ export const AdvancedSettings = ({
       )}
       {protocol === "openid-connect" && (
         <>
-          <FormGroup
-            label={t("accessTokenLifespan")}
-            fieldId="accessTokenLifespan"
-            labelIcon={
-              <HelpItem
-                helpText="clients-help:accessTokenLifespan"
-                forLabel={t("accessTokenLifespan")}
-                forID={t(`common:helpLabel`, {
-                  label: t("accessTokenLifespan"),
-                })}
-              />
-            }
-          >
-            <Controller
-              name="attributes.access-token-lifespan"
-              defaultValue=""
-              control={control}
-              render={({ onChange, value }) => (
-                <TimeSelector
-                  units={["minutes", "days", "hours"]}
-                  value={value}
-                  onChange={onChange}
-                />
-              )}
-            />
-          </FormGroup>
+          <TokenLifespan
+            id="accessTokenLifespan"
+            name="attributes.access-token-lifespan"
+            defaultValue=""
+            units={["minutes", "days", "hours"]}
+            control={control}
+          />
 
           <FormGroup
             label={t("oAuthMutual")}
diff --git a/src/clients/advanced/TokenLifespan.tsx b/src/clients/advanced/TokenLifespan.tsx
new file mode 100644
index 0000000000..4b29ad46aa
--- /dev/null
+++ b/src/clients/advanced/TokenLifespan.tsx
@@ -0,0 +1,89 @@
+import React, { useState } from "react";
+import { Control, Controller, FieldValues } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+import {
+  FormGroup,
+  Select,
+  SelectOption,
+  SelectVariant,
+  Split,
+  SplitItem,
+} from "@patternfly/react-core";
+
+import {
+  TimeSelector,
+  Unit,
+} from "../../components/time-selector/TimeSelector";
+import { HelpItem } from "../../components/help-enabler/HelpItem";
+
+type TokenLifespanProps = {
+  id: string;
+  name: string;
+  defaultValue: string;
+  control: Control<FieldValues>;
+  units?: Unit[];
+};
+
+const never = "tokenLifespan.never";
+const expires = "tokenLifespan.expires";
+
+export const TokenLifespan = ({
+  id,
+  name,
+  defaultValue,
+  control,
+  units,
+}: TokenLifespanProps) => {
+  const { t } = useTranslation("clients");
+  const [open, setOpen] = useState(false);
+
+  return (
+    <FormGroup
+      label={t(id)}
+      fieldId={id}
+      labelIcon={
+        <HelpItem
+          helpText={`clients-help:${id}`}
+          forLabel={t(id)}
+          forID={t(`common:helpLabel`, {
+            label: t(id),
+          })}
+        />
+      }
+    >
+      <Controller
+        name={name}
+        defaultValue={defaultValue}
+        control={control}
+        render={({ onChange, value }) => (
+          <Split hasGutter>
+            <SplitItem>
+              <Select
+                variant={SelectVariant.single}
+                onToggle={(isExpanded) => setOpen(isExpanded)}
+                isOpen={open}
+                onSelect={(_, value) => {
+                  onChange(value);
+                  setOpen(false);
+                }}
+                selections={[
+                  typeof value === "number" && value !== -1
+                    ? t(expires)
+                    : t(never),
+                ]}
+              >
+                <SelectOption value={-1}>{t(never)}</SelectOption>
+                <SelectOption value={60}>{t(expires)}</SelectOption>
+              </Select>
+            </SplitItem>
+            <SplitItem>
+              {typeof value === "number" && value !== -1 && (
+                <TimeSelector units={units} value={value} onChange={onChange} />
+              )}
+            </SplitItem>
+          </Split>
+        )}
+      />
+    </FormGroup>
+  );
+};
diff --git a/src/clients/messages.ts b/src/clients/messages.ts
index 3e11d149c0..08f941bc4b 100644
--- a/src/clients/messages.ts
+++ b/src/clients/messages.ts
@@ -245,5 +245,9 @@ export default {
     importFile: "Import file",
     importSuccess: "New certificate imported",
     importError: "Could not import certificate {{error}}",
+    tokenLifespan: {
+      expires: "Expires in",
+      never: "Never expires",
+    },
   },
 };