Remove any extra quotes that were stored with legacy tokens

(closes #129)

CHANGELOG.md

@@ -15,6 +15,17 @@ _Breaking changes, which may affect downstream projects, are marked with a_ ⚠
 [#xxx]: https://github.com/osmlab/osm-auth/issues/xxx
 -->
 
+## 2.5.0
+##### 2024-Apr-26
+* Remove any extra quotes that were stored with legacy tokens ([#129])
+* Allow locale to be passed to login page ([#23], [#130], thanks [@k-yle])
+
+[#23]: https://github.com/osmlab/osm-auth/issues/23
+[#129]: https://github.com/osmlab/osm-auth/issues/129
+[#130]: https://github.com/osmlab/osm-auth/issues/130
+[@k-yle]: https://github.com/k-yle
+
+
 ## 2.4.0
 ##### 2024-Jan-04
 * Remove `store` dependency ([#126])

dist/osm-auth.cjs

@@ -37,10 +37,17 @@ function osmAuth(o) {
     };
   }
   function token(k, v) {
-    if (arguments.length === 1)
-      return _store.getItem(o.url + k);
-    else if (arguments.length === 2)
-      return _store.setItem(o.url + k, v);
+    var key = o.url + k;
+    if (arguments.length === 1) {
+      var val = _store.getItem(key) || "";
+      return val.replace(/"/g, "");
+    } else if (arguments.length === 2) {
+      if (v) {
+        return _store.setItem(key, v);
+      } else {
+        return _store.removeItem(key);
+      }
+    }
   }
   oauth.authenticated = function() {
     return !!token("oauth2_access_token");
@@ -123,7 +130,8 @@ function osmAuth(o) {
       scope: o.scope,
       state,
       code_challenge: pkce.code_challenge,
-      code_challenge_method: pkce.code_challenge_method
+      code_challenge_method: pkce.code_challenge_method,
+      locale: o.locale || ""
     });
     if (o.singlepage) {
       if (_store.isMocked) {

src/osm-auth.mjs

@@ -47,8 +47,19 @@ export function osmAuth(o) {
    * @return {string?}  If getting, returns the stored value or `null`.  If setting, returns `undefined`.
    */
   function token(k, v) {
-    if (arguments.length === 1) return _store.getItem(o.url + k);
-    else if (arguments.length === 2) return _store.setItem(o.url + k, v);
+    var key = o.url + k;
+    if (arguments.length === 1) {
+      var val = _store.getItem(key) || '';
+      // Note: legacy tokens might be wrapped in double quotes - remove them, see #129
+      return val.replace(/"/g, '');
+
+    } else if (arguments.length === 2) {
+      if (v) {
+        return _store.setItem(key, v);
+      } else {
+        return _store.removeItem(key);
+      }
+    }
   }
 
 
@@ -195,7 +206,7 @@ export function osmAuth(o) {
         state: state,
         code_challenge: pkce.code_challenge,
         code_challenge_method: pkce.code_challenge_method,
-        locale: o.locale || "",
+        locale: o.locale || '',
       });
 
     if (o.singlepage) {