diff --git a/packages/backend/src/apps/postgresql/auth/index.ts b/packages/backend/src/apps/postgresql/auth/index.ts index 71d73e71..2df0425e 100644 --- a/packages/backend/src/apps/postgresql/auth/index.ts +++ b/packages/backend/src/apps/postgresql/auth/index.ts @@ -23,6 +23,7 @@ export default { readOnly: false, value: '127.0.0.1', placeholder: null, + description: 'The host of the PostgreSQL database.', clickToCopy: false, }, { @@ -33,16 +34,39 @@ export default { readOnly: false, value: '5432', placeholder: null, + description: 'The port of the PostgreSQL database.', clickToCopy: false, }, + { + key: 'enableSsl', + label: 'Enable SSL', + type: 'dropdown' as const, + required: true, + readOnly: false, + value: 'false', + description: 'The port of the PostgreSQL database.', + variables: false, + clickToCopy: false, + options: [ + { + label: 'True', + value: 'true', + }, + { + label: 'False', + value: 'false', + }, + ], + }, { key: 'database', - label: 'Database Name', + label: 'Database name', type: 'string' as const, required: true, readOnly: false, value: null, placeholder: null, + description: 'The database name of the PostgreSQL database.', clickToCopy: false, }, { @@ -53,8 +77,7 @@ export default { readOnly: false, value: null, placeholder: null, - description: - 'The user who has access on postgres database.', + description: 'The user who has access on postgres database.', clickToCopy: false, }, { @@ -65,11 +88,11 @@ export default { readOnly: false, value: null, placeholder: null, + description: 'The password of the PostgreSQL database user.', clickToCopy: false, }, - ], verifyCredentials, - isStillVerified + isStillVerified, }; diff --git a/packages/backend/src/apps/postgresql/auth/verify-credentials.ts b/packages/backend/src/apps/postgresql/auth/verify-credentials.ts index 58a5eea5..edccad88 100644 --- a/packages/backend/src/apps/postgresql/auth/verify-credentials.ts +++ b/packages/backend/src/apps/postgresql/auth/verify-credentials.ts @@ -14,9 +14,11 @@ const verifyCredentials = async ($: IGlobalVariable) => { version: $.auth.data.version, host: $.auth.data.host, port: Number($.auth.data.port), + enableSsl: + $.auth.data.enableSsl === 'true' || $.auth.data.enableSsl === true, user: $.auth.data.user, password: $.auth.data.password, - database: $.auth.data.database + database: $.auth.data.database, }); }; diff --git a/packages/backend/src/apps/postgresql/common/postgres-client.ts b/packages/backend/src/apps/postgresql/common/postgres-client.ts index ca5ef0f6..40cf06b3 100644 --- a/packages/backend/src/apps/postgresql/common/postgres-client.ts +++ b/packages/backend/src/apps/postgresql/common/postgres-client.ts @@ -8,11 +8,13 @@ const getClient = ($: IGlobalVariable): Knex => { connection: { host: $.auth.data.host as string, port: Number($.auth.data.port), + ssl: ($.auth.data.enableSsl === 'true' || + $.auth.data.enableSsl === true) as boolean, user: $.auth.data.user as string, password: $.auth.data.password as string, database: $.auth.data.database as string, - } - }) + }, + }); return client; };