@protobase/ui 0.44.4 → 0.45.0

package/dist/app/native-auth-fetch.js

@@ -11,37 +11,65 @@ const nullBodyStatuses = [
 const encodedSeparator = /%2f|%5c/i;
 const isPlatform = (platform) => Object.hasOwn(capacitorOrigin, platform);
 const allowedUrl = (url, apiOrigin) => url.origin === apiOrigin && !url.username && !url.password && url.pathname.startsWith(`${authBasePath}/`) && !encodedSeparator.test(url.pathname);
+/**
+* The native call of a sign-in request: on Android Protobase's own ProtobaseAuth plugin, which checks the address,
+* names the Capacitor origin, refuses redirects and keeps Set-Cookie from the page itself; on iOS, until it has that
+* plugin too, Capacitor's native HTTP with the origin named here.
+*/
+const nativeAuthCall = (platform, { url, method, headers, data }) => {
+	const withData = data === void 0 ? {} : { data };
+	if (platform === "android") return [
+		"ProtobaseAuth",
+		"request",
+		{
+			url,
+			method,
+			headers,
+			...withData
+		}
+	];
+	return [
+		"CapacitorHttp",
+		"request",
+		{
+			url,
+			method,
+			headers: {
+				...headers,
+				origin: capacitorOrigin[platform]
+			},
+			...withData,
+			responseType: "text",
+			disableRedirects: true
+		}
+	];
+};
 const bodyOf = ({ status, headers, data }) => {
 	if (nullBodyStatuses.includes(status)) return null;
 	if (Object.entries(headers).some(([name, value]) => name.toLowerCase() === "content-type" && value.startsWith("application/json"))) return JSON.stringify(data);
 	return typeof data === "string" ? data : JSON.stringify(data);
 };
 /**
-* A `fetch` for the app's sign-in, at `<apiOrigin>/api/auth/...` only, through Capacitor's native HTTP: the session
-* cookie lives in the device's cookie jar, which native HTTP sends and keeps, and the request names the Capacitor
-* origin of the platform, which the server trusts for sign-in with a mobile section. The page cannot set `Cookie`, so
-* the cookie comes from the native jar alone. Any other address is refused before the bridge is called.
+* A `fetch` for the app's sign-in, at `<apiOrigin>/api/auth/...` only, through native HTTP (`nativeAuthCall`): the
+* session cookie lives in the device's cookie jar, which native HTTP sends and keeps, and the request names the
+* Capacitor origin of the platform, which the server trusts for sign-in with a mobile section. The page cannot set
+* `Cookie`, so the cookie comes from the native jar alone. Any other address is refused before the bridge is called.
 */
 const nativeAuthFetch = (bridge, apiOrigin) => {
 	const platform = bridge.getPlatform();
 	if (!isPlatform(platform)) throw new Error(`Signing in through native HTTP is for iOS and Android, not ${platform}`);
-	const origin = capacitorOrigin[platform];
 	return async (input, init) => {
 		const request = new Request(input, init);
 		const url = new URL(request.url);
 		if (!allowedUrl(url, apiOrigin)) throw new Error(`Native sign-in requests go to ${apiOrigin}${authBasePath}/ only, not ${request.url}`);
 		const withBody = request.method !== "GET" && request.method !== "HEAD";
-		const answer = await bridge.nativePromise("CapacitorHttp", "request", {
+		const call = nativeAuthCall(platform, {
 			url: url.href,
 			method: request.method,
-			headers: {
-				...Object.fromEntries(request.headers),
-				origin
-			},
-			...withBody && { data: await request.text() },
-			responseType: "text",
-			disableRedirects: true
+			headers: Object.fromEntries(request.headers),
+			...withBody && { data: await request.text() }
 		});
+		const answer = await bridge.nativePromise(...call);
 		const headers = Object.entries(answer.headers).filter(([name]) => name.toLowerCase() !== "set-cookie");
 		return new Response(bodyOf(answer), {
 			status: answer.status,

package/dist/organizations/messages.js

@@ -78,7 +78,8 @@ const text = defineMessages({
 		newOrganization: "New organization",
 		newOrganizationDescription: "You become its owner, with every role, and work in it once it is made.",
 		invitationsForYou: "Invitations for you",
-		invitationsForYouDescription: "Open the link in the invitation email to accept one.",
+		invitationsForYouDescription: "Accept one to become a member and work there.",
+		accept: "Accept",
 		anOrganization: "An organization",
 		noAppRoles: "no app roles",
 		until: (date) => `Until ${date}`,
@@ -165,7 +166,8 @@ const text = defineMessages({
 		newOrganization: "Nieuwe organisatie",
 		newOrganizationDescription: "Je wordt de eigenaar, met elke rol, en werkt erin zodra die is gemaakt.",
 		invitationsForYou: "Uitnodigingen voor jou",
-		invitationsForYouDescription: "Open de link in de uitnodigingsmail om er een te accepteren.",
+		invitationsForYouDescription: "Accepteer er een om lid te worden en daar te werken.",
+		accept: "Accepteren",
 		anOrganization: "Een organisatie",
 		noAppRoles: "geen app-rollen",
 		until: (date) => `Tot ${date}`,

package/dist/organizations/organizations-page.js

@@ -63,35 +63,50 @@ const NewOrganization = ({ basePath }) => {
 		})]
 	});
 };
-const YourInvitations = () => {
+/** The invitations for the person's own address, each to accept, which opens the app in its organization. */
+const YourInvitations = ({ basePath }) => {
 	const { session, organizations } = useAuth();
 	const [invitations, setInvitations] = useState([]);
+	const { busy, error, run } = useAction();
 	useEffect(() => {
 		session.organizations.myInvitations().then(setInvitations, () => setInvitations([]));
 	}, [session]);
 	if (invitations.length === 0) return null;
 	const roles = organizations?.roles ?? [];
-	return /* @__PURE__ */ jsx(AccountSection, {
+	const accept = (invitationId) => run(async () => {
+		await session.organizations.acceptMine(invitationId);
+		reopenIn(basePath);
+	});
+	return /* @__PURE__ */ jsxs(AccountSection, {
 		title: text("invitationsForYou"),
 		description: text("invitationsForYouDescription"),
-		children: /* @__PURE__ */ jsx("ul", {
+		children: [/* @__PURE__ */ jsx(SectionError, { message: error }), /* @__PURE__ */ jsx("ul", {
 			className: "divide-y rounded-md border",
 			children: invitations.map((invitation) => /* @__PURE__ */ jsxs("li", {
-				className: "px-3 py-2.5",
-				children: [
-					/* @__PURE__ */ jsx("span", {
-						className: "font-medium",
-						children: invitation.organizationName ?? text("anOrganization")
-					}),
-					": ",
-					invitation.appRoles.map((name) => roleLabel(roles, name)).join(", ") || text("noAppRoles"),
-					/* @__PURE__ */ jsx("span", {
-						className: "block text-xs text-muted-foreground",
-						children: text("until", new Date(invitation.expiresAt).toLocaleDateString(formatTag()))
-					})
-				]
+				className: "flex items-center gap-3 px-3 py-2.5",
+				children: [/* @__PURE__ */ jsxs("span", {
+					className: "min-w-0 flex-1",
+					children: [
+						/* @__PURE__ */ jsx("span", {
+							className: "font-medium",
+							children: invitation.organizationName ?? text("anOrganization")
+						}),
+						": ",
+						invitation.appRoles.map((name) => roleLabel(roles, name)).join(", ") || text("noAppRoles"),
+						/* @__PURE__ */ jsx("span", {
+							className: "block text-xs text-muted-foreground",
+							children: text("until", new Date(invitation.expiresAt).toLocaleDateString(formatTag()))
+						})
+					]
+				}), /* @__PURE__ */ jsx(Button, {
+					size: "sm",
+					variant: "primary",
+					loading: busy,
+					onClick: () => void accept(invitation.id),
+					children: text("accept")
+				})]
 			}, invitation.id))
-		})
+		})]
 	});
 };
 /**
@@ -127,7 +142,7 @@ const OrganizationsPage = ({ state, basePath }) => {
 					}, organization.id))
 				})]
 			}),
-			/* @__PURE__ */ jsx(YourInvitations, {}),
+			/* @__PURE__ */ jsx(YourInvitations, { basePath }),
 			mayCreate && /* @__PURE__ */ jsx(NewOrganization, { basePath }),
 			(state.current?.globalRoles.length ?? 0) > 0 && /* @__PURE__ */ jsx(AllOrganizations, {
 				basePath,

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.44.4";
+var version = "0.45.0";
 var protobase = { "pluginApi": 1 };
 //#endregion
 export { protobase, version };