GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-07-26 08:54:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: show expired token label (#4581)

Browse Source 
* fix: show expired token label

* fix: handle no expiry

---------

Co-authored-by: Vishal Sharma <makeavish786@gmail.com>
This commit is contained in:
Yunus M 2024-02-21 15:38:18 +05:30 committed by GitHub
parent 0cb60e1c10
commit 7bca847f11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/src/container/APIKeys/APIKeys.tsx
View File

@ -26,6 +26,7 @@ import updateAPIKeyApi from 'api/APIKeys/updateAPIKey';
import axios, { AxiosError } from 'axios'; import axios, { AxiosError } from 'axios';
import cx from 'classnames'; import cx from 'classnames';
import { SOMETHING_WENT_WRONG } from 'constants/api'; import { SOMETHING_WENT_WRONG } from 'constants/api';
import dayjs from 'dayjs';
import { useGetAllAPIKeys } from 'hooks/APIKeys/useGetAllAPIKeys'; import { useGetAllAPIKeys } from 'hooks/APIKeys/useGetAllAPIKeys';
import { useNotifications } from 'hooks/useNotifications'; import { useNotifications } from 'hooks/useNotifications';
import { import {
@ -320,10 +321,20 @@ function APIKeys(): JSX.Element {
return differenceInSeconds / (60 * 60 * 24); return differenceInSeconds / (60 * 60 * 24);
}; };
const isExpiredToken = (expiryTimestamp: number): boolean => {
if (expiryTimestamp === 0) {
return false;
}
const currentTime = dayjs();
const tokenExpiresAt = dayjs.unix(expiryTimestamp);
return tokenExpiresAt.isBefore(currentTime);
};
const columns: TableProps<APIKeyProps>['columns'] = [ const columns: TableProps<APIKeyProps>['columns'] = [
{ {
title: 'API Key', title: 'API Key',
key: 'api-key', key: 'api-key',
// eslint-disable-next-line sonarjs/cognitive-complexity
render: (APIKey: APIKeyProps): JSX.Element => { render: (APIKey: APIKeyProps): JSX.Element => {
const formattedDateAndTime = const formattedDateAndTime =
APIKey && APIKey?.lastUsed && APIKey?.lastUsed !== 0 APIKey && APIKey?.lastUsed && APIKey?.lastUsed !== 0
@ -337,6 +348,8 @@ function APIKeys(): JSX.Element {
? Number.POSITIVE_INFINITY ? Number.POSITIVE_INFINITY
: getDateDifference(APIKey?.createdAt, APIKey?.expiresAt); : getDateDifference(APIKey?.createdAt, APIKey?.expiresAt);
const isExpired = isExpiredToken(APIKey.expiresAt);
const expiresOn = const expiresOn =
!APIKey.expiresAt || APIKey.expiresAt === 0 !APIKey.expiresAt || APIKey.expiresAt === 0
? 'No Expiry' ? 'No Expiry'
@ -473,7 +486,8 @@ function APIKeys(): JSX.Element {
Last used <Minus size={12} /> Last used <Minus size={12} />
<Typography.Text>{formattedDateAndTime}</Typography.Text> <Typography.Text>{formattedDateAndTime}</Typography.Text>
</div> </div>
{expiresIn <= EXPIRATION_WITHIN_SEVEN_DAYS && (
{!isExpired && expiresIn <= EXPIRATION_WITHIN_SEVEN_DAYS && (
<div <div
className={cx( className={cx(
'api-key-expires-in', 'api-key-expires-in',
@ -483,6 +497,12 @@ function APIKeys(): JSX.Element {
<span className="dot" /> Expires in {expiresIn} Days <span className="dot" /> Expires in {expiresIn} Days
</div> </div>
)} )}
{isExpired && (
<div className={cx('api-key-expires-in danger')}>
<span className="dot" /> Expired
</div>
)}
</div> </div>
</div> </div>
); );