Skip to content

refactor: add some small changes to stripTrailingSlash method #279

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

Merged
merged 4 commits into from
Jan 20, 2022
Merged

refactor: add some small changes to stripTrailingSlash method #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d552e76
test: add test for stripTrailingSlash method
ftonato Sep 28, 2021
4ed5cf6
refactor: add return type for stripTrailingSlash method
ftonato Sep 28, 2021
5b4fcce
refactor: create a new scoped variable to avoid reassignment of funct…
ftonato Sep 28, 2021
868c4a0
Merge branch 'master' into fix/trailing-slash
w3b6x9 Jan 20, 2022
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
12 changes: 6 additions & 6 deletions src/SupabaseClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ export default class SupabaseClient {
if (!supabaseUrl) throw new Error('supabaseUrl is required.')
if (!supabaseKey) throw new Error('supabaseKey is required.')

supabaseUrl = stripTrailingSlash(supabaseUrl)

const _supabaseUrl = stripTrailingSlash(supabaseUrl)
const settings = { ...DEFAULT_OPTIONS, ...options }
this.restUrl = `${supabaseUrl}/rest/v1`
this.realtimeUrl = `${supabaseUrl}/realtime/v1`.replace('http', 'ws')
this.authUrl = `${supabaseUrl}/auth/v1`
this.storageUrl = `${supabaseUrl}/storage/v1`

this.restUrl = `${_supabaseUrl}/rest/v1`
this.realtimeUrl = `${_supabaseUrl}/realtime/v1`.replace('http', 'ws')
this.authUrl = `${_supabaseUrl}/auth/v1`
this.storageUrl = `${_supabaseUrl}/storage/v1`
this.schema = settings.schema
this.multiTab = settings.multiTab
this.fetch = settings.fetch
Expand Down
2 changes: 1 addition & 1 deletion src/lib/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export function uuid() {
})
}

export function stripTrailingSlash(url: string) {
export function stripTrailingSlash(url: string): string {
return url.replace(/\/$/, '')
}

Expand Down
13 changes: 13 additions & 0 deletions test/helper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { stripTrailingSlash } from '../src/lib/helpers'

test('Strip trailing slash from URL', () => {
const URL = 'http://localhost:3000/'
const expectedURL = URL.slice(0, -1)
expect(stripTrailingSlash(URL)).toBe(expectedURL)
})

test('Return the original URL if there is no slash at the end', () => {
const URL = 'http://localhost:3000'
const expectedURL = URL
expect(stripTrailingSlash(URL)).toBe(expectedURL)
})