alinea 1.4.9 → 1.5.0

package/dist/.init/content/pages/welcome.json

@@ -1,5 +1,5 @@
 {
-  "_id": "30ulr5UTckoCL1Upuj7QIxl3v7l",
+  "_id": "31EeizZwUMWJXGD691jpFPBcelk",
   "_type": "Page",
   "_index": "a0",
   "_seeded": "welcome.json",

package/dist/LICENSES.md

@@ -1,5 +1,32 @@
 This file contains the licenses of the bundled modules in this distribution.
 
+===
+
+# react-query@3.39.3 (MIT)
+
+MIT License
+
+Copyright (c) 2019 Tanner Linsley
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ===
 
 # rado@1.0.15 (MIT)
@@ -28,6 +55,32 @@ SOFTWARE.
 
 ===
 
+# @headlessui/react@2.2.0 (MIT)
+
+MIT License
+
+Copyright (c) 2020 Tailwind Labs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+===
+
 # lib0@0.2.88 (MIT)
 
 The MIT License (MIT)
@@ -78,11 +131,11 @@ IN THE SOFTWARE.
 
 ===
 
-# react-query@3.39.3 (MIT)
+# @badgateway/oauth2-client@3.2.0 (MIT)
 
 MIT License
 
-Copyright (c) 2019 Tanner Linsley
+Copyright (c) 2019-2023 Evert Pot
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -105,50 +158,33 @@ SOFTWARE.
 
 ===
 
-# domutils@3.1.0 (BSD-2-Clause)
-
-Copyright (c) Felix Böhm
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-THIS IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-===
-
-# @headlessui/react@2.2.0 (MIT)
+# @popperjs/core@2.11.8 (MIT)
 
-MIT License
+The MIT License (MIT)
 
-Copyright (c) 2020 Tailwind Labs
+Copyright (c) 2019 Federico Zivolo
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
 ===
 
-# domhandler@5.0.3 (BSD-2-Clause)
+# domutils@3.1.0 (BSD-2-Clause)
 
 Copyright (c) Felix Böhm
 All rights reserved.
@@ -165,7 +201,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===
 
-# entities@4.5.0 (BSD-2-Clause)
+# domhandler@5.0.3 (BSD-2-Clause)
 
 Copyright (c) Felix Böhm
 All rights reserved.
@@ -182,28 +218,19 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===
 
-# @popperjs/core@2.11.8 (MIT)
+# entities@4.5.0 (BSD-2-Clause)
 
-The MIT License (MIT)
+Copyright (c) Felix Böhm
+All rights reserved.
 
-Copyright (c) 2019 Federico Zivolo
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THIS IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 ===
@@ -440,23 +467,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-===
-
-# dom-serializer@2.0.0 (MIT)
-
-License
-
-(The MIT License)
-
-Copyright (c) 2014 The cheeriojs contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
 ===
 
 # react-is@16.13.1 (MIT)
@@ -486,9 +496,20 @@ SOFTWARE.
 
 ===
 
-# @headless-tree/react@0.0.15 (MIT)
+# dom-serializer@2.0.0 (MIT)
+
+License
+
+(The MIT License)
+
+Copyright (c) 2014 The cheeriojs contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-MIT
 
 ===
 
@@ -498,6 +519,12 @@ MIT
 
 ===
 
+# @headless-tree/react@0.0.15 (MIT)
+
+MIT
+
+===
+
 # y-prosemirror@1.2.15 (MIT)
 
 The MIT License (MIT)

package/dist/adapter/core/preview.js

@@ -1,57 +1,10 @@
+import {
+  parse
+} from "../../chunks/chunk-5LTN67OE.js";
 import "../../chunks/chunk-NZLE2WMY.js";
 
 // src/adapter/core/preview.tsx
 import { getPreviewPayloadFromCookies } from "alinea/preview/PreviewCookies";
-
-// node_modules/cookie-es/dist/index.mjs
-function parse(str, options) {
-  if (typeof str !== "string") {
-    throw new TypeError("argument str must be a string");
-  }
-  const obj = {};
-  const opt = options || {};
-  const dec = opt.decode || decode;
-  let index = 0;
-  while (index < str.length) {
-    const eqIdx = str.indexOf("=", index);
-    if (eqIdx === -1) {
-      break;
-    }
-    let endIdx = str.indexOf(";", index);
-    if (endIdx === -1) {
-      endIdx = str.length;
-    } else if (endIdx < eqIdx) {
-      index = str.lastIndexOf(";", eqIdx - 1) + 1;
-      continue;
-    }
-    const key = str.slice(index, eqIdx).trim();
-    if (opt?.filter && !opt?.filter(key)) {
-      index = endIdx + 1;
-      continue;
-    }
-    if (void 0 === obj[key]) {
-      let val = str.slice(eqIdx + 1, endIdx).trim();
-      if (val.codePointAt(0) === 34) {
-        val = val.slice(1, -1);
-      }
-      obj[key] = tryDecode(val, dec);
-    }
-    index = endIdx + 1;
-  }
-  return obj;
-}
-function decode(str) {
-  return str.includes("%") ? decodeURIComponent(str) : str;
-}
-function tryDecode(str, decode2) {
-  try {
-    return decode2(str);
-  } catch {
-    return str;
-  }
-}
-
-// src/adapter/core/preview.tsx
 import { previewStore } from "./previewContext.js";
 async function preview(cms, request, run) {
   const { AsyncLocalStorage } = await import("node:async_hooks");

package/dist/adapter/next/cms.js

@@ -2,7 +2,6 @@ import "../../chunks/chunk-NZLE2WMY.js";
 
 // src/adapter/next/cms.tsx
 import { Headers } from "@alinea/iso";
-import { COOKIE_NAME } from "alinea/cloud/CloudRemote";
 import { Client } from "alinea/core/Client";
 import { CMS } from "alinea/core/CMS";
 import { outcome } from "alinea/core/Outcome";
@@ -38,12 +37,15 @@ var NextCMS = class extends CMS {
   }
   async #authenticatedClient() {
     const { handlerUrl, apiKey } = await requestContext(this.config);
-    let authCookie;
+    const authCookies = [];
     try {
       const { cookies } = await import("next/headers");
       const cookie = await cookies();
-      const tokenCookie = cookie.get(COOKIE_NAME);
-      if (tokenCookie) authCookie = tokenCookie.value;
+      for (const { name, value } of cookie.getAll()) {
+        if (name.startsWith("alinea.")) {
+          authCookies.push([name, value]);
+        }
+      }
     } catch {
     }
     return new Client({
@@ -51,8 +53,12 @@ var NextCMS = class extends CMS {
       url: handlerUrl.href,
       applyAuth: (init) => {
         const headers = new Headers(init?.headers);
-        if (authCookie) headers.set("Cookie", `${COOKIE_NAME}=${authCookie}`);
-        else headers.set("Authorization", `Bearer ${apiKey}`);
+        headers.set("Authorization", `Bearer ${apiKey}`);
+        if (authCookies.length) {
+          for (const [name, value] of authCookies) {
+            headers.set("Cookie", `${name}=${value}`);
+          }
+        }
         return { ...init, headers };
       }
     });

package/dist/adapter/next/handler.d.ts

@@ -1,5 +1,5 @@
-import { type HandlerHooks } from 'alinea/backend/Handler';
 import { type BackendOptions } from 'alinea/backend/api/CreateBackend';
+import { type HandlerHooks } from 'alinea/backend/Handler';
 import type { RemoteConnection, RequestContext } from 'alinea/core/Connection';
 import { NextCMS } from './cms.js';
 type Handler = (request: Request) => Promise<Response>;

package/dist/adapter/next/handler.js

@@ -4,12 +4,12 @@ import {
 import "../../chunks/chunk-NZLE2WMY.js";
 
 // src/adapter/next/handler.ts
-import {
-  createHandler as createCoreHandler
-} from "alinea/backend/Handler";
 import {
   createBackend
 } from "alinea/backend/api/CreateBackend";
+import {
+  createHandler as createCoreHandler
+} from "alinea/backend/Handler";
 import { generatedSource } from "alinea/backend/store/GeneratedSource";
 import { JWTPreviews } from "alinea/backend/util/JWTPreviews";
 import { CloudRemote } from "alinea/cloud/CloudRemote";
@@ -19,7 +19,7 @@ import { requestContext } from "./context.js";
 var handlers = /* @__PURE__ */ new WeakMap();
 function createHandler(input) {
   const options = input instanceof NextCMS ? { cms: input } : input;
-  const remote = options.remote ?? (options.backend ? createBackend(options.backend) : (context) => new CloudRemote(context, options.cms));
+  const remote = options.remote ?? (options.backend ? createBackend(options.cms.config, options.backend) : (context) => new CloudRemote(context, options.cms));
   if (handlers.has(options.cms)) return handlers.get(options.cms);
   const config = options.cms.config;
   const db = PLazy.from(async () => {
@@ -52,7 +52,7 @@ function createHandler(input) {
           headers: { location: String(location) }
         });
       }
-      return handleBackend(request, context);
+      return await handleBackend(request, context);
     } catch (error) {
       console.error(error);
       return new Response("Internal server error", { status: 500 });

package/dist/backend/Auth.d.ts

@@ -1,6 +1,18 @@
+import { HttpError } from 'alinea/core/HttpError';
 export declare enum AuthAction {
     Status = "status",
     Handshake = "handshake",
     Login = "login",
-    Logout = "logout"
+    Logout = "logout",
+    Refresh = "refresh"
+}
+export declare class AuthError extends HttpError {
+    name: string;
+    constructor(message: string, options?: ErrorOptions);
+}
+export declare class MissingCredentialsError extends AuthError {
+    name: string;
+}
+export declare class InvalidCredentialsError extends AuthError {
+    name: string;
 }

package/dist/backend/Auth.js

@@ -1,13 +1,30 @@
 import "../chunks/chunk-NZLE2WMY.js";
 
 // src/backend/Auth.ts
+import { HttpError } from "alinea/core/HttpError";
 var AuthAction = /* @__PURE__ */ ((AuthAction2) => {
   AuthAction2["Status"] = "status";
   AuthAction2["Handshake"] = "handshake";
   AuthAction2["Login"] = "login";
   AuthAction2["Logout"] = "logout";
+  AuthAction2["Refresh"] = "refresh";
   return AuthAction2;
 })(AuthAction || {});
+var AuthError = class extends HttpError {
+  name = "AuthError";
+  constructor(message, options) {
+    super(401, message, options);
+  }
+};
+var MissingCredentialsError = class extends AuthError {
+  name = "MissingCredentialsError";
+};
+var InvalidCredentialsError = class extends AuthError {
+  name = "InvalidCredentialsError";
+};
 export {
-  AuthAction
+  AuthAction,
+  AuthError,
+  InvalidCredentialsError,
+  MissingCredentialsError
 };

package/dist/backend/HandleAction.d.ts

@@ -1,4 +1,5 @@
 export declare enum HandleAction {
+    Auth = "auth",
     User = "user",
     Resolve = "resolve",
     Pending = "pending",

package/dist/backend/HandleAction.js

@@ -2,6 +2,7 @@ import "../chunks/chunk-NZLE2WMY.js";
 
 // src/backend/HandleAction.ts
 var HandleAction = /* @__PURE__ */ ((HandleAction2) => {
+  HandleAction2["Auth"] = "auth";
   HandleAction2["User"] = "user";
   HandleAction2["Resolve"] = "resolve";
   HandleAction2["Pending"] = "pending";

package/dist/backend/Handler.js

@@ -18,6 +18,7 @@ import { HttpError } from "alinea/core/HttpError";
 import { getScope } from "alinea/core/Scope";
 import { ShaMismatchError } from "alinea/core/source/ShaMismatchError";
 import { base64 } from "alinea/core/util/Encoding";
+import { InvalidCredentialsError, MissingCredentialsError } from "./Auth.js";
 import { HandleAction } from "./HandleAction.js";
 import { createPreviewParser } from "./resolver/ParsePreview.js";
 var limit = pLimit(1);
@@ -62,30 +63,32 @@ function createHandler({
       const auth = params.get("auth");
       let cnx = remote(context);
       let userCtx;
-      const action = params.get("action");
       if (auth) return cnx.authenticate(request);
+      const action = params.get("action");
       const expectJson = () => {
         const acceptsJson = request.headers.get("accept")?.includes("application/json");
         if (!acceptsJson) throw new Response("Expected JSON", { status: 400 });
       };
-      if (action === HandleAction.User && request.method === "GET") {
-        expectJson();
-        try {
-          const { user } = await cnx.verify(request);
-          return Response.json(user);
-        } catch {
-          return Response.json(null);
-        }
-      }
       try {
         userCtx = await cnx.verify(request);
         cnx = remote(userCtx);
-      } catch {
-        const authorization = request.headers.get("authorization");
-        const bearer = authorization?.slice("Bearer ".length);
-        if (!context.apiKey) throw new Error("Missing API key");
-        if (bearer !== context.apiKey)
-          throw new Error("Expected matching api key");
+      } catch (cause) {
+        if (cause instanceof MissingCredentialsError) {
+          const authorization = request.headers.get("authorization");
+          const bearer = authorization?.slice("Bearer ".length);
+          if (!context.apiKey)
+            throw new MissingCredentialsError("Missing API key", { cause });
+          if (bearer !== context.apiKey)
+            throw new InvalidCredentialsError("Expected matching api key", {
+              cause
+            });
+        } else {
+          throw cause;
+        }
+      }
+      if (action === HandleAction.User && request.method === "GET") {
+        expectJson();
+        return Response.json(userCtx ? userCtx.user : null);
       }
       const expectUser = () => {
         if (!userCtx) throw new Response("Unauthorized", { status: 401 });
@@ -198,7 +201,7 @@ function createHandler({
           return new Response("OK", { status: 200 });
         }
         if (!cnx.previewUpload) throw new Response("Bad Request", { status: 400 });
-        return cnx.previewUpload(entryId);
+        return await cnx.previewUpload(entryId);
       }
       if (action === HandleAction.Draft && request.method === "GET") {
         expectJson();
@@ -215,15 +218,18 @@ function createHandler({
         const draft = { ...data, draft: base64.parse(data.draft) };
         return Response.json(await cnx.storeDraft(draft));
       }
+      return new Response("Bad Request", { status: 400 });
     } catch (error) {
       if (error instanceof Response) return error;
       console.error(error);
       return Response.json(
-        { success: false, error: String(error) },
+        {
+          success: false,
+          error: error instanceof Error ? error.message : String(error)
+        },
         { status: error instanceof HttpError ? error.code : 500 }
       );
     }
-    return new Response("Bad Request", { status: 400 });
   };
 }
 export {

package/dist/backend/api/BasicAuth.d.ts

@@ -1,5 +1,4 @@
-import type { AuthApi, AuthedContext } from 'alinea/core/Connection';
-import type { RequestContext } from 'alinea/core/Connection';
+import type { AuthApi, AuthedContext, RequestContext } from 'alinea/core/Connection';
 export interface Verifier {
     (username: string, password: string): boolean | Promise<boolean>;
 }

package/dist/backend/api/BasicAuth.js

@@ -3,13 +3,17 @@ import "../../chunks/chunk-NZLE2WMY.js";
 // src/backend/api/BasicAuth.ts
 import { AuthResultType } from "alinea/cloud/AuthResult";
 import { atob } from "alinea/core/util/Encoding";
-import { AuthAction } from "../Auth.js";
+import {
+  AuthAction,
+  InvalidCredentialsError,
+  MissingCredentialsError
+} from "../Auth.js";
 var BasicAuth = class {
   #context;
   #verify;
   constructor(context, verify) {
-    this.#verify = verify;
     this.#context = context;
+    this.#verify = verify;
   }
   async authenticate(request) {
     try {
@@ -33,12 +37,13 @@ var BasicAuth = class {
   async verify(request) {
     const ctx = this.#context;
     const auth = request.headers.get("Authorization");
-    if (!auth) throw unauthorized();
+    if (!auth) throw new MissingCredentialsError("Missing authorization header");
     const [scheme, token] = auth.split(" ", 2);
-    if (scheme !== "Basic") throw unauthorized();
+    if (scheme !== "Basic")
+      throw new MissingCredentialsError("Invalid authorization scheme");
     const [username, password] = atob(token).split(":");
     const authorized = await this.#verify(username, password);
-    if (!authorized) throw unauthorized();
+    if (!authorized) throw new InvalidCredentialsError("Invalid credentials");
     return {
       ...ctx,
       user: { sub: username },

package/dist/backend/api/CreateBackend.d.ts

@@ -1,6 +1,8 @@
+import type { Config } from 'alinea/core/Config';
 import type { RemoteConnection, RequestContext } from 'alinea/core/Connection';
 import * as driver from 'rado/driver';
 import { type GithubOptions } from './GithubApi.js';
+import { type OAuth2Options } from './OAuth2.js';
 export type AvailableDrivers = 'd1' | 'mysql2' | '@neondatabase/serverless' | '@vercel/postgres' | 'pg' | '@electric-sql/pglite' | 'sql.js' | '@libsql/client';
 type DatabaseClient<Driver extends AvailableDrivers> = Parameters<(typeof driver)[Driver]>[0];
 type DatabaseOption<Driver extends AvailableDrivers> = {
@@ -9,10 +11,11 @@ type DatabaseOption<Driver extends AvailableDrivers> = {
 };
 export type DatabaseDeclaration = DatabaseOption<'d1'> | DatabaseOption<'mysql2'> | DatabaseOption<'@neondatabase/serverless'> | DatabaseOption<'@vercel/postgres'> | DatabaseOption<'pg'> | DatabaseOption<'@electric-sql/pglite'> | DatabaseOption<'sql.js'> | DatabaseOption<'@libsql/client'>;
 export interface BackendOptions {
-    auth(username: string, password: string): boolean | Promise<boolean>;
+    auth?(username: string, password: string): boolean | Promise<boolean>;
+    oauth2?: OAuth2Options;
     database: DatabaseDeclaration;
     github: GithubOptions;
 }
-export declare function createBackend(options: BackendOptions): (context: RequestContext) => RemoteConnection;
+export declare function createBackend(config: Config, options: BackendOptions): (context: RequestContext) => RemoteConnection;
 export declare function createRemote(...impl: Array<Partial<RemoteConnection>>): RemoteConnection;
 export {};

package/dist/backend/api/CreateBackend.js

@@ -48,6 +48,9 @@ import {
   __export
 } from "../../chunks/chunk-NZLE2WMY.js";
 
+// src/backend/api/CreateBackend.ts
+import { assert } from "alinea/core/util/Assert";
+
 // node_modules/rado/dist/driver.js
 var driver_exports = {};
 __export(driver_exports, {
@@ -2492,7 +2495,8 @@ function connect8(db) {
 import { BasicAuth } from "./BasicAuth.js";
 import { DatabaseApi } from "./DatabaseApi.js";
 import { GithubApi } from "./GithubApi.js";
-function createBackend(options) {
+import { OAuth2 } from "./OAuth2.js";
+function createBackend(config, options) {
   const db = driver_exports[options.database.driver](options.database.client);
   return (context) => {
     const { user } = context;
@@ -2502,7 +2506,8 @@ function createBackend(options) {
       ...options.github
     });
     const dbApi = new DatabaseApi(context, { db });
-    const auth = new BasicAuth(context, options.auth);
+    assert(options.oauth2 ?? options.auth, "No auth method provided");
+    const auth = options.oauth2 ? new OAuth2(context, config, options.oauth2) : new BasicAuth(context, options.auth);
     return createRemote(ghApi, dbApi, auth);
   };
 }