contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

UX: minimal fix for https://github.com/pietervdvn/MapComplete/issues/2284

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-02-24 18:41:13 +01:00
parent 8d643fcf69
commit 2d673089ab
2 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/land.ts
View file

@ -2,8 +2,6 @@ import { OsmConnection } from "../src/Logic/Osm/OsmConnection"
import Constants from "../src/Models/Constants"
import { Utils } from "../src/Utils"
import { UIEventSource } from "../src/Logic/UIEventSource"
import { VariableUiElement } from "../src/UI/Base/VariableUIElement"
import Combine from "../src/UI/Base/Combine"
import { QueryParameters } from "../src/Logic/Web/QueryParameters"
console.log("Authorizing...")
@ -13,12 +11,6 @@ console.log("Prev state is", key, st)
const tokenSrc = new UIEventSource("")
const debug = new UIEventSource<string[]>([])
new Combine([
new VariableUiElement(
debug.map((debug) => "<ul><li>" + debug.join("</li><li>") + "</li></ul>")
),
new VariableUiElement(tokenSrc),
]).AttachTo("token")
const connection = new OsmConnection()
connection.finishLogin(async () => {

32
src/land.ts
View file

@ -1,16 +1,22 @@
import { QueryParameters } from "./Logic/Web/QueryParameters"
import { OsmConnection } from "./Logic/Osm/OsmConnection"
import Constants from "./Models/Constants"
import { LocalStorageSource } from "./Logic/Web/LocalStorageSource"
console.log("Authorizing...")
const key = Constants.osmAuthConfig.url + "oauth2_state"
const st = window.localStorage.getItem(key)
console.log("Prev state is", key, st)
new OsmConnection().finishLogin((previousURL) => {
const fallback = window.location.protocol + "//" + window.location.host + "/index.html"
previousURL ??= fallback
if (previousURL.indexOf("/land") > 0) {
previousURL = fallback
}
console.log("Redirecting to", previousURL)
window.location.href = previousURL
})
if (QueryParameters.wasInitialized("error")) {
// error=access_denied&error_description=The+resource+owner+or+authorization+server+denied+the+request.
alert("Access was denied")
const previousLocation = LocalStorageSource.get("location_before_login")
window.location.href = previousLocation.data ?? "./"
} else {
new OsmConnection().finishLogin((previousURL) => {
const fallback = window.location.protocol + "//" + window.location.host + "/index.html"
previousURL ??= fallback
if (previousURL.indexOf("/land") > 0) {
previousURL = fallback
}
console.log("Redirecting to", previousURL)
window.location.href = previousURL
})
}