chore(token): disable never expiring tokens

Signed-off-by: Thibault Camalon <[email protected]>
Substra · Aug 6, 2024 · 421f7cf · 421f7cf
1 parent 4734007
commit 421f7cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/routes/tokens/BearerTokenUtils.ts b/src/routes/tokens/BearerTokenUtils.ts
@@ -8,7 +8,7 @@ import {
 export const parseToken = (object: RawBearerTokenT): BearerTokenT => {
     return {
         created_at: new Date(object.created_at),
-        expires_at: object.expires_at ? new Date(object.expires_at) : null,
+        expires_at: new Date(object.expires_at),
         note: object.note,
         id: object.id,
     };
@@ -18,7 +18,7 @@ export const parseNewToken = (object: RawNewBearerTokenT): NewBearerTokenT => {
     return {
         token: object.token,
         created_at: new Date(object.created_at),
-        expires_at: object.expires_at ? new Date(object.expires_at) : null,
+        expires_at: new Date(object.expires_at),
         note: object.note,
         id: object.id,
     };

diff --git a/src/routes/tokens/components/GenerateTokenModal.tsx b/src/routes/tokens/components/GenerateTokenModal.tsx
@@ -38,7 +38,7 @@ const GenerateTokenModal = ({
 
     const [tokenName, setTokenName] = useState('');
     const [durationSelect, setDurationSelect] = useState('');
-    const [expirationDate, setExpirationDate] = useState<string | null>('');
+    const [expirationDate, setExpirationDate] = useState<string>('');
 
     const incorrectExpiration =
         expirationDate === '' ||
@@ -61,9 +61,6 @@ const GenerateTokenModal = ({
             case '60days':
                 setExpirationDate(increaseDate(new Date(), 60).toISOString());
                 break;
-            case 'never':
-                setExpirationDate(null);
-                break;
             case 'custom':
             default:
                 break;
@@ -136,7 +133,6 @@ const GenerateTokenModal = ({
                             </option>
                             <option value="30days">30 days</option>
                             <option value="60days">60 days</option>
-                            <option value="never">Never</option>
                             <option value="custom">Custom</option>
                         </Select>
                         {durationSelect === 'custom' && (

diff --git a/src/types/BearerTokenTypes.ts b/src/types/BearerTokenTypes.ts
@@ -1,6 +1,6 @@
 export type BearerTokenT = {
     created_at: Date;
-    expires_at: Date | null;
+    expires_at: Date;
     note: string;
     id: string;
 };
@@ -9,7 +9,7 @@ export type NewBearerTokenT = BearerTokenT & { token: string };
 // API response
 export type RawBearerTokenT = {
     created_at: string;
-    expires_at: string | null;
+    expires_at: string;
     note: string;
     id: string;
 };