Compare commits
6 Commits
release/20
...
2023.12.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
faab1d20fd | ||
|
|
bd406616ec | ||
|
|
6827e97ec5 | ||
|
|
10d2048975 | ||
|
|
291f18591e | ||
|
|
342532c9b1 |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "hoppscotch-backend",
|
"name": "hoppscotch-backend",
|
||||||
"version": "2023.12.5",
|
"version": "2023.12.6",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export class MailerService {
|
|||||||
): string {
|
): string {
|
||||||
switch (mailDesc.template) {
|
switch (mailDesc.template) {
|
||||||
case 'team-invitation':
|
case 'team-invitation':
|
||||||
return `${mailDesc.variables.invitee} invited you to join ${mailDesc.variables.invite_team_name} in Hoppscotch`;
|
return `A user has invited you to join a team workspace in Hoppscotch`;
|
||||||
|
|
||||||
case 'user-invitation':
|
case 'user-invitation':
|
||||||
return 'Sign in to Hoppscotch';
|
return 'Sign in to Hoppscotch';
|
||||||
|
|||||||
@@ -27,6 +27,12 @@
|
|||||||
color: #3869D4;
|
color: #3869D4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
a.nohighlight {
|
||||||
|
color: inherit !important;
|
||||||
|
text-decoration: none !important;
|
||||||
|
cursor: default !important;
|
||||||
|
}
|
||||||
|
|
||||||
a img {
|
a img {
|
||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
@@ -458,7 +464,7 @@
|
|||||||
<td class="content-cell">
|
<td class="content-cell">
|
||||||
<div class="f-fallback">
|
<div class="f-fallback">
|
||||||
<h1>Hi there,</h1>
|
<h1>Hi there,</h1>
|
||||||
<p>{{invitee}} with {{invite_team_name}} has invited you to use Hoppscotch to collaborate with them. Click the button below to set up your account and get started:</p>
|
<p><a class="nohighlight" name="invitee" href="#">{{invitee}}</a> with <a class="nohighlight" name="invite_team_name" href="#">{{invite_team_name}}</a> has invited you to use Hoppscotch to collaborate with them. Click the button below to set up your account and get started:</p>
|
||||||
<!-- Action -->
|
<!-- Action -->
|
||||||
<table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0">
|
<table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0">
|
||||||
<tr>
|
<tr>
|
||||||
@@ -484,7 +490,7 @@
|
|||||||
Welcome aboard, <br />
|
Welcome aboard, <br />
|
||||||
Your friends at Hoppscotch
|
Your friends at Hoppscotch
|
||||||
</p>
|
</p>
|
||||||
<p><strong>P.S.</strong> If you don't associate with {{invitee}} or {{invite_team_name}}, just ignore this email.</p>
|
<p><strong>P.S.</strong> If you don't associate with <a class="nohighlight" name="invitee" href="#">{{invitee}}</a> or <a class="nohighlight" name="invite_team_name" href="#">{{invite_team_name}}</a>, just ignore this email.</p>
|
||||||
<!-- Sub copy -->
|
<!-- Sub copy -->
|
||||||
<table class="body-sub">
|
<table class="body-sub">
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
@@ -27,6 +27,12 @@
|
|||||||
color: #3869D4;
|
color: #3869D4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
a.nohighlight {
|
||||||
|
color: inherit !important;
|
||||||
|
text-decoration: none !important;
|
||||||
|
cursor: default !important;
|
||||||
|
}
|
||||||
|
|
||||||
a img {
|
a img {
|
||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -429,6 +429,11 @@ pre.ace_editor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.splitpanes__pane {
|
||||||
|
@apply will-change-auto;
|
||||||
|
transform: translateZ(0);
|
||||||
|
}
|
||||||
|
|
||||||
.smart-splitter .splitpanes__splitter {
|
.smart-splitter .splitpanes__splitter {
|
||||||
@apply relative;
|
@apply relative;
|
||||||
@apply before:absolute;
|
@apply before:absolute;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@hoppscotch/common",
|
"name": "@hoppscotch/common",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "2023.12.5",
|
"version": "2023.12.6",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "pnpm exec npm-run-all -p -l dev:*",
|
"dev": "pnpm exec npm-run-all -p -l dev:*",
|
||||||
"test": "vitest --run",
|
"test": "vitest --run",
|
||||||
|
|||||||
@@ -614,8 +614,8 @@ const addNewRootCollection = (name: string) => {
|
|||||||
requests: [],
|
requests: [],
|
||||||
headers: [],
|
headers: [],
|
||||||
auth: {
|
auth: {
|
||||||
authType: "inherit",
|
authType: "none",
|
||||||
authActive: false,
|
authActive: true,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -31,17 +31,6 @@
|
|||||||
tabindex="0"
|
tabindex="0"
|
||||||
@keyup.escape="hide()"
|
@keyup.escape="hide()"
|
||||||
>
|
>
|
||||||
<HoppSmartItem
|
|
||||||
label="None"
|
|
||||||
:icon="authName === 'None' ? IconCircleDot : IconCircle"
|
|
||||||
:active="authName === 'None'"
|
|
||||||
@click="
|
|
||||||
() => {
|
|
||||||
auth.authType = 'none'
|
|
||||||
hide()
|
|
||||||
}
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
<HoppSmartItem
|
<HoppSmartItem
|
||||||
v-if="!isRootCollection"
|
v-if="!isRootCollection"
|
||||||
label="Inherit"
|
label="Inherit"
|
||||||
@@ -54,6 +43,17 @@
|
|||||||
}
|
}
|
||||||
"
|
"
|
||||||
/>
|
/>
|
||||||
|
<HoppSmartItem
|
||||||
|
label="None"
|
||||||
|
:icon="authName === 'None' ? IconCircleDot : IconCircle"
|
||||||
|
:active="authName === 'None'"
|
||||||
|
@click="
|
||||||
|
() => {
|
||||||
|
auth.authType = 'none'
|
||||||
|
hide()
|
||||||
|
}
|
||||||
|
"
|
||||||
|
/>
|
||||||
<HoppSmartItem
|
<HoppSmartItem
|
||||||
label="Basic Auth"
|
label="Basic Auth"
|
||||||
:icon="authName === 'Basic Auth' ? IconCircleDot : IconCircle"
|
:icon="authName === 'Basic Auth' ? IconCircleDot : IconCircle"
|
||||||
@@ -284,7 +284,7 @@ const authActive = pluckRef(auth, "authActive")
|
|||||||
|
|
||||||
const clearContent = () => {
|
const clearContent = () => {
|
||||||
auth.value = {
|
auth.value = {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex h-full flex-1 flex-col">
|
<div class="h-full">
|
||||||
<HoppSmartTabs
|
<HoppSmartTabs
|
||||||
v-model="selectedOptionTab"
|
v-model="selectedOptionTab"
|
||||||
styles="sticky top-0 bg-primary z-10 border-b-0"
|
styles="sticky top-0 bg-primary z-10 border-b-0"
|
||||||
|
|||||||
@@ -72,7 +72,9 @@
|
|||||||
</tippy>
|
</tippy>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div ref="schemaEditor" class="flex flex-1 flex-col"></div>
|
<div class="h-full">
|
||||||
|
<div ref="schemaEditor"></div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<component
|
<component
|
||||||
:is="response[0].error.component"
|
:is="response[0].error.component"
|
||||||
|
|||||||
@@ -145,11 +145,9 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div v-if="schemaString" class="h-full relative w-full">
|
||||||
v-if="schemaString"
|
<div ref="schemaEditor" class="absolute inset-0"></div>
|
||||||
ref="schemaEditor"
|
</div>
|
||||||
class="flex flex-1 flex-col"
|
|
||||||
></div>
|
|
||||||
<HoppSmartPlaceholder
|
<HoppSmartPlaceholder
|
||||||
v-else
|
v-else
|
||||||
:src="`/images/states/${colorMode.value}/blockchain.svg`"
|
:src="`/images/states/${colorMode.value}/blockchain.svg`"
|
||||||
|
|||||||
@@ -67,7 +67,9 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="h-full relative">
|
||||||
<div ref="variableEditor" class="flex flex-1 flex-col"></div>
|
<div ref="variableEditor" class="flex flex-1 flex-col"></div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
|||||||
@@ -31,17 +31,6 @@
|
|||||||
tabindex="0"
|
tabindex="0"
|
||||||
@keyup.escape="hide()"
|
@keyup.escape="hide()"
|
||||||
>
|
>
|
||||||
<HoppSmartItem
|
|
||||||
label="None"
|
|
||||||
:icon="authName === 'None' ? IconCircleDot : IconCircle"
|
|
||||||
:active="authName === 'None'"
|
|
||||||
@click="
|
|
||||||
() => {
|
|
||||||
auth.authType = 'none'
|
|
||||||
hide()
|
|
||||||
}
|
|
||||||
"
|
|
||||||
/>
|
|
||||||
<HoppSmartItem
|
<HoppSmartItem
|
||||||
v-if="!isRootCollection"
|
v-if="!isRootCollection"
|
||||||
label="Inherit"
|
label="Inherit"
|
||||||
@@ -54,6 +43,17 @@
|
|||||||
}
|
}
|
||||||
"
|
"
|
||||||
/>
|
/>
|
||||||
|
<HoppSmartItem
|
||||||
|
label="None"
|
||||||
|
:icon="authName === 'None' ? IconCircleDot : IconCircle"
|
||||||
|
:active="authName === 'None'"
|
||||||
|
@click="
|
||||||
|
() => {
|
||||||
|
auth.authType = 'none'
|
||||||
|
hide()
|
||||||
|
}
|
||||||
|
"
|
||||||
|
/>
|
||||||
<HoppSmartItem
|
<HoppSmartItem
|
||||||
label="Basic Auth"
|
label="Basic Auth"
|
||||||
:icon="authName === 'Basic Auth' ? IconCircleDot : IconCircle"
|
:icon="authName === 'Basic Auth' ? IconCircleDot : IconCircle"
|
||||||
@@ -265,7 +265,7 @@ const authActive = pluckRef(auth, "authActive")
|
|||||||
|
|
||||||
const clearContent = () => {
|
const clearContent = () => {
|
||||||
auth.value = {
|
auth.value = {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,9 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="bulkMode" ref="bulkEditor" class="flex flex-1 flex-col"></div>
|
<div v-if="bulkMode" class="h-full relative w-full">
|
||||||
|
<div ref="bulkEditor" class="absolute inset-0"></div>
|
||||||
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<draggable
|
<draggable
|
||||||
v-model="workingHeaders"
|
v-model="workingHeaders"
|
||||||
|
|||||||
@@ -44,7 +44,9 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="bulkMode" ref="bulkEditor" class="flex flex-1 flex-col"></div>
|
<div v-if="bulkMode" class="h-full relative">
|
||||||
|
<div ref="bulkEditor" class="absolute inset-0"></div>
|
||||||
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<draggable
|
<draggable
|
||||||
v-model="workingParams"
|
v-model="workingParams"
|
||||||
|
|||||||
@@ -30,8 +30,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-1 border-b border-dividerLight">
|
<div class="flex flex-1 border-b border-dividerLight">
|
||||||
<div class="w-2/3 border-r border-dividerLight">
|
<div class="w-2/3 border-r border-dividerLight h-full relative">
|
||||||
<div ref="preRequestEditor" class="h-full"></div>
|
<div ref="preRequestEditor" class="h-full absolute inset-0"></div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="z-[9] sticky top-upperTertiaryStickyFold h-full min-w-[12rem] max-w-1/3 flex-shrink-0 overflow-auto overflow-x-auto bg-primary p-4"
|
class="z-[9] sticky top-upperTertiaryStickyFold h-full min-w-[12rem] max-w-1/3 flex-shrink-0 overflow-auto overflow-x-auto bg-primary p-4"
|
||||||
|
|||||||
@@ -59,7 +59,9 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div ref="rawBodyParameters" class="flex flex-1 flex-col"></div>
|
<div class="h-full relative">
|
||||||
|
<div ref="rawBodyParameters" class="absolute inset-0"></div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
<template #secondary>
|
<template #secondary>
|
||||||
<HttpResponse v-model:document="tab.document" />
|
<HttpResponse v-model:document="tab.document" :is-embed="false" />
|
||||||
</template>
|
</template>
|
||||||
</AppPaneLayout>
|
</AppPaneLayout>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -30,8 +30,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-1 border-b border-dividerLight">
|
<div class="flex flex-1 border-b border-dividerLight">
|
||||||
<div class="w-2/3 border-r border-dividerLight">
|
<div class="w-2/3 border-r border-dividerLight h-full relative">
|
||||||
<div ref="testScriptEditor" class="h-full"></div>
|
<div ref="testScriptEditor" class="h-full absolute inset-0"></div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="z-[9] sticky top-upperTertiaryStickyFold h-full min-w-[12rem] max-w-1/3 flex-shrink-0 overflow-auto overflow-x-auto bg-primary p-4"
|
class="z-[9] sticky top-upperTertiaryStickyFold h-full min-w-[12rem] max-w-1/3 flex-shrink-0 overflow-auto overflow-x-auto bg-primary p-4"
|
||||||
|
|||||||
@@ -44,7 +44,9 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="bulkMode" ref="bulkEditor" class="flex flex-1 flex-col"></div>
|
<div v-if="bulkMode" class="h-full relative">
|
||||||
|
<div ref="bulkEditor" class="absolute inset-0"></div>
|
||||||
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<draggable
|
<draggable
|
||||||
v-model="workingUrlEncodedParams"
|
v-model="workingUrlEncodedParams"
|
||||||
|
|||||||
@@ -44,11 +44,9 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div v-show="!previewEnabled" class="h-full">
|
||||||
v-show="!previewEnabled"
|
<div ref="htmlResponse" class="flex flex-1 flex-col"></div>
|
||||||
ref="htmlResponse"
|
</div>
|
||||||
class="flex flex-1 flex-col"
|
|
||||||
></div>
|
|
||||||
<iframe
|
<iframe
|
||||||
v-show="previewEnabled"
|
v-show="previewEnabled"
|
||||||
ref="previewFrame"
|
ref="previewFrame"
|
||||||
|
|||||||
@@ -119,11 +119,12 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="h-full">
|
||||||
<div
|
<div
|
||||||
ref="jsonResponse"
|
ref="jsonResponse"
|
||||||
class="flex h-auto h-full flex-1 flex-col"
|
|
||||||
:class="toggleFilter ? 'responseToggleOn' : 'responseToggleOff'"
|
:class="toggleFilter ? 'responseToggleOn' : 'responseToggleOff'"
|
||||||
></div>
|
></div>
|
||||||
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="outlinePath"
|
v-if="outlinePath"
|
||||||
class="sticky bottom-0 z-10 flex flex-shrink-0 flex-nowrap overflow-auto overflow-x-auto border-t border-dividerLight bg-primaryLight px-2"
|
class="sticky bottom-0 z-10 flex flex-shrink-0 flex-nowrap overflow-auto overflow-x-auto border-t border-dividerLight bg-primaryLight px-2"
|
||||||
|
|||||||
@@ -35,8 +35,10 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="h-full">
|
||||||
<div ref="rawResponse" class="flex flex-1 flex-col"></div>
|
<div ref="rawResponse" class="flex flex-1 flex-col"></div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
|||||||
@@ -35,8 +35,10 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="h-full">
|
||||||
<div ref="xmlResponse" class="flex flex-1 flex-col"></div>
|
<div ref="xmlResponse" class="flex flex-1 flex-col"></div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
|||||||
@@ -130,8 +130,10 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="h-full">
|
||||||
<div ref="wsCommunicationBody" class="flex flex-1 flex-col"></div>
|
<div ref="wsCommunicationBody" class="flex flex-1 flex-col"></div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { Component, computed, reactive, ref } from "vue"
|
import { Component, computed, reactive, ref } from "vue"
|
||||||
|
|||||||
@@ -62,7 +62,7 @@
|
|||||||
:shortcut="['T']"
|
:shortcut="['T']"
|
||||||
@click="
|
@click="
|
||||||
() => {
|
() => {
|
||||||
openInNewTab()
|
emit('open-shared-request', parseRequest)
|
||||||
hide()
|
hide()
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
@@ -128,6 +128,7 @@ const emit = defineEmits<{
|
|||||||
embedProperties?: string | null
|
embedProperties?: string | null
|
||||||
): void
|
): void
|
||||||
(e: "delete-shared-request", codeID: string): void
|
(e: "delete-shared-request", codeID: string): void
|
||||||
|
(e: "open-shared-request", request: HoppRESTRequest): void
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const tippyActions = ref<TippyComponent | null>(null)
|
const tippyActions = ref<TippyComponent | null>(null)
|
||||||
|
|||||||
@@ -53,6 +53,7 @@
|
|||||||
:request="request"
|
:request="request"
|
||||||
@customize-shared-request="customizeSharedRequest"
|
@customize-shared-request="customizeSharedRequest"
|
||||||
@delete-shared-request="deleteSharedRequest"
|
@delete-shared-request="deleteSharedRequest"
|
||||||
|
@open-shared-request="openRequestInNewTab"
|
||||||
/>
|
/>
|
||||||
<HoppSmartIntersection
|
<HoppSmartIntersection
|
||||||
v-if="hasMoreSharedRequests"
|
v-if="hasMoreSharedRequests"
|
||||||
@@ -483,6 +484,13 @@ const getErrorMessage = (err: GQLError<string>) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const openRequestInNewTab = (request: HoppRESTRequest) => {
|
||||||
|
restTab.createNewTab({
|
||||||
|
isDirty: false,
|
||||||
|
request,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
defineActionHandler("share.request", ({ request }) => {
|
defineActionHandler("share.request", ({ request }) => {
|
||||||
requestToShare.value = request
|
requestToShare.value = request
|
||||||
displayShareRequestModal(true)
|
displayShareRequestModal(true)
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ const samples = [
|
|||||||
method: "GET",
|
method: "GET",
|
||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://echo.hoppscotch.io/",
|
endpoint: "https://echo.hoppscotch.io/",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
body: {
|
body: {
|
||||||
contentType: "application/x-www-form-urlencoded",
|
contentType: "application/x-www-form-urlencoded",
|
||||||
body: rawKeyValueEntriesToString([
|
body: rawKeyValueEntriesToString([
|
||||||
@@ -149,7 +149,7 @@ const samples = [
|
|||||||
method: "GET",
|
method: "GET",
|
||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://google.com/",
|
endpoint: "https://google.com/",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
body: {
|
body: {
|
||||||
contentType: null,
|
contentType: null,
|
||||||
body: null,
|
body: null,
|
||||||
@@ -166,7 +166,7 @@ const samples = [
|
|||||||
method: "POST",
|
method: "POST",
|
||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "http://localhost:1111/hello/world/?buzz",
|
endpoint: "http://localhost:1111/hello/world/?buzz",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
body: {
|
body: {
|
||||||
contentType: "application/json",
|
contentType: "application/json",
|
||||||
body: `{\n "foo": "bar"\n}`,
|
body: `{\n "foo": "bar"\n}`,
|
||||||
@@ -189,7 +189,7 @@ const samples = [
|
|||||||
method: "GET",
|
method: "GET",
|
||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://example.com/",
|
endpoint: "https://example.com/",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
body: {
|
body: {
|
||||||
contentType: null,
|
contentType: null,
|
||||||
body: null,
|
body: null,
|
||||||
@@ -217,7 +217,7 @@ const samples = [
|
|||||||
method: "POST",
|
method: "POST",
|
||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://bing.com/",
|
endpoint: "https://bing.com/",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
body: {
|
body: {
|
||||||
contentType: "multipart/form-data",
|
contentType: "multipart/form-data",
|
||||||
body: [
|
body: [
|
||||||
@@ -301,7 +301,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "http://localhost:9900/",
|
endpoint: "http://localhost:9900/",
|
||||||
auth: {
|
auth: {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
},
|
},
|
||||||
body: {
|
body: {
|
||||||
@@ -345,7 +345,7 @@ const samples = [
|
|||||||
endpoint: "https://hoppscotch.io/?io",
|
endpoint: "https://hoppscotch.io/?io",
|
||||||
auth: {
|
auth: {
|
||||||
authActive: true,
|
authActive: true,
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
},
|
},
|
||||||
body: {
|
body: {
|
||||||
contentType: null,
|
contentType: null,
|
||||||
@@ -380,7 +380,7 @@ const samples = [
|
|||||||
endpoint: "https://someshadywebsite.com/questionable/path/?so",
|
endpoint: "https://someshadywebsite.com/questionable/path/?so",
|
||||||
auth: {
|
auth: {
|
||||||
authActive: true,
|
authActive: true,
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
},
|
},
|
||||||
body: {
|
body: {
|
||||||
contentType: "multipart/form-data",
|
contentType: "multipart/form-data",
|
||||||
@@ -441,7 +441,7 @@ const samples = [
|
|||||||
endpoint: "http://localhost/",
|
endpoint: "http://localhost/",
|
||||||
auth: {
|
auth: {
|
||||||
authActive: true,
|
authActive: true,
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
},
|
},
|
||||||
body: {
|
body: {
|
||||||
contentType: "multipart/form-data",
|
contentType: "multipart/form-data",
|
||||||
@@ -473,7 +473,7 @@ const samples = [
|
|||||||
method: "GET",
|
method: "GET",
|
||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://hoppscotch.io/",
|
endpoint: "https://hoppscotch.io/",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
body: {
|
body: {
|
||||||
contentType: null,
|
contentType: null,
|
||||||
body: null,
|
body: null,
|
||||||
@@ -528,7 +528,7 @@ const samples = [
|
|||||||
method: "GET",
|
method: "GET",
|
||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://echo.hoppscotch.io/",
|
endpoint: "https://echo.hoppscotch.io/",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
body: {
|
body: {
|
||||||
contentType: "application/x-www-form-urlencoded",
|
contentType: "application/x-www-form-urlencoded",
|
||||||
body: rawKeyValueEntriesToString([
|
body: rawKeyValueEntriesToString([
|
||||||
@@ -573,7 +573,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://echo.hoppscotch.io/",
|
endpoint: "https://echo.hoppscotch.io/",
|
||||||
method: "POST",
|
method: "POST",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
headers: [
|
headers: [
|
||||||
{
|
{
|
||||||
active: true,
|
active: true,
|
||||||
@@ -615,7 +615,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://muxueqz.top/skybook.html",
|
endpoint: "https://muxueqz.top/skybook.html",
|
||||||
method: "GET",
|
method: "GET",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
headers: [],
|
headers: [],
|
||||||
body: { contentType: null, body: null },
|
body: { contentType: null, body: null },
|
||||||
params: [],
|
params: [],
|
||||||
@@ -629,7 +629,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://echo.hoppscotch.io/",
|
endpoint: "https://echo.hoppscotch.io/",
|
||||||
method: "POST",
|
method: "POST",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
headers: [],
|
headers: [],
|
||||||
body: {
|
body: {
|
||||||
contentType: "multipart/form-data",
|
contentType: "multipart/form-data",
|
||||||
@@ -653,7 +653,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "http://127.0.0.1/",
|
endpoint: "http://127.0.0.1/",
|
||||||
method: "CUSTOMMETHOD",
|
method: "CUSTOMMETHOD",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
headers: [],
|
headers: [],
|
||||||
body: {
|
body: {
|
||||||
contentType: null,
|
contentType: null,
|
||||||
@@ -670,7 +670,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://echo.hoppscotch.io/",
|
endpoint: "https://echo.hoppscotch.io/",
|
||||||
method: "GET",
|
method: "GET",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
headers: [
|
headers: [
|
||||||
{
|
{
|
||||||
active: true,
|
active: true,
|
||||||
@@ -693,7 +693,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://echo.hoppscotch.io/",
|
endpoint: "https://echo.hoppscotch.io/",
|
||||||
method: "GET",
|
method: "GET",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
headers: [],
|
headers: [],
|
||||||
body: {
|
body: {
|
||||||
contentType: null,
|
contentType: null,
|
||||||
@@ -710,7 +710,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://example.org/",
|
endpoint: "https://example.org/",
|
||||||
method: "HEAD",
|
method: "HEAD",
|
||||||
auth: { authType: "none", authActive: true },
|
auth: { authType: "inherit", authActive: true },
|
||||||
headers: [],
|
headers: [],
|
||||||
body: {
|
body: {
|
||||||
contentType: null,
|
contentType: null,
|
||||||
@@ -756,7 +756,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://google.com/",
|
endpoint: "https://google.com/",
|
||||||
auth: {
|
auth: {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
},
|
},
|
||||||
body: {
|
body: {
|
||||||
@@ -777,7 +777,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://google.com/",
|
endpoint: "https://google.com/",
|
||||||
auth: {
|
auth: {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
},
|
},
|
||||||
body: {
|
body: {
|
||||||
@@ -797,7 +797,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "http://192.168.0.24:8080/ping",
|
endpoint: "http://192.168.0.24:8080/ping",
|
||||||
auth: {
|
auth: {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
},
|
},
|
||||||
body: {
|
body: {
|
||||||
@@ -817,7 +817,7 @@ const samples = [
|
|||||||
name: "Untitled",
|
name: "Untitled",
|
||||||
endpoint: "https://example.com/",
|
endpoint: "https://example.com/",
|
||||||
auth: {
|
auth: {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
},
|
},
|
||||||
body: {
|
body: {
|
||||||
|
|||||||
@@ -171,9 +171,6 @@ export const baseTheme = EditorView.theme({
|
|||||||
".cm-activeLineGutter": {
|
".cm-activeLineGutter": {
|
||||||
backgroundColor: "transparent",
|
backgroundColor: "transparent",
|
||||||
},
|
},
|
||||||
".cm-scroller::-webkit-scrollbar": {
|
|
||||||
display: "none",
|
|
||||||
},
|
|
||||||
".cm-foldPlaceholder": {
|
".cm-foldPlaceholder": {
|
||||||
backgroundColor: "var(--divider-light-color)",
|
backgroundColor: "var(--divider-light-color)",
|
||||||
color: "var(--secondary-dark-color)",
|
color: "var(--secondary-dark-color)",
|
||||||
@@ -320,9 +317,6 @@ export const inputTheme = EditorView.theme({
|
|||||||
".cm-activeLineGutter": {
|
".cm-activeLineGutter": {
|
||||||
backgroundColor: "transparent",
|
backgroundColor: "transparent",
|
||||||
},
|
},
|
||||||
".cm-scroller::-webkit-scrollbar": {
|
|
||||||
display: "none",
|
|
||||||
},
|
|
||||||
".cm-foldPlaceholder": {
|
".cm-foldPlaceholder": {
|
||||||
backgroundColor: "var(--divider-light-color)",
|
backgroundColor: "var(--divider-light-color)",
|
||||||
color: "var(--secondary-dark-color)",
|
color: "var(--secondary-dark-color)",
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ export const getDefaultGQLRequest = (): HoppGQLRequest => ({
|
|||||||
}`,
|
}`,
|
||||||
query: DEFAULT_QUERY,
|
query: DEFAULT_QUERY,
|
||||||
auth: {
|
auth: {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -250,19 +250,23 @@ const handleOAuthRedirect = async () => {
|
|||||||
return E.left("NO_CODE_VERIFIER" as const)
|
return E.left("NO_CODE_VERIFIER" as const)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Exchange the authorization code for an access token
|
const data = new URLSearchParams({
|
||||||
const tokenResponse = await runRequestThroughInterceptor({
|
|
||||||
url: tokenEndpoint,
|
|
||||||
data: JSON.stringify({
|
|
||||||
grant_type: "authorization_code",
|
grant_type: "authorization_code",
|
||||||
code: queryParams.code,
|
code: queryParams.code,
|
||||||
client_id: clientID,
|
client_id: clientID,
|
||||||
client_secret: clientSecret,
|
client_secret: clientSecret,
|
||||||
redirect_uri: redirectUri,
|
redirect_uri: redirectUri,
|
||||||
code_verifier: codeVerifier,
|
code_verifier: codeVerifier,
|
||||||
}),
|
})
|
||||||
|
|
||||||
|
// Exchange the authorization code for an access token
|
||||||
|
const tokenResponse = await runRequestThroughInterceptor({
|
||||||
|
url: tokenEndpoint,
|
||||||
|
data: data.toString(),
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {},
|
headers: {
|
||||||
|
"Content-Type": "application/x-www-form-urlencoded",
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
// Clean these up since we don't need them anymore
|
// Clean these up since we don't need them anymore
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export const getDefaultRESTRequest = (): HoppRESTRequest => ({
|
|||||||
headers: [],
|
headers: [],
|
||||||
method: "GET",
|
method: "GET",
|
||||||
auth: {
|
auth: {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
},
|
},
|
||||||
preRequestScript: "",
|
preRequestScript: "",
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ export function getDefaultGQLRequest(): HoppGQLRequest {
|
|||||||
}`.trim(),
|
}`.trim(),
|
||||||
query: DEFAULT_QUERY,
|
query: DEFAULT_QUERY,
|
||||||
auth: {
|
auth: {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ export function getDefaultRESTRequest(): HoppRESTRequest {
|
|||||||
headers: [],
|
headers: [],
|
||||||
method: "GET",
|
method: "GET",
|
||||||
auth: {
|
auth: {
|
||||||
authType: "none",
|
authType: "inherit",
|
||||||
authActive: true,
|
authActive: true,
|
||||||
},
|
},
|
||||||
preRequestScript: "",
|
preRequestScript: "",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@hoppscotch/selfhost-desktop",
|
"name": "@hoppscotch/selfhost-desktop",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "2023.12.5",
|
"version": "2023.12.6",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev:vite": "vite",
|
"dev:vite": "vite",
|
||||||
|
|||||||
@@ -1260,7 +1260,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hoppscotch-desktop"
|
name = "hoppscotch-desktop"
|
||||||
version = "23.12.5"
|
version = "23.12.6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cocoa 0.25.0",
|
"cocoa 0.25.0",
|
||||||
"hex_color",
|
"hex_color",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "hoppscotch-desktop"
|
name = "hoppscotch-desktop"
|
||||||
version = "23.12.5"
|
version = "23.12.6"
|
||||||
description = "A Tauri App"
|
description = "A Tauri App"
|
||||||
authors = ["you"]
|
authors = ["you"]
|
||||||
license = ""
|
license = ""
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
},
|
},
|
||||||
"package": {
|
"package": {
|
||||||
"productName": "Hoppscotch",
|
"productName": "Hoppscotch",
|
||||||
"version": "23.12.5"
|
"version": "23.12.6"
|
||||||
},
|
},
|
||||||
"tauri": {
|
"tauri": {
|
||||||
"allowlist": {
|
"allowlist": {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "@hoppscotch/selfhost-web",
|
"name": "@hoppscotch/selfhost-web",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "2023.12.5",
|
"version": "2023.12.6",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev:vite": "vite",
|
"dev:vite": "vite",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "hoppscotch-sh-admin",
|
"name": "hoppscotch-sh-admin",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "2023.12.5",
|
"version": "2023.12.6",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "pnpm exec npm-run-all -p -l dev:*",
|
"dev": "pnpm exec npm-run-all -p -l dev:*",
|
||||||
|
|||||||
Reference in New Issue
Block a user