diff --git a/apps/api/src/routes/v1_identities_getIdentity.ts b/apps/api/src/routes/v1_identities_getIdentity.ts
index f47b02b719..2e6904d6be 100644
--- a/apps/api/src/routes/v1_identities_getIdentity.ts
+++ b/apps/api/src/routes/v1_identities_getIdentity.ts
@@ -80,7 +80,7 @@ export const registerV1IdentitiesGetIdentity = (app: App) =>
const { identityId, externalId } = c.req.valid("query");
const { db } = c.get("services");
- if (!identityId && !externalId) {
+ if (!(identityId || externalId)) {
throw new UnkeyApiError({
code: "BAD_REQUEST",
message: "Provide either identityId or externalId",
diff --git a/apps/api/src/routes/v1_identities_updateIdentity.ts b/apps/api/src/routes/v1_identities_updateIdentity.ts
index fbe9ab4c08..78c9ab89dc 100644
--- a/apps/api/src/routes/v1_identities_updateIdentity.ts
+++ b/apps/api/src/routes/v1_identities_updateIdentity.ts
@@ -140,7 +140,7 @@ export const registerV1IdentitiesUpdateIdentity = (app: App) =>
const { db, cache } = c.get("services");
- if (!req.identityId && !req.externalId) {
+ if (!(req.identityId || req.externalId)) {
throw new UnkeyApiError({
code: "BAD_REQUEST",
message: "Provide either identityId or externalId",
diff --git a/apps/api/src/routes/v1_keys_getVerifications.ts b/apps/api/src/routes/v1_keys_getVerifications.ts
index 9ede996662..6f0237af0e 100644
--- a/apps/api/src/routes/v1_keys_getVerifications.ts
+++ b/apps/api/src/routes/v1_keys_getVerifications.ts
@@ -303,7 +303,7 @@ export const registerV1KeysGetVerifications = (app: App) =>
function transformData(
data: VerificationTimeseriesDataPoint[] | undefined,
): CacheNamespaces["verificationsByKeyId"] {
- if (!data || !data.length) {
+ if (!data?.length) {
return [];
}
diff --git a/apps/api/src/routes/v1_migrations_createKey.ts b/apps/api/src/routes/v1_migrations_createKey.ts
index 44de7e65b0..5e22379e2b 100644
--- a/apps/api/src/routes/v1_migrations_createKey.ts
+++ b/apps/api/src/routes/v1_migrations_createKey.ts
@@ -402,7 +402,7 @@ export const registerV1MigrationsCreateKeys = (app: App) =>
});
}
- if (!key.hash && !key.plaintext) {
+ if (!(key.hash || key.plaintext)) {
throw new UnkeyApiError({
code: "BAD_REQUEST",
message: "provide either `hash` or `plaintext`",
diff --git a/apps/api/src/routes/v1_ratelimits_deleteOverride.ts b/apps/api/src/routes/v1_ratelimits_deleteOverride.ts
index 386216997e..cbe563a72f 100644
--- a/apps/api/src/routes/v1_ratelimits_deleteOverride.ts
+++ b/apps/api/src/routes/v1_ratelimits_deleteOverride.ts
@@ -66,7 +66,7 @@ export const registerV1RatelimitDeleteOverride = (app: App) =>
c,
buildUnkeyQuery(({ or }) => or("*", "ratelimit.*.delete_override")),
);
- if (!namespaceId && !namespaceName) {
+ if (!(namespaceId || namespaceName)) {
throw new UnkeyApiError({
code: "BAD_REQUEST",
message: "You must provide a namespaceId or a namespaceName",
diff --git a/apps/api/src/routes/v1_ratelimits_getOverride.ts b/apps/api/src/routes/v1_ratelimits_getOverride.ts
index a3f3151da4..054d0a5a8d 100644
--- a/apps/api/src/routes/v1_ratelimits_getOverride.ts
+++ b/apps/api/src/routes/v1_ratelimits_getOverride.ts
@@ -72,7 +72,7 @@ export const registerV1RatelimitGetOverride = (app: App) =>
message: "Missing required permission: ratelimit.*.read_override",
});
}
- if (!namespaceId && !namespaceName) {
+ if (!(namespaceId || namespaceName)) {
throw new UnkeyApiError({
code: "BAD_REQUEST",
message: "You must provide a namespaceId or a namespaceName",
diff --git a/apps/api/src/routes/v1_ratelimits_listOverrides.ts b/apps/api/src/routes/v1_ratelimits_listOverrides.ts
index baa3afcdfc..36be0ab516 100644
--- a/apps/api/src/routes/v1_ratelimits_listOverrides.ts
+++ b/apps/api/src/routes/v1_ratelimits_listOverrides.ts
@@ -74,7 +74,7 @@ export const registerV1RatelimitListOverrides = (app: App) =>
app.openapi(route, async (c) => {
const { namespaceId, namespaceName, limit, cursor } = c.req.valid("query");
const { db } = c.get("services");
- if (!namespaceId && !namespaceName) {
+ if (!(namespaceId || namespaceName)) {
throw new UnkeyApiError({
code: "BAD_REQUEST",
message: "You must provide a namespaceId or a namespaceName",
diff --git a/apps/api/src/routes/v1_ratelimits_setOverride.ts b/apps/api/src/routes/v1_ratelimits_setOverride.ts
index 1073d31087..0b58fc523c 100644
--- a/apps/api/src/routes/v1_ratelimits_setOverride.ts
+++ b/apps/api/src/routes/v1_ratelimits_setOverride.ts
@@ -81,7 +81,7 @@ export type V1RatelimitSetOverrideResponse = z.infer<
export const registerV1RatelimitSetOverride = (app: App) =>
app.openapi(route, async (c) => {
const req = c.req.valid("json");
- if (!req.namespaceId && !req.namespaceName) {
+ if (!(req.namespaceId || req.namespaceName)) {
throw new UnkeyApiError({
code: "BAD_REQUEST",
message: "You must provide a namespaceId or a namespaceName",
diff --git a/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/components/expiration-setup.tsx b/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/components/expiration-setup.tsx
index fb79d6ddba..dfdfc5b190 100644
--- a/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/components/expiration-setup.tsx
+++ b/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/components/expiration-setup.tsx
@@ -123,8 +123,7 @@ export const ExpirationSetup = () => {
// Calculate date for showing warning about close expiry (less than 1 hour)
const isExpiringVerySoon =
- currentExpiryDate &&
- new Date(currentExpiryDate).getTime() - new Date().getTime() < 60 * 60 * 1000;
+ currentExpiryDate && new Date(currentExpiryDate).getTime() - Date.now() < 60 * 60 * 1000;
const getExpiryDescription = () => {
if (isExpiringVerySoon) {
diff --git a/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/components/metadata-setup.tsx b/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/components/metadata-setup.tsx
index 72ce2f2194..cac62562d5 100644
--- a/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/components/metadata-setup.tsx
+++ b/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/components/metadata-setup.tsx
@@ -100,7 +100,7 @@ export const MetadataSetup = () => {
rows={15}
{...register("metadata.data", {
validate: (value) => {
- if (metadataEnabled && (!value || !validateJSON(value))) {
+ if (metadataEnabled && !(value && validateJSON(value))) {
return "Must be valid JSON";
}
return true;
diff --git a/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/create-key.schema.ts b/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/create-key.schema.ts
index 3dcf53cb0d..40af92373b 100644
--- a/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/create-key.schema.ts
+++ b/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/create-key.schema.ts
@@ -209,7 +209,7 @@ export const expirationValidationSchema = z.object({
})
.refine(
(date) => {
- const minDate = new Date(new Date().getTime() + 2 * 60000);
+ const minDate = new Date(Date.now() + 2 * 60000);
return date >= minDate;
},
{
diff --git a/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/create-key.utils.ts b/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/create-key.utils.ts
index 945cd2e729..81e40954f2 100644
--- a/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/create-key.utils.ts
+++ b/apps/dashboard/app/(app)/apis/[apiId]/_components/create-key/create-key.utils.ts
@@ -48,13 +48,13 @@ export const formValuesToApiInput = (formValues: FormValues, keyAuthId: string):
export const isFeatureEnabled = (sectionId: SectionName, values: FormValues): boolean => {
switch (sectionId) {
case "metadata":
- return values.metadata?.enabled || false;
+ return values.metadata?.enabled;
case "ratelimit":
- return values.ratelimit?.enabled || false;
+ return values.ratelimit?.enabled;
case "credits":
- return values.limit?.enabled || false;
+ return values.limit?.enabled;
case "expiration":
- return values.expiration?.enabled || false;
+ return values.expiration?.enabled;
case "general":
return true;
default:
diff --git a/apps/dashboard/app/(app)/apis/[apiId]/_overview/components/controls/components/logs-datetime/index.tsx b/apps/dashboard/app/(app)/apis/[apiId]/_overview/components/controls/components/logs-datetime/index.tsx
index 37028a61a8..cc2df6c9ed 100644
--- a/apps/dashboard/app/(app)/apis/[apiId]/_overview/components/controls/components/logs-datetime/index.tsx
+++ b/apps/dashboard/app/(app)/apis/[apiId]/_overview/components/controls/components/logs-datetime/index.tsx
@@ -67,9 +67,7 @@ export const LogsDateTime = () => {
}}
initialTitle={title ?? ""}
onSuggestionChange={setTitle}
- customOptions={DEFAULT_OPTIONS.filter(
- (option) => !option.value || !option.value.endsWith("m"),
- )}
+ customOptions={DEFAULT_OPTIONS.filter((option) => !option.value?.endsWith("m"))}
>