From a2d77a39170be9067bf525714013cbdeda669b68 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Wed, 3 Sep 2025 16:22:02 +0200 Subject: [PATCH] removed upload error to Gist feature --- .github/workflows/build-npm.yaml | 5 - app/src/mainMenuDefinition.js | 1 - packages/api/src/controllers/uploads.js | 163 +++++++----------- packages/api/src/gistSecret.js | 1 - packages/web/src/commands/stdCommands.ts | 7 - .../web/src/modals/UploadErrorModal.svelte | 66 ------- printSecrets.js | 7 - workflow-templates/build-app.tpl.yaml | 6 - workflow-templates/build-cloud-pro.yaml | 8 - workflow-templates/build-docker.tpl.yaml | 6 - workflow-templates/build-npm-pro.yaml | 7 - workflow-templates/build-npm.yaml | 6 - 12 files changed, 67 insertions(+), 216 deletions(-) delete mode 100644 packages/api/src/gistSecret.js delete mode 100644 packages/web/src/modals/UploadErrorModal.svelte delete mode 100644 printSecrets.js diff --git a/.github/workflows/build-npm.yaml b/.github/workflows/build-npm.yaml index c20a26cff..9b815cea7 100644 --- a/.github/workflows/build-npm.yaml +++ b/.github/workflows/build-npm.yaml @@ -37,11 +37,6 @@ jobs: - name: setCurrentVersion run: | yarn setCurrentVersion - - name: printSecrets - run: | - yarn printSecrets - env: - GIST_UPLOAD_SECRET: ${{secrets.GIST_UPLOAD_SECRET}} - name: Publish types working-directory: packages/types run: | diff --git a/app/src/mainMenuDefinition.js b/app/src/mainMenuDefinition.js index c463af4bf..16b44cf54 100644 --- a/app/src/mainMenuDefinition.js +++ b/app/src/mainMenuDefinition.js @@ -86,7 +86,6 @@ module.exports = ({ editMenu, isMac }) => [ { divider: true }, { command: 'folder.showLogs', hideDisabled: true }, { command: 'folder.showData', hideDisabled: true }, - { command: 'new.gist', hideDisabled: true }, { command: 'app.resetSettings', hideDisabled: true }, { divider: true }, { command: 'app.exportConnections', hideDisabled: true }, diff --git a/packages/api/src/controllers/uploads.js b/packages/api/src/controllers/uploads.js index b467d7810..6f06e5291 100644 --- a/packages/api/src/controllers/uploads.js +++ b/packages/api/src/controllers/uploads.js @@ -1,19 +1,8 @@ const crypto = require('crypto'); const path = require('path'); -const { uploadsdir, getLogsFilePath, filesdir } = require('../utility/directories'); -const { getLogger, extractErrorLogData } = require('dbgate-tools'); +const { uploadsdir } = require('../utility/directories'); +const { getLogger } = require('dbgate-tools'); const logger = getLogger('uploads'); -const axios = require('axios'); -const os = require('os'); -const fs = require('fs/promises'); -const { read } = require('./queryHistory'); -const platformInfo = require('../utility/platformInfo'); -const _ = require('lodash'); -const serverConnections = require('./serverConnections'); -const config = require('./config'); -const gistSecret = require('../gistSecret'); -const currentVersion = require('../currentVersion'); -const socket = require('../utility/socket'); module.exports = { upload_meta: { @@ -51,88 +40,70 @@ module.exports = { res.sendFile(path.join(uploadsdir(), req.query.file)); }, - async getGistToken() { - const settings = await config.getSettings(); +// uploadErrorToGist_meta: true, +// async uploadErrorToGist() { +// const logs = await fs.readFile(getLogsFilePath(), { encoding: 'utf-8' }); +// const connections = await serverConnections.getOpenedConnectionReport(); +// try { +// const response = await axios.default.post( +// 'https://api.github.com/gists', +// { +// description: `DbGate ${currentVersion.version} error report`, +// public: false, +// files: { +// 'logs.jsonl': { +// content: logs, +// }, +// 'os.json': { +// content: JSON.stringify( +// { +// release: os.release(), +// arch: os.arch(), +// machine: os.machine(), +// platform: os.platform(), +// type: os.type(), +// }, +// null, +// 2 +// ), +// }, +// 'platform.json': { +// content: JSON.stringify( +// _.omit( +// { +// ...platformInfo, +// }, +// ['defaultKeyfile', 'sshAuthSock'] +// ), +// null, +// 2 +// ), +// }, +// 'connections.json': { +// content: JSON.stringify(connections, null, 2), +// }, +// 'version.json': { +// content: JSON.stringify(currentVersion, null, 2), +// }, +// }, +// }, +// { +// headers: { +// Authorization: `token ${await this.getGistToken()}`, +// 'Content-Type': 'application/json', +// Accept: 'application/vnd.github.v3+json', +// }, +// } +// ); - return settings['other.gistCreateToken'] || gistSecret; - }, +// return response.data; +// } catch (err) { +// logger.error(extractErrorLogData(err), 'DBGM-00148 Error uploading gist'); - uploadErrorToGist_meta: true, - async uploadErrorToGist() { - const logs = await fs.readFile(getLogsFilePath(), { encoding: 'utf-8' }); - const connections = await serverConnections.getOpenedConnectionReport(); - try { - const response = await axios.default.post( - 'https://api.github.com/gists', - { - description: `DbGate ${currentVersion.version} error report`, - public: false, - files: { - 'logs.jsonl': { - content: logs, - }, - 'os.json': { - content: JSON.stringify( - { - release: os.release(), - arch: os.arch(), - machine: os.machine(), - platform: os.platform(), - type: os.type(), - }, - null, - 2 - ), - }, - 'platform.json': { - content: JSON.stringify( - _.omit( - { - ...platformInfo, - }, - ['defaultKeyfile', 'sshAuthSock'] - ), - null, - 2 - ), - }, - 'connections.json': { - content: JSON.stringify(connections, null, 2), - }, - 'version.json': { - content: JSON.stringify(currentVersion, null, 2), - }, - }, - }, - { - headers: { - Authorization: `token ${await this.getGistToken()}`, - 'Content-Type': 'application/json', - Accept: 'application/vnd.github.v3+json', - }, - } - ); - - return response.data; - } catch (err) { - logger.error(extractErrorLogData(err), 'DBGM-00148 Error uploading gist'); - - return { - apiErrorMessage: err.message, - }; - // console.error('Error creating gist:', error.response ? error.response.data : error.message); - } - }, - - deleteGist_meta: true, - async deleteGist({ url }) { - const response = await axios.default.delete(url, { - headers: { - Authorization: `token ${await this.getGistToken()}`, - 'Content-Type': 'application/json', - Accept: 'application/vnd.github.v3+json', - }, - }); - return true; - }, -}; +// return { +// apiErrorMessage: err.message, +// }; +// // console.error('Error creating gist:', error.response ? error.response.data : error.message); +// } +// }, +// }; diff --git a/packages/api/src/gistSecret.js b/packages/api/src/gistSecret.js deleted file mode 100644 index 2b1442e4e..000000000 --- a/packages/api/src/gistSecret.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = process.env.GIST_UPLOAD_SECRET; diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts index d41a437f7..e0470b9aa 100644 --- a/packages/web/src/commands/stdCommands.ts +++ b/packages/web/src/commands/stdCommands.ts @@ -1137,13 +1137,6 @@ registerCommand({ onClick: () => getElectron().send('window-action', 'selectAll'), }); -registerCommand({ - id: 'new.gist', - category: 'New', - name: 'Upload error to gist', - onClick: () => showModal(UploadErrorModal), -}); - registerCommand({ id: 'app.unsetCurrentDatabase', category: 'Application', diff --git a/packages/web/src/modals/UploadErrorModal.svelte b/packages/web/src/modals/UploadErrorModal.svelte deleted file mode 100644 index 72bf26114..000000000 --- a/packages/web/src/modals/UploadErrorModal.svelte +++ /dev/null @@ -1,66 +0,0 @@ - - - - Upload error - - {#if htmlUrl} -
-

- Upload error to gist was successful. Please copy gist URL abnd paste it to related github issue. You could check - uploaded data, if don't want to make them public, use Delete button to remove them from gist. -

-

Open uploaded data

-
- {:else if errorMessage} - - {:else} - - {/if} - - - - - - - diff --git a/printSecrets.js b/printSecrets.js deleted file mode 100644 index 5acc6efbe..000000000 --- a/printSecrets.js +++ /dev/null @@ -1,7 +0,0 @@ -const fs = require('fs'); - -const text = ` -module.exports = '${process.env.GIST_UPLOAD_SECRET}'; -`; - -fs.writeFileSync('packages/api/src/gistSecret.js', text); diff --git a/workflow-templates/build-app.tpl.yaml b/workflow-templates/build-app.tpl.yaml index 0fea7ccd5..bfdd0bb55 100644 --- a/workflow-templates/build-app.tpl.yaml +++ b/workflow-templates/build-app.tpl.yaml @@ -137,12 +137,6 @@ jobs: run: | <> yarn setCurrentVersion - - name: printSecrets - run: | - <> - yarn printSecrets - env: - GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}} - name: fillPackagedPlugins run: | <> diff --git a/workflow-templates/build-cloud-pro.yaml b/workflow-templates/build-cloud-pro.yaml index 9ae169a60..bbbdd0c2d 100644 --- a/workflow-templates/build-cloud-pro.yaml +++ b/workflow-templates/build-cloud-pro.yaml @@ -59,14 +59,6 @@ jobs: cd dbgate-merged yarn setCurrentVersion - - name: printSecrets - run: | - cd .. - cd dbgate-merged - yarn printSecrets - env: - GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}} - - name: Prepare packer build run: | cd .. diff --git a/workflow-templates/build-docker.tpl.yaml b/workflow-templates/build-docker.tpl.yaml index 697ab05cc..4a8576a80 100644 --- a/workflow-templates/build-docker.tpl.yaml +++ b/workflow-templates/build-docker.tpl.yaml @@ -95,12 +95,6 @@ jobs: <> yarn setCurrentVersion - - name: printSecrets - run: | - <> - yarn printSecrets - env: - GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}} - name: Prepare docker image run: | <> diff --git a/workflow-templates/build-npm-pro.yaml b/workflow-templates/build-npm-pro.yaml index 725b9356f..09110cd31 100644 --- a/workflow-templates/build-npm-pro.yaml +++ b/workflow-templates/build-npm-pro.yaml @@ -69,13 +69,6 @@ jobs: cd dbgate-merged yarn setCurrentVersion - - name: printSecrets - run: | - cd .. - cd dbgate-merged - yarn printSecrets - env: - GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}} - name: Publish dbgate-api-premium run: | diff --git a/workflow-templates/build-npm.yaml b/workflow-templates/build-npm.yaml index c539bf06c..a2f74f558 100644 --- a/workflow-templates/build-npm.yaml +++ b/workflow-templates/build-npm.yaml @@ -49,12 +49,6 @@ jobs: run: | yarn setCurrentVersion - - name: printSecrets - run: | - yarn printSecrets - env: - GIST_UPLOAD_SECRET : ${{secrets.GIST_UPLOAD_SECRET}} - - name: Publish types working-directory: packages/types run: |