From 8d167871dab0f13e959752ec5fe8b298aa949202 Mon Sep 17 00:00:00 2001
From: Flawid DSouza <me@flawiddsouza.com>
Date: Tue, 15 Oct 2024 16:09:16 +0530
Subject: [PATCH] fix(ui+electron): OAuth2 > disableSSLVerification flag is not
 respected by oauth 2 requests (fixes #283)

---
 packages/electron/package-lock.json           | 15 +++++++-------
 packages/electron/package.json                |  8 ++++----
 packages/ui/{.eslintrc.js => .eslintrc.cjs}   |  0
 packages/ui/src/components/FolderPanel.vue    | 16 +++++++++++++--
 packages/ui/src/components/RequestPanel.vue   |  4 ++++
 .../ui/src/components/RequestPanelAuth.vue    | 16 +++++++++------
 packages/ui/src/global.d.ts                   | 20 ++++++++++---------
 7 files changed, 51 insertions(+), 28 deletions(-)
 rename packages/ui/{.eslintrc.js => .eslintrc.cjs} (100%)

diff --git a/packages/electron/package-lock.json b/packages/electron/package-lock.json
index 1974fff1..64e76e95 100644
--- a/packages/electron/package-lock.json
+++ b/packages/electron/package-lock.json
@@ -17,7 +17,7 @@
                 "jsonfile": "^4.0.0",
                 "mkdirp": "^0.5.1",
                 "open": "^10.1.0",
-                "undici": "^6.19.2",
+                "undici": "^6.20.1",
                 "update-electron-app": "^2.0.1"
             },
             "devDependencies": {
@@ -10629,9 +10629,10 @@
             "dev": true
         },
         "node_modules/undici": {
-            "version": "6.19.2",
-            "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.2.tgz",
-            "integrity": "sha512-JfjKqIauur3Q6biAtHJ564e3bWa8VvT+7cSiOJHFbX4Erv6CLGDpg8z+Fmg/1OI/47RA+GI2QZaF48SSaLvyBA==",
+            "version": "6.20.1",
+            "resolved": "https://registry.npmjs.org/undici/-/undici-6.20.1.tgz",
+            "integrity": "sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA==",
+            "license": "MIT",
             "engines": {
                 "node": ">=18.17"
             }
@@ -19094,9 +19095,9 @@
             "dev": true
         },
         "undici": {
-            "version": "6.19.2",
-            "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.2.tgz",
-            "integrity": "sha512-JfjKqIauur3Q6biAtHJ564e3bWa8VvT+7cSiOJHFbX4Erv6CLGDpg8z+Fmg/1OI/47RA+GI2QZaF48SSaLvyBA=="
+            "version": "6.20.1",
+            "resolved": "https://registry.npmjs.org/undici/-/undici-6.20.1.tgz",
+            "integrity": "sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA=="
         },
         "undici-types": {
             "version": "5.26.5",
diff --git a/packages/electron/package.json b/packages/electron/package.json
index a75c80f5..bc83b047 100644
--- a/packages/electron/package.json
+++ b/packages/electron/package.json
@@ -46,11 +46,11 @@
         "electron-context-menu": "^3.6.1",
         "electron-log": "^5.1.2",
         "electron-squirrel-startup": "^1.0.0",
-        "open": "^10.1.0",
-        "undici": "^6.19.2",
-        "update-electron-app": "^2.0.1",
         "jsonfile": "^4.0.0",
-        "mkdirp": "^0.5.1"
+        "mkdirp": "^0.5.1",
+        "open": "^10.1.0",
+        "undici": "^6.20.1",
+        "update-electron-app": "^2.0.1"
     },
     "config": {
         "forge": "./forge.config.js"
diff --git a/packages/ui/.eslintrc.js b/packages/ui/.eslintrc.cjs
similarity index 100%
rename from packages/ui/.eslintrc.js
rename to packages/ui/.eslintrc.cjs
diff --git a/packages/ui/src/components/FolderPanel.vue b/packages/ui/src/components/FolderPanel.vue
index 1e8c8030..ba9ea916 100644
--- a/packages/ui/src/components/FolderPanel.vue
+++ b/packages/ui/src/components/FolderPanel.vue
@@ -5,7 +5,10 @@
             <div class="request-panel-tabs-context">
                 <div style="font-weight: 500; margin-bottom: var(--label-margin-bottom)">Headers</div>
                 <div>
-                    <RequestPanelHeaders :collection-item="collectionItem" :collection-item-environment-resolved="envVariables"></RequestPanelHeaders>
+                    <RequestPanelHeaders
+                        :collection-item="collectionItem"
+                        :collection-item-environment-resolved="envVariables"
+                    />
                 </div>
                 <InfoTip />
             </div>
@@ -15,7 +18,11 @@
             <div class="request-panel-tabs-context">
                 <div style="font-weight: 500; margin-bottom: var(--label-margin-bottom)">Auth</div>
                 <div>
-                    <RequestPanelAuth :collection-item="collectionItem" :collection-item-environment-resolved="envVariables"></RequestPanelAuth>
+                    <RequestPanelAuth
+                        :collection-item="collectionItem"
+                        :collection-item-environment-resolved="envVariables"
+                        :flags="flags"
+                    />
                 </div>
                 <InfoTip />
             </div>
@@ -56,6 +63,11 @@ export default {
             envVariables: {},
         }
     },
+    computed: {
+        flags() {
+            return this.$store.state.flags
+        },
+    },
     watch: {
         collectionItem: {
             immediate: true,
diff --git a/packages/ui/src/components/RequestPanel.vue b/packages/ui/src/components/RequestPanel.vue
index d1a4eac5..9138ccca 100644
--- a/packages/ui/src/components/RequestPanel.vue
+++ b/packages/ui/src/components/RequestPanel.vue
@@ -360,6 +360,7 @@
                 <RequestPanelAuth
                     :collection-item="activeTab"
                     :collection-item-environment-resolved="collectionItemEnvironmentResolved"
+                    :flags="flags"
                     @tagClick="onTagClick"
                 />
             </template>
@@ -651,6 +652,9 @@ export default {
         collectionItemEnvironmentResolved() {
             return this.$store.state.tabEnvironmentResolved[this.activeTab._id] ?? {}
         },
+        flags() {
+            return this.$store.state.flags
+        },
         scriptPlugin() {
             if(this.activeTab === null) {
                 return undefined
diff --git a/packages/ui/src/components/RequestPanelAuth.vue b/packages/ui/src/components/RequestPanelAuth.vue
index 036420af..2fa7f9ee 100644
--- a/packages/ui/src/components/RequestPanelAuth.vue
+++ b/packages/ui/src/components/RequestPanelAuth.vue
@@ -276,7 +276,7 @@
 <script setup lang="ts">
 import { computed, PropType, ref } from 'vue'
 import CodeMirrorSingleLine from './CodeMirrorSingleLine.vue'
-import { CollectionItem } from '@/global'
+import { CollectionItem, Flags } from '@/global'
 import ContextMenu from '@/components/ContextMenu.vue'
 import constants from '@/constants'
 import { fetchWrapper, substituteEnvironmentVariables } from '@/helpers'
@@ -293,7 +293,11 @@ const props = defineProps({
     collectionItemEnvironmentResolved: {
         type: Object as PropType<any>,
         required: true
-    }
+    },
+    flags: {
+        type: Object as PropType<Flags>,
+        required: true
+    },
 })
 
 const emit = defineEmits(['tagClick'])
@@ -443,8 +447,8 @@ async function requestOAuthToken() {
             }
 
             const response = await fetchWrapper(accessTokenUrl, 'POST', headers, bodyData.toString(), abortController.signal, {
-                electronSwitchToChromiumFetch: false,
-                disableSSLVerification: false,
+                electronSwitchToChromiumFetch: props.flags.electronSwitchToChromiumFetch,
+                disableSSLVerification: props.flags.disableSSLVerification,
             })
 
             if(response.status !== 200) {
@@ -493,8 +497,8 @@ async function refreshOAuthToken() {
                 }
 
                 const response = await fetchWrapper(accessTokenUrl, 'POST', headers, bodyData.toString(), abortController.signal, {
-                    electronSwitchToChromiumFetch: false,
-                    disableSSLVerification: false,
+                    electronSwitchToChromiumFetch: props.flags.electronSwitchToChromiumFetch,
+                    disableSSLVerification: props.flags.disableSSLVerification,
                 })
 
                 if(response.status !== 200) {
diff --git a/packages/ui/src/global.d.ts b/packages/ui/src/global.d.ts
index fd0c65dd..65512db2 100644
--- a/packages/ui/src/global.d.ts
+++ b/packages/ui/src/global.d.ts
@@ -110,6 +110,16 @@ export interface RequestFinalResponse {
     name?: string
 }
 
+export interface Flags {
+    hideBrowserRelatedResponsePanelErrors: boolean
+    browserExtensionEnabled: boolean
+    isBrowser: boolean
+    isWebStandalone: boolean
+    isElectron: boolean
+    disableSSLVerification: boolean
+    electronSwitchToChromiumFetch: boolean
+}
+
 export interface State {
     consoleLogs: string[]
     collection: CollectionItem[]
@@ -139,15 +149,7 @@ export interface State {
     theme: string
     githubStarCount: string
     sidebarItemTemporaryName: { [key: string]: string }
-    flags: {
-        hideBrowserRelatedResponsePanelErrors: boolean
-        browserExtensionEnabled: boolean
-        isBrowser: boolean
-        isWebStandalone: boolean
-        isElectron: boolean
-        disableSSLVerification: boolean
-        electronSwitchToChromiumFetch: boolean
-    }
+    flags: Flags
     openContextMenuElement: HTMLElement | null
     sockets: { [key: string]: WebSocket | null }
     tabEnvironmentResolved: any