Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FIX (password): Trim db password at the moment of save and test connection instead right on the moment of input

Rostislav Dugin756c6c87af5b
diff --git a/frontend/src/features/databases/ui/edit/EditMariaDbSpecificDataComponent.tsx b/frontend/src/features/databases/ui/edit/EditMariaDbSpecificDataComponent.tsx
index f4a30e3e..257bd793 100644
--- a/frontend/src/features/databases/ui/edit/EditMariaDbSpecificDataComponent.tsx
+++ b/frontend/src/features/databases/ui/edit/EditMariaDbSpecificDataComponent.tsx
@@ -86,12 +86,20 @@ export const EditMariaDbSpecificDataComponent = ({
};
const testConnection = async () => {
- if (!editingDatabase) return;
+ if (!editingDatabase?.mariadb) return;
setIsTestingConnection(true);
setIsConnectionFailed(false);
+ const trimmedDatabase = {
+ ...editingDatabase,
+ mariadb: {
+ ...editingDatabase.mariadb,
+ password: editingDatabase.mariadb.password?.trim(),
+ },
+ };
+
try {
- await databaseApi.testDatabaseConnectionDirect(editingDatabase);
+ await databaseApi.testDatabaseConnectionDirect(trimmedDatabase);
setIsConnectionTested(true);
ToastHelper.showToast({
title: 'Connection test passed',
@@ -106,13 +114,21 @@ export const EditMariaDbSpecificDataComponent = ({
};
const saveDatabase = async () => {
- if (!editingDatabase) return;
+ if (!editingDatabase?.mariadb) return;
+
+ const trimmedDatabase = {
+ ...editingDatabase,
+ mariadb: {
+ ...editingDatabase.mariadb,
+ password: editingDatabase.mariadb.password?.trim(),
+ },
+ };
if (isSaveToApi) {
setIsSaving(true);
try {
- await databaseApi.updateDatabase(editingDatabase);
+ await databaseApi.updateDatabase(trimmedDatabase);
} catch (e) {
alert((e as Error).message);
}
@@ -120,7 +136,7 @@ export const EditMariaDbSpecificDataComponent = ({
setIsSaving(false);
}
- onSaved(editingDatabase);
+ onSaved(trimmedDatabase);
};
useEffect(() => {
@@ -246,7 +262,7 @@ export const EditMariaDbSpecificDataComponent = ({
setEditingDatabase({
...editingDatabase,
- mariadb: { ...editingDatabase.mariadb, password: e.target.value.trim() },
+ mariadb: { ...editingDatabase.mariadb, password: e.target.value },
});
setIsConnectionTested(false);
}}
diff --git a/frontend/src/features/databases/ui/edit/EditMongoDbSpecificDataComponent.tsx b/frontend/src/features/databases/ui/edit/EditMongoDbSpecificDataComponent.tsx
index 6544a452..deb2bd50 100644
--- a/frontend/src/features/databases/ui/edit/EditMongoDbSpecificDataComponent.tsx
+++ b/frontend/src/features/databases/ui/edit/EditMongoDbSpecificDataComponent.tsx
@@ -91,12 +91,20 @@ export const EditMongoDbSpecificDataComponent = ({
};
const testConnection = async () => {
- if (!editingDatabase) return;
+ if (!editingDatabase?.mongodb) return;
setIsTestingConnection(true);
setIsConnectionFailed(false);
+ const trimmedDatabase = {
+ ...editingDatabase,
+ mongodb: {
+ ...editingDatabase.mongodb,
+ password: editingDatabase.mongodb.password?.trim(),
+ },
+ };
+
try {
- await databaseApi.testDatabaseConnectionDirect(editingDatabase);
+ await databaseApi.testDatabaseConnectionDirect(trimmedDatabase);
setIsConnectionTested(true);
ToastHelper.showToast({
title: 'Connection test passed',
@@ -111,13 +119,21 @@ export const EditMongoDbSpecificDataComponent = ({
};
const saveDatabase = async () => {
- if (!editingDatabase) return;
+ if (!editingDatabase?.mongodb) return;
+
+ const trimmedDatabase = {
+ ...editingDatabase,
+ mongodb: {
+ ...editingDatabase.mongodb,
+ password: editingDatabase.mongodb.password?.trim(),
+ },
+ };
if (isSaveToApi) {
setIsSaving(true);
try {
- await databaseApi.updateDatabase(editingDatabase);
+ await databaseApi.updateDatabase(trimmedDatabase);
} catch (e) {
alert((e as Error).message);
}
@@ -125,7 +141,7 @@ export const EditMongoDbSpecificDataComponent = ({
setIsSaving(false);
}
- onSaved(editingDatabase);
+ onSaved(trimmedDatabase);
};
useEffect(() => {
@@ -251,7 +267,7 @@ export const EditMongoDbSpecificDataComponent = ({
setEditingDatabase({
...editingDatabase,
- mongodb: { ...editingDatabase.mongodb, password: e.target.value.trim() },
+ mongodb: { ...editingDatabase.mongodb, password: e.target.value },
});
setIsConnectionTested(false);
}}
diff --git a/frontend/src/features/databases/ui/edit/EditMySqlSpecificDataComponent.tsx b/frontend/src/features/databases/ui/edit/EditMySqlSpecificDataComponent.tsx
index 00c3ece1..88b0cd87 100644
--- a/frontend/src/features/databases/ui/edit/EditMySqlSpecificDataComponent.tsx
+++ b/frontend/src/features/databases/ui/edit/EditMySqlSpecificDataComponent.tsx
@@ -86,12 +86,20 @@ export const EditMySqlSpecificDataComponent = ({
};
const testConnection = async () => {
- if (!editingDatabase) return;
+ if (!editingDatabase?.mysql) return;
setIsTestingConnection(true);
setIsConnectionFailed(false);
+ const trimmedDatabase = {
+ ...editingDatabase,
+ mysql: {
+ ...editingDatabase.mysql,
+ password: editingDatabase.mysql.password?.trim(),
+ },
+ };
+
try {
- await databaseApi.testDatabaseConnectionDirect(editingDatabase);
+ await databaseApi.testDatabaseConnectionDirect(trimmedDatabase);
setIsConnectionTested(true);
ToastHelper.showToast({
title: 'Connection test passed',
@@ -106,13 +114,21 @@ export const EditMySqlSpecificDataComponent = ({
};
const saveDatabase = async () => {
- if (!editingDatabase) return;
+ if (!editingDatabase?.mysql) return;
+
+ const trimmedDatabase = {
+ ...editingDatabase,
+ mysql: {
+ ...editingDatabase.mysql,
+ password: editingDatabase.mysql.password?.trim(),
+ },
+ };
if (isSaveToApi) {
setIsSaving(true);
try {
- await databaseApi.updateDatabase(editingDatabase);
+ await databaseApi.updateDatabase(trimmedDatabase);
} catch (e) {
alert((e as Error).message);
}
@@ -120,7 +136,7 @@ export const EditMySqlSpecificDataComponent = ({
setIsSaving(false);
}
- onSaved(editingDatabase);
+ onSaved(trimmedDatabase);
};
useEffect(() => {
@@ -246,7 +262,7 @@ export const EditMySqlSpecificDataComponent = ({
setEditingDatabase({
...editingDatabase,
- mysql: { ...editingDatabase.mysql, password: e.target.value.trim() },
+ mysql: { ...editingDatabase.mysql, password: e.target.value },
});
setIsConnectionTested(false);
}}
diff --git a/frontend/src/features/databases/ui/edit/EditPostgreSqlSpecificDataComponent.tsx b/frontend/src/features/databases/ui/edit/EditPostgreSqlSpecificDataComponent.tsx
index d7bf7e88..02098b9c 100644
--- a/frontend/src/features/databases/ui/edit/EditPostgreSqlSpecificDataComponent.tsx
+++ b/frontend/src/features/databases/ui/edit/EditPostgreSqlSpecificDataComponent.tsx
@@ -120,12 +120,20 @@ export const EditPostgreSqlSpecificDataComponent = ({
};
const testConnection = async () => {
- if (!editingDatabase) return;
+ if (!editingDatabase?.postgresql) return;
setIsTestingConnection(true);
setIsConnectionFailed(false);
+ const trimmedDatabase = {
+ ...editingDatabase,
+ postgresql: {
+ ...editingDatabase.postgresql,
+ password: editingDatabase.postgresql.password?.trim(),
+ },
+ };
+
try {
- await databaseApi.testDatabaseConnectionDirect(editingDatabase);
+ await databaseApi.testDatabaseConnectionDirect(trimmedDatabase);
setIsConnectionTested(true);
ToastHelper.showToast({
title: 'Connection test passed',
@@ -140,13 +148,21 @@ export const EditPostgreSqlSpecificDataComponent = ({
};
const saveDatabase = async () => {
- if (!editingDatabase) return;
+ if (!editingDatabase?.postgresql) return;
+
+ const trimmedDatabase = {
+ ...editingDatabase,
+ postgresql: {
+ ...editingDatabase.postgresql,
+ password: editingDatabase.postgresql.password?.trim(),
+ },
+ };
if (isSaveToApi) {
setIsSaving(true);
try {
- await databaseApi.updateDatabase(editingDatabase);
+ await databaseApi.updateDatabase(trimmedDatabase);
} catch (e) {
alert((e as Error).message);
}
@@ -154,7 +170,7 @@ export const EditPostgreSqlSpecificDataComponent = ({
setIsSaving(false);
}
- onSaved(editingDatabase);
+ onSaved(trimmedDatabase);
};
useEffect(() => {
@@ -304,7 +320,7 @@ export const EditPostgreSqlSpecificDataComponent = ({
setEditingDatabase({
...editingDatabase,
- postgresql: { ...editingDatabase.postgresql, password: e.target.value.trim() },
+ postgresql: { ...editingDatabase.postgresql, password: e.target.value },
});
setIsConnectionTested(false);
}}