Commit e068f4c1 authored by Eliot Berriot's avatar Eliot Berriot 💬

Merge branch 'broken-websocket' into 'develop'

Ensure we use absolute URL to connect to websocket

See merge request funkwhale/funkwhale!270
parents 0d84e31a 0e120333
......@@ -89,7 +89,7 @@ class ImportJobFactory(factory.django.DjangoModelFactory):
batch = factory.SubFactory(ImportBatchFactory)
source = factory.Faker("url")
mbid = factory.Faker("uuid4")
replace_if_duplicate = factory.Faker("boolean")
replace_if_duplicate = False
class Meta:
model = "music.ImportJob"
......
......@@ -54,19 +54,16 @@ export default {
state.events = value
},
instanceUrl: (state, value) => {
if (value && !value.endsWith('/')) {
value = value + '/'
}
state.instanceUrl = value
if (!value) {
axios.defaults.baseURL = null
return
}
let apiUrl
let suffix = 'api/v1/'
if (state.instanceUrl.endsWith('/')) {
apiUrl = state.instanceUrl + suffix
} else {
apiUrl = state.instanceUrl + '/' + suffix
}
axios.defaults.baseURL = apiUrl
axios.defaults.baseURL = state.instanceUrl + suffix
}
},
getters: {
......
......@@ -78,8 +78,11 @@ export default {
// let token = 'test'
const bridge = new WebSocketBridge()
this.bridge = bridge
let url = this.$store.getters['instance/absoluteUrl'](`api/v1/instance/activity?token=${token}`)
url = url.replace('http://', 'ws://')
url = url.replace('https://', 'wss://')
bridge.connect(
`/api/v1/instance/activity?token=${token}`,
url,
null,
{reconnectInterval: 5000})
bridge.listen(function (event) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment