1.18.4

Fix OSM auth not being loaded correctly on launch
2026-04-02 14:41:19 +04:00 · 2026-04-02 14:40:20 +04:00
6 changed files with 21 additions and 6 deletions
--- a/app/services/osm-auth.js
+++ b/app/services/osm-auth.js
@@ -7,7 +7,15 @@ class MarcoOsmAuthStorage {
    localStorage.setItem('marco:osm_auth_state', serializedState);
  }
  loadState() {
-    return localStorage.getItem('marco:osm_auth_state');
+    const state = localStorage.getItem('marco:osm_auth_state');
+    if (!state) return false;
+    try {
+      JSON.parse(state);
+      return state;
+    } catch (e) {
+      console.warn('Failed to parse OSM auth state', e);
+      return false;
+    }
  }
 }

@@ -45,6 +53,11 @@ export default class OsmAuthService extends Service {
  }

  async restoreSession() {
+    try {
+      await this.oauthClient.ready;
+    } catch (e) {
+      console.warn('oauthClient.ready failed', e);
+    }
    const isAuthorized = await this.oauthClient.isAuthorized();
    if (isAuthorized) {
      this.isConnected = true;
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "marco",
-  "version": "1.18.3",
+  "version": "1.18.4",
  "private": true,
  "description": "Unhosted maps app",
  "repository": {
--- a/release/assets/main-0ky279gM.js
+++ b/release/assets/main-0ky279gM.js
--- a/release/assets/modules-4-12-BoBOOmYd.js
+++ b/release/assets/modules-4-12-BoBOOmYd.js
--- a/release/index.html
+++ b/release/index.html
@@ -39,7 +39,7 @@
    <meta name="msapplication-TileColor" content="#F6E9A6">
    <meta name="msapplication-TileImage" content="/icons/icon-144.png">

-  <script type="module" crossorigin src="/assets/main-BPMVqwjL.js"></script>
+  <script type="module" crossorigin src="/assets/main-0ky279gM.js"></script>
  <link rel="stylesheet" crossorigin href="/assets/main-BF2Ls-fG.css">
 </head>
  <body>
--- a/tests/unit/services/osm-auth-test.js
+++ b/tests/unit/services/osm-auth-test.js
@@ -52,6 +52,7 @@ module('Unit | Service | osm-auth', function (hooks) {
    // Because restoreSession runs in the constructor, we might need to overwrite it after, but it's async.
    // Let's just create it, let the original restoreSession fail or do nothing, and then we stub and re-call it.

+    service.oauthClient.ready = Promise.resolve();
    service.oauthClient.isAuthorized = async () => true;
    window.localStorage.setItem('marco:osm_user_display_name', 'CachedName');

@@ -68,6 +69,7 @@ module('Unit | Service | osm-auth', function (hooks) {
  test('it fetches user info when logged in but no cached name', async function (assert) {
    let service = this.owner.factoryFor('service:osm-auth').create();

+    service.oauthClient.ready = Promise.resolve();
    service.oauthClient.isAuthorized = async () => true;
    service.oauthClient.getTokens = async () => ({ accessToken: 'fake-token' });
    // Ensure localStorage is empty for this key
Author	SHA1	Message	Date
Râu Cao	480c97fb9d	1.18.4 All checks were successful CI / Lint (push) Successful in 29s Details CI / Test (push) Successful in 45s Details	2026-04-02 14:41:19 +04:00
Râu Cao	179cf49370	Fix OSM auth not being loaded correctly on launch	2026-04-02 14:40:20 +04:00