On ok, callback failure_message shouldn't be set.

This commit is contained in:
Feufochmar 2020-03-27 12:54:22 +01:00
parent f1f60b4741
commit 7c0d471328
6 changed files with 12 additions and 12 deletions

View File

@ -29,7 +29,7 @@ Activity.prototype = {
} else if (this.raw.cc) {
this.loadCcActors(this.raw.cc.values(), callback)
} else {
callback(true, 'ok')
callback(true, undefined)
}
}.bind(this))
},
@ -41,7 +41,7 @@ Activity.prototype = {
if (this.raw.cc) {
this.loadCcActors(this.raw.cc.values(), callback)
} else {
callback(true, 'ok')
callback(true, undefined)
}
} else {
const profile = next.value
@ -61,7 +61,7 @@ Activity.prototype = {
loadCcActors: function(iter, callback) {
const next = iter.next()
if (next.done) {
callback(true, 'ok')
callback(true, undefined)
} else {
const profile = next.value
KnownActors.retrieve(

View File

@ -130,7 +130,7 @@ Actor.prototype = {
this.urls.oauth_authorization = answer.endpoints.oauthAuthorizationEndpoint
}
this.valid = true
callback(true, 'ok')
callback(true, undefined)
} else {
callback(false, 'user profile: incorrect response from server')
console.log(answer)

View File

@ -28,7 +28,7 @@ const ConnectedUser = {
// Load the rest with webfinger / activity pub requests
ConnectedUser.actor.loadFromNameServerAddress(user_name + '@' + server_name, callback)
} else {
callback(false, 'local storage: no data')
callback(false, 'user not connected')
}
},
saveToLocalStorage: function () {
@ -76,7 +76,7 @@ const ConnectedUser = {
if (client_id && client_secret) {
ConnectedUser.tokens.server.client_id = client_id
ConnectedUser.tokens.server.client_secret = client_secret
callback(true, 'ok')
callback(true, undefined)
} else {
// generate keys and store them
var request = new XMLHttpRequest()
@ -93,7 +93,7 @@ const ConnectedUser = {
window.localStorage.setItem('client_id:' + ConnectedUser.actor.server, ConnectedUser.tokens.server.client_id)
window.localStorage.setItem('client_secret:' + ConnectedUser.actor.server, ConnectedUser.tokens.server.client_secret)
// Continue
callback(true, 'ok')
callback(true, undefined)
} else {
callback(false, 'OAuth: server did not register client.')
}
@ -124,7 +124,7 @@ const ConnectedUser = {
// Save the tokens
ConnectedUser.saveToLocalStorage()
// OK, return to callback
callback(true, 'ok')
callback(true, undefined)
} else if (request.readyState == 4) {
callback(false, 'OAuth: cannot get user tokens')
}

View File

@ -20,7 +20,7 @@ const KnownActors = {
// Retrieve an actor
retrieve: function(profile, callback) {
if (KnownActors.get(profile)) {
callback(true, 'ok')
callback(true, undefined)
} else {
const actor = new Actor()
actor.loadFromProfileUrl(
@ -35,7 +35,7 @@ const KnownActors = {
// A representation of "everyone" in Actor class
const publicActor = new Actor()
publicActor.fromDummyData('', 'public', 'Everyone', 'https://www.w3.org/ns/activitystreams#Public')
publicActor.fromDummyData('', 'public', 'Anyone', 'https://www.w3.org/ns/activitystreams#Public')
KnownActors.set(publicActor.urls.profile, publicActor)
// Exported structures

View File

@ -82,7 +82,7 @@ Message.prototype = {
var request = new XMLHttpRequest()
request.onreadystatechange = function() {
if (request.readyState == 4 && request.status == 201) {
callback(true, 'ok')
callback(true, undefined)
} else if (request.readyState == 4) {
callback(false, 'Send: Message not created on server')
}

View File

@ -51,7 +51,7 @@ Timeline.prototype = {
this.parseActivities(raw_activities, callback)
}.bind(this))
} else {
callback(true, 'ok')
callback(true, undefined)
}
}
}