From 2e99d37646c94b7d7e92070c82f346b753f20724 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Sat, 2 Sep 2023 11:34:44 +0200 Subject: [PATCH] Test with overriding through environment variables --- .gitignore | 1 + src/Logic/Osm/OsmConnection.ts | 60 ++++++++++++++++++++++------------ tsconfig.json | 3 +- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 41f172fe8..a9dcf16ad 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ index_*.ts .~lock.* *.doctest.ts service-worker.js +.env .vscode/* !.vscode/settings.json diff --git a/src/Logic/Osm/OsmConnection.ts b/src/Logic/Osm/OsmConnection.ts index 76c419761..b4b47d68e 100644 --- a/src/Logic/Osm/OsmConnection.ts +++ b/src/Logic/Osm/OsmConnection.ts @@ -1,9 +1,9 @@ // @ts-ignore -import {osmAuth} from "osm-auth" -import {Store, Stores, UIEventSource} from "../UIEventSource" -import {OsmPreferences} from "./OsmPreferences" -import {Utils} from "../../Utils" -import {LocalStorageSource} from "../Web/LocalStorageSource"; +import { osmAuth } from "osm-auth" +import { Store, Stores, UIEventSource } from "../UIEventSource" +import { OsmPreferences } from "./OsmPreferences" +import { Utils } from "../../Utils" +import { LocalStorageSource } from "../Web/LocalStorageSource" import * as config from "../../../package.json" export default class UserDetails { public loggedIn = false @@ -34,7 +34,8 @@ export interface AuthConfig { export type OsmServiceState = "online" | "readonly" | "offline" | "unknown" | "unreachable" export class OsmConnection { - public static readonly oauth_configs: Record = config.config.oauth_credentials + public static readonly oauth_configs: Record = + config.config.oauth_credentials public auth public userDetails: UIEventSource public isLoggedIn: Store @@ -75,6 +76,19 @@ export class OsmConnection { console.debug("Using backend", this._oauth_config.url) this._iframeMode = Utils.runningFromConsole ? false : window !== window.top + // Check if there are settings available in environment variables, and if so, use those + if ( + import.meta.env.VITE_OSM_OAUTH_CLIENT_ID !== undefined && + import.meta.env.VITE_OSM_OAUTH_SECRET !== undefined + ) { + console.debug("Using environment variables for oauth config") + this._oauth_config = { + oauth_client_id: import.meta.env.VITE_OSM_OAUTH_CLIENT_ID, + oauth_secret: import.meta.env.VITE_OSM_OAUTH_SECRET, + url: "https://www.openstreetmap.org", + } + } + this.userDetails = new UIEventSource( new UserDetails(this._oauth_config.url), "userDetails" @@ -182,7 +196,9 @@ export class OsmConnection { const self = this console.log("Trying to log in...") this.updateAuthObject() - LocalStorageSource.Get("location_before_login").setData(Utils.runningFromConsole ? undefined : window.location.href) + LocalStorageSource.Get("location_before_login").setData( + Utils.runningFromConsole ? undefined : window.location.href + ) this.auth.xhr( { method: "GET", @@ -195,7 +211,7 @@ export class OsmConnection { if (err.status == 401) { console.log("Clearing tokens...") // Not authorized - our token probably got revoked - self.auth.logout(); + self.auth.logout() self.LogOut() } return @@ -240,7 +256,7 @@ export class OsmConnection { if (homeEl !== undefined && homeEl[0] !== undefined) { const lat = parseFloat(homeEl[0].getAttribute("lat")) const lon = parseFloat(homeEl[0].getAttribute("lon")) - data.home = {lat: lat, lon: lon} + data.home = { lat: lat, lon: lon } } self.loadingStatus.setData("logged-in") @@ -344,13 +360,13 @@ export class OsmConnection { console.warn("Dryrun enabled - not actually opening note with text ", text) return new Promise<{ id: number }>((ok) => { window.setTimeout( - () => ok({id: Math.floor(Math.random() * 1000)}), + () => ok({ id: Math.floor(Math.random() * 1000) }), Math.random() * 5000 ) }) } const auth = this.auth - const content = {lat, lon, text} + const content = { lat, lon, text } const response = await this.post("notes.json", JSON.stringify(content), { "Content-Type": "application/json", }) @@ -378,7 +394,7 @@ export class OsmConnection { console.warn("Dryrun enabled - not actually uploading GPX ", gpx) return new Promise<{ id: number }>((ok, error) => { window.setTimeout( - () => ok({id: Math.floor(Math.random() * 1000)}), + () => ok({ id: Math.floor(Math.random() * 1000) }), Math.random() * 5000 ) }) @@ -419,7 +435,7 @@ export class OsmConnection { }) const parsed = JSON.parse(response) console.log("Uploaded GPX track", parsed) - return {id: parsed} + return { id: parsed } } public addCommentToNote(id: number | string, text: string): Promise { @@ -478,7 +494,9 @@ export class OsmConnection { client_id: this._oauth_config.oauth_client_id, url: this._oauth_config.url, scope: "read_prefs write_prefs write_api write_gpx write_notes", - redirect_uri: Utils.runningFromConsole ? "https://mapcomplete.org/land.html" : window.location.protocol + "//" + window.location.host + "/land.html", + redirect_uri: Utils.runningFromConsole + ? "https://mapcomplete.org/land.html" + : window.location.protocol + "//" + window.location.host + "/land.html", singlepage: !standalone, auto: true, }) @@ -487,13 +505,13 @@ export class OsmConnection { /** * To be called by land.html */ - public finishLogin(callback: ((previousURL: string) => void)) { - this.auth.authenticate(function() { + public finishLogin(callback: (previousURL: string) => void) { + this.auth.authenticate(function () { // Fully authed at this point console.log("Authentication successful!") const previousLocation = LocalStorageSource.Get("location_before_login") callback(previousLocation.data) - }); + }) } private CheckForMessagesContinuously() { @@ -512,7 +530,7 @@ export class OsmConnection { private UpdateCapabilities(): void { const self = this - this.FetchCapabilities().then(({api, gpx}) => { + this.FetchCapabilities().then(({ api, gpx }) => { self.apiIsOnline.setData(api) self.gpxServiceIsOnline.setData(gpx) }) @@ -520,18 +538,18 @@ export class OsmConnection { private async FetchCapabilities(): Promise<{ api: OsmServiceState; gpx: OsmServiceState }> { if (Utils.runningFromConsole) { - return {api: "online", gpx: "online"} + return { api: "online", gpx: "online" } } const result = await Utils.downloadAdvanced(this.Backend() + "/api/0.6/capabilities") if (result["content"] === undefined) { console.log("Something went wrong:", result) - return {api: "unreachable", gpx: "unreachable"} + return { api: "unreachable", gpx: "unreachable" } } const xmlRaw = result["content"] const parsed = new DOMParser().parseFromString(xmlRaw, "text/xml") const statusEl = parsed.getElementsByTagName("status")[0] const api = statusEl.getAttribute("api") const gpx = statusEl.getAttribute("gpx") - return {api, gpx} + return { api, gpx } } } diff --git a/tsconfig.json b/tsconfig.json index 293116044..e491c3572 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,7 +9,8 @@ "resolveJsonModule": true, "isolatedModules": true, "esModuleInterop": true, - "skipLibCheck": true + "skipLibCheck": true, + "types": ["vite/client"] }, "ts-node": { "esm": true,