@remit/web-client 0.0.296 → 0.0.298

package/src/router.tsx

@@ -1,5 +1,5 @@
 import type { QueryClient } from "@tanstack/react-query";
-import { createRouter } from "@tanstack/react-router";
+import { createRouter, type RouterHistory } from "@tanstack/react-router";
 import { AppShellSkeleton } from "./components/layout/AppShellSkeleton";
 import { recordRoute } from "./lib/route-breadcrumbs";
 import { stringifySearch } from "./lib/search-params";
@@ -13,10 +13,12 @@ export interface RouterContext {
 export const createAppRouter = (
 	queryClient: QueryClient,
 	telemetry: Telemetry,
+	history?: RouterHistory,
 ) => {
 	const router = createRouter({
 		routeTree,
 		context: { queryClient },
+		history,
 		// A query param that carries a list writes one param per value
 		// (`lib/search-params.ts`), which is what the router's own reader already
 		// expects and what a hand-written link says.

package/src/routes/settings/-accounts.test.ts

@@ -34,6 +34,13 @@ describe("mapOauthError", () => {
 		);
 	});
 
+	test("scope_not_granted sends the person back through the consent", () => {
+		assert.match(
+			mapOauthError("scope_not_granted"),
+			/did not grant access to every service you picked/,
+		);
+	});
+
 	test("consent_required returns admin consent message", () => {
 		const result = mapOauthError("consent_required");
 		assert.ok(
@@ -99,6 +106,7 @@ const REAUTH_ACCOUNT = {
 	displayName: "Matthijs",
 	authType: "oauthMicrosoft",
 	connectionState: "reauth_required",
+	syncedServices: ["Mail", "Calendar"],
 };
 
 // The router reads `self` at construction; the shared jsdom globals stop at
@@ -195,6 +203,16 @@ describe("the Reconnect button and the redirect it starts", () => {
 		Reflect.deleteProperty(document, "visibilityState");
 	});
 
+	test("asks Microsoft again for every service the account syncs", async () => {
+		const dom = await mountAccounts();
+		await startReconnect(dom);
+
+		assert.deepEqual(http?.to("/oauth/microsoft/start")[0]?.body, {
+			email: REAUTH_ACCOUNT.email,
+			services: ["Mail", "Calendar"],
+		});
+	});
+
 	test("goes busy and stays busy while the redirect is in flight", async () => {
 		const dom = await mountAccounts();
 		await startReconnect(dom);

package/src/routes/settings/accounts.tsx

@@ -64,6 +64,10 @@ export function mapOauthError(code: string): string {
 		return "You cancelled the sign-in.";
 	}
 
+	if (lower === "scope_not_granted") {
+		return "Microsoft did not grant access to every service you picked. Sign in again and accept each permission Microsoft asks for.";
+	}
+
 	if (
 		lower === "consent_required" ||
 		lower.includes("admin_consent") ||
@@ -440,7 +444,10 @@ function AccountsSettings() {
 										onClick: () => {
 											setReconnectingAccountId(account.accountId);
 											reconnectMutation.mutate({
-												body: { email: account.email },
+												body: {
+													email: account.email,
+													services: account.syncedServices,
+												},
 											});
 										},
 									}

package/src/test-support/fixtures.ts

@@ -41,6 +41,7 @@ export const makeAccount = (
 	email: "alice@example.com",
 	authType: "password",
 	syncedServices: ["Mail"],
+	grantedScopes: [],
 	imapHost: "imap.example.com",
 	imapPort: 993,
 	imapTls: true,