Mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-10-31 22:40:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix keeping track of the wrong instance url (for different instance/api domains)

Browse source
This commit is contained in:
f0x 2022-09-11 22:10:11 +02:00
parent 8474dd434a
commit 3ce9dfe7d6
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
web/source/settings-panel/components/login.jsx
View file

@ -33,14 +33,15 @@ module.exports = function Login({error}) {
React.useEffect(() => {
// check if current domain runs an instance
let currentDomain = window.location.origin;
Promise.try(() => {
console.log("trying", window.location.origin);
return dispatch(api.instance.fetch(window.location.origin));
}).then((json) => {
console.log("trying", currentDomain);
return dispatch(api.instance.fetch(currentDomain));
}).then(() => {
if (instanceFieldRef.current.length == 0) { // user hasn't started typing yet
dispatch(setInstance(json.uri));
instanceFieldRef.current = json.uri;
setInstanceField(json.uri);
dispatch(setInstance(currentDomain));
instanceFieldRef.current = currentDomain;
setInstanceField(currentDomain);
}
}).catch((e) => {
console.log("Current domain does not host a valid instance: ", e);
@ -48,14 +49,15 @@ module.exports = function Login({error}) {
}, []);
function tryInstance() {
let domain = instanceFieldRef.current;
Promise.try(() => {
return dispatch(api.instance.fetch(instanceFieldRef.current)).catch((e) => {
return dispatch(api.instance.fetch(domain)).catch((e) => {
// TODO: clearer error messages for common errors
console.log(e);
throw e;
});
}).then((instance) => {
dispatch(setInstance(instance.uri));
}).then(() => {
dispatch(setInstance(domain));
return dispatch(api.oauth.register()).catch((e) => {
console.log(e);

2
web/source/settings-panel/lib/api/index.js
View file

@ -106,7 +106,7 @@ function fetchInstance(domain) {
return apiCall("GET", "/api/v1/instance")(dispatch, () => fakeState);
}).then((json) => {
if (json && json.uri) { // TODO: validate instance json more?
dispatch(setInstanceInfo([json.uri, json]));
dispatch(setInstanceInfo([domain, json]));
return json;
}
});