fedipod-bb 0.4.2 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fedipod-bb",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "FediPod-BB: a forum website whose record lives on a Solid pod.",
   "license": "MIT",
   "author": "Jeff Zucker",

package/site/bb.js

@@ -11,7 +11,7 @@
 //   #/  #/c/<slug>  #/t/<slug>/<tid>
 
 import { reader, placeOf, authorLabel, cacheKey, categoryBase, cleanHtml } from './read.mjs';
-import { MastoLogin, hostOfHandle, serverKind, actorOfHandle } from './masto.mjs';
+import { MastoLogin, hostOfHandle, serverKind, actorOfHandle, returnAddress } from './masto.mjs';
 import * as pod from './pod.mjs';
 import { mine as keptByReader } from './mine.mjs';
 import { readState } from './seen.mjs';
@@ -47,7 +47,7 @@ let freshRead = false;
 const readerFetch = (url, init = {}) => fetch(url, freshRead ? { ...init, cache: 'reload' } : init);
 const makeReader = (session = null) => reader({ session, fetch: readerFetch });
 let read = makeReader();
-const login = new MastoLogin({ storage: localStorage, redirectUri: location.origin + location.pathname + location.search });
+const login = new MastoLogin({ storage: localStorage, redirectUri: returnAddress(location.href) });
 // What this reader has already read. Theirs, in their own browser: a public
 // forum has nowhere to keep it and no business keeping it.
 const seen = base ? readState({ storage: localStorage, forum: base }) : null;

package/site/masto.mjs

@@ -54,6 +54,15 @@ export async function serverKind(host, front, f = globalThis.fetch.bind(globalTh
   } catch { return { kind: 'unknown', host }; }
 }
 
+// Where Mastodon sends the reader back: this page, without the sign-in's own
+// code and state. Mastodon hands out the key only for the address it approved,
+// and the page comes back with those two added, so both legs name it this way.
+export function returnAddress(href) {
+  const u = new URL(href);
+  for (const k of ['code', 'state', 'iss']) u.searchParams.delete(k);
+  return u.origin + u.pathname + u.search;
+}
+
 export class MastoLogin {
   // `storage` is localStorage-shaped; `fetch` is the page's.
   constructor({ fetch: f = globalThis.fetch.bind(globalThis), storage, redirectUri }) {