Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: use global fetch instead of @supabase/node-fetch #1232

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: use global fetch instead of @supabase/node-fetch #1232

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a8ad62
fix: use global fetch instead of @supabase/node-fetch
m-shaka Jun 27, 2024
a4fd29d
revert customFetch
m-shaka Jun 27, 2024
8d697d5
Merge remote-tracking branch 'upstream/master' into rm-@supabase/node…
m-shaka Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"dependencies": {
"@supabase/auth-js": "2.64.2",
"@supabase/functions-js": "2.4.1",
"@supabase/node-fetch": "2.6.15",
"@supabase/postgrest-js": "1.15.6",
"@supabase/realtime-js": "2.10.1",
"@supabase/storage-js": "2.6.0"
Expand Down
2 changes: 1 addition & 1 deletion src/SupabaseClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export default class SupabaseClient<
this.headers,
settings.global.fetch
)
this.fetch = fetchWithAuth(supabaseKey, this._getAccessToken.bind(this), settings.global.fetch)
Copy link
Contributor

@j4w8n j4w8n Jun 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing settings.global.fetch denies developers the ability to use a custom fetch, passed into the Supabase client's options.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted! Thank you.

this.fetch = fetchWithAuth(supabaseKey, this._getAccessToken.bind(this))

this.realtime = this._initRealtimeClient({ headers: this.headers, ...settings.realtime })
this.rest = new PostgrestClient(`${_supabaseUrl}/rest/v1`, {
Expand Down
31 changes: 2 additions & 29 deletions src/lib/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,12 @@
// @ts-ignore
import nodeFetch, { Headers as NodeFetchHeaders } from '@supabase/node-fetch'

type Fetch = typeof fetch

export const resolveFetch = (customFetch?: Fetch): Fetch => {
let _fetch: Fetch
if (customFetch) {
_fetch = customFetch
} else if (typeof fetch === 'undefined') {
_fetch = nodeFetch as unknown as Fetch
} else {
_fetch = fetch
}
return (...args: Parameters<Fetch>) => _fetch(...args)
}

export const resolveHeadersConstructor = () => {
if (typeof Headers === 'undefined') {
return NodeFetchHeaders
}

return Headers
}

export const fetchWithAuth = (
supabaseKey: string,
getAccessToken: () => Promise<string | null>,
customFetch?: Fetch
getAccessToken: () => Promise<string | null>
): Fetch => {
const fetch = resolveFetch(customFetch)
const HeadersConstructor = resolveHeadersConstructor()

return async (input, init) => {
const accessToken = (await getAccessToken()) ?? supabaseKey
let headers = new HeadersConstructor(init?.headers)
let headers = new Headers(init?.headers)

if (!headers.has('apikey')) {
headers.set('apikey', supabaseKey)
Expand Down