gsadmin/DynamoDNS
1
0
Fork 0
mirror of https://github.com/freedbygrace/DynamoDNS.git synced 2026-07-26 11:38:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix API token creation date/time handling

Browse Source 
Replit-Commit-Author: Agent
Replit-Commit-Session-Id: 9111ef36-26c8-4085-84ca-a35dc1fec1b5
Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/7083d608-d6d3-4a6a-9a27-6286c5109627/96d81055-fe81-465a-89ec-1c16537bde7f.jpg
This commit is contained in:
alphaeusmote
2025-04-11 17:36:30 +00:00
parent eb56bf8120 0224ef0c8c
commit f8e78797fb
2 changed files with 70 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/pages/api-tokens.tsx
+20 -56
View File
@@ -126,72 +126,36 @@ export default function ApiTokensPage() {
// Add token mutation
const addTokenMutation = useMutation({
mutationFn: async (data: z.infer<typeof tokenFormSchema>) => {
const tokenData: Partial<any> = {
// Instead of using expiresAt directly, send the form data and let the server handle it
const tokenData: any = {
name: data.name,
organizationId: currentOrganization?.id || "",
organizationId: currentOrganization?.id || "1",
role: data.role,
isActive: true,
expiresIn: data.expiresIn || 'never',
};
// Calculate expiration date based on selection
if (data.expiresIn && data.expiresIn !== 'never') {
const now = new Date();
if (data.expiresIn === 'custom' && data.customDate) {
// For custom date/time
if (data.customDate) {
const customDate = new Date(data.customDate);
// If time was selected, add it to the date
if (data.customTime) {
const [hours, minutes] = data.customTime.split(':').map(Number);
// Check if hours and minutes are valid numbers
if (!isNaN(hours) && !isNaN(minutes)) {
customDate.setHours(hours, minutes, 0, 0);
} else {
// Default to end of day if time format is invalid
customDate.setHours(23, 59, 59, 999);
}
} else {
// Default to end of day if no time selected
customDate.setHours(23, 59, 59, 999);
}
// Server expects ISO string for dates, not JavaScript Date objects
tokenData.expiresAt = customDate.toISOString();
}
} else {
// For preset expiration options
let expiresAt: Date;
// Add custom date and time fields if present
if (data.expiresIn === 'custom') {
// For custom date/time, pass as separate fields for the server to process
if (data.customDate) {
// Format the date as YYYY-MM-DD for the server
tokenData.customDate = format(data.customDate, 'yyyy-MM-dd');
console.log("Sending customDate:", tokenData.customDate);
switch (data.expiresIn) {
case '1hour':
expiresAt = new Date(now.getTime() + 60 * 60 * 1000);
break;
case '1day':
expiresAt = new Date(now.getTime() + 24 * 60 * 60 * 1000);
break;
case '7days':
expiresAt = new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000);
break;
case '30days':
expiresAt = new Date(now.getTime() + 30 * 24 * 60 * 60 * 1000);
break;
case '90days':
expiresAt = new Date(now.getTime() + 90 * 24 * 60 * 60 * 1000);
break;
case '1year':
expiresAt = new Date(now.getTime() + 365 * 24 * 60 * 60 * 1000);
break;
default:
expiresAt = new Date(now.getTime() + 30 * 24 * 60 * 60 * 1000);
// Add custom time if present
if (data.customTime) {
tokenData.customTime = data.customTime;
console.log("Sending customTime:", data.customTime);
} else {
// Default to end of day if no time
tokenData.customTime = "23:59";
console.log("Using default end of day time");
}
// Server expects ISO string for dates, not JavaScript Date objects
tokenData.expiresAt = expiresAt.toISOString();
}
}
console.log("Sending token data to server:", tokenData);
const res = await apiRequest("POST", "/api/api-tokens", tokenData);
return await res.json();
},
server/routes.ts
+50 -25
View File
@@ -988,44 +988,67 @@ export async function registerRoutes(app: Express): Promise<Server> {
permissions: [] // Will be populated in storage.ts
};
// Handle expiration date
if (req.body.expiresIn && req.body.expiresIn !== 'never') {
// Handle expiration date based on the expiresIn parameter
const expiresIn = req.body.expiresIn || 'never';
if (expiresIn !== 'never') {
const now = new Date();
if (req.body.expiresIn === 'custom' && req.body.customDate) {
if (expiresIn === 'custom') {
try {
console.log("Custom date received:", req.body.customDate);
console.log("Custom time received:", req.body.customTime || "none");
// Create date from input
const customDate = new Date(req.body.customDate);
console.log("Parsed customDate:", customDate);
// If time was selected, add it to the date
if (req.body.customTime) {
const [hours, minutes] = req.body.customTime.split(':').map(Number);
if (!isNaN(hours) && !isNaN(minutes)) {
customDate.setHours(hours, minutes, 0, 0);
console.log(`Setting time to ${hours}:${minutes}`);
if (req.body.customDate) {
console.log("Custom date received:", req.body.customDate);
// Parse date (format is YYYY-MM-DD from client)
const [year, month, day] = req.body.customDate.split('-').map(Number);
if (isNaN(year) || isNaN(month) || isNaN(day)) {
throw new Error("Invalid date format. Expected YYYY-MM-DD");
}
// Create date (months are 0-indexed in JS Date)
const customDate = new Date(year, month - 1, day);
console.log("Parsed customDate:", customDate);
// Add time if specified
if (req.body.customTime) {
console.log("Custom time received:", req.body.customTime);
const [hours, minutes] = req.body.customTime.split(':').map(Number);
if (!isNaN(hours) && !isNaN(minutes)) {
customDate.setHours(hours, minutes, 0, 0);
console.log(`Setting time to ${hours}:${minutes}`);
} else {
customDate.setHours(23, 59, 59, 999);
console.log("Invalid time format, setting to end of day");
}
} else {
customDate.setHours(23, 59, 59, 999);
console.log("Invalid time format, setting to end of day");
console.log("No time specified, setting to end of day");
}
// Validate the date is in the future
if (customDate < now) {
throw new Error("Expiration date must be in the future");
}
tokenData.expiresAt = customDate;
console.log("Final custom expiration date:", customDate.toISOString());
} else {
customDate.setHours(23, 59, 59, 999);
console.log("No time specified, setting to end of day");
throw new Error("Custom date is required for custom expiration");
}
tokenData.expiresAt = customDate;
console.log("Final custom expiration date:", customDate);
} catch (e) {
console.error("Error parsing custom date:", e);
return res.status(400).json({
message: "Invalid custom date or time",
details: e instanceof Error ? e.message : String(e)
});
}
} else {
// For preset expiration options
let expirationDate: Date | null = null;
switch (req.body.expiresIn) {
switch (expiresIn) {
case '1hour':
expirationDate = new Date(now.getTime() + 60 * 60 * 1000);
break;
@@ -1044,11 +1067,13 @@ export async function registerRoutes(app: Express): Promise<Server> {
case '1year':
expirationDate = new Date(now.getTime() + 365 * 24 * 60 * 60 * 1000);
break;
default:
console.log(`Unrecognized expiresIn value: ${expiresIn}, defaulting to no expiration`);
}
if (expirationDate) {
tokenData.expiresAt = expirationDate;
console.log(`Setting expiration to ${req.body.expiresIn}:`, expirationDate);
console.log(`Setting expiration to ${expiresIn}:`, expirationDate.toISOString());
}
}
} else {
@@ -1066,7 +1091,7 @@ export async function registerRoutes(app: Express): Promise<Server> {
} catch (error) {
console.error("Error creating API token:", error);
// Return detailed error to help debugging
res.status(500).json({
res.status(400).json({
message: "Error creating token",
error: error instanceof Error ? error.message : String(error),
stack: error instanceof Error ? error.stack : undefined