Skip to content

Commit

Permalink
Merge branch 'main' into feat/62-desktop
Browse files Browse the repository at this point in the history
  • Loading branch information
Nishchit14 authored Jan 23, 2024
2 parents d2165e7 + 58669f8 commit 1c6429a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@
<p align="center">
<a href="https://discord.gg/8hRaqhK"><img alt="Discord online members" src="https://badgen.net/discord/members/8hRaqhK?color=5865F2&label=Discord&style=for-the-badge" /></a>
<a href="https://github.com/firecamp-dev/firecamp/stargazers"><img src="https://img.shields.io/github/stars/firecamp-dev/firecamp" alt="GitHub Stars"></a>
<a href="https://github.com/firecamp-dev/firecamp/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-AGPLv3-purple" alt="License"></a>
<a href="https://github.com/firecamp-dev/firecamp/pulse"><img src="https://img.shields.io/github/commit-activity/y/firecamp-dev/firecamp" alt="Commits-per-month"></a>
</p>

<br/>

> **🚧 We're currently working on the desktop application which can be found on the [feat/62-desktop](https://github.com/firecamp-dev/firecamp/tree/feat/62-desktop) branch.**
> **🚧 We're currently launching the desktop applications you can read the announcement on this separate discussion page**
>
> **[Read more 👀](https://github.com/firecamp-dev/firecamp/issues/62)**
> **[Here is the announcement 👀](https://github.com/firecamp-dev/firecamp/discussions/167)**
<br/>

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "firecamp",
"version": "3.2.3",
"version": "3.2.4",
"private": true,
"description": "DX-first API devtool",
"main": "packages/firecamp-desktop-app/dist/services/Main",
Expand Down
10 changes: 7 additions & 3 deletions playgrounds/firecamp-rest/src/store/slices/execution.slice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,16 @@ const createExecutionSlice: TStoreSlice<IExecutionSlice> = (set, get) => ({
},

prepareRequestForExecution: () => {
const { request, prepareAuthForExecution, prepareScriptsForExecution } =
get();
const {
request,
runtime: { authHeaders = [] },
prepareAuthForExecution,
prepareScriptsForExecution,
} = get();
const auth = prepareAuthForExecution();
const { preScripts, postScripts } = prepareScriptsForExecution();
return {
...request,
...{ ...request, headers: [...request.headers, ...authHeaders] }, // merge auth headers to main headers
auth,
preScripts,
postScripts,
Expand Down

0 comments on commit 1c6429a

Please sign in to comment.