@aiquants/auth-react-router 0.13.0 → 0.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiquants/auth-react-router",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "React Router v7 / v8 auth adapter for @aiquants/auth-core: Google OAuth strategy factory (remix-auth), cookie session storage with DI test backdoor, a loader guard that authenticates at most once per request (token refresh + photo cache), auth route handlers, and a <GoogleForm> login button.",
   "sideEffects": [
     "**/*.css"

package/src/admin/server.ts

@@ -233,6 +233,30 @@ function requireAllowlistType(formData: FormData): "email" | "domain" {
     throw new Error(`type は "email" または "domain" のいずれかで指定してください (受け取った値: ${JSON.stringify(raw)})`)
 }
 
+/** 表示するタブ。未知の値は先頭のタブへ寄せる。 */
+const SEGMENTS = ["users", "groups", "group_members", "allowlist", "directory"] as const
+
+/**
+ * Derives the segment from a request path, tolerating the router's single-fetch suffix.
+ * リクエストパスからセグメントを決める処理 (ルーターの単一フェッチ用の接尾辞を許容する)。
+ *
+ * ⚠️ クライアント側の遷移では、ルーターは画面の URL ではなく **`<path>.data`** を取りに来る
+ * (単一フェッチ)。素朴に末尾セグメントを見ると `"groups.data"` になり、どのタブにも一致せず
+ * 既定へ落ちる。結果、**URL は変わるのに中身が変わらない** — 全画面再読込でだけ正しく描かれる
+ * ため、動作確認では気付きにくい。接尾辞を落としてから判定する。
+ *
+ * @param pathname Request pathname. リクエストのパス。
+ * @returns One of the known segments. 既知のセグメントのいずれか。
+ */
+function segmentFromPathname(pathname: string): (typeof SEGMENTS)[number] {
+    const parts = pathname
+        .replace(/\.data$/, "")
+        .split("/")
+        .filter(Boolean)
+    const last = parts[parts.length - 1] ?? ""
+    return (SEGMENTS as readonly string[]).includes(last) ? (last as (typeof SEGMENTS)[number]) : "users"
+}
+
 /**
  * The CRUD verb an operation performs. Deliberately a plain string union so this package stays
  * independent of any particular authorization library.
@@ -419,9 +443,7 @@ export function createUserAdminApp(config: UserAdminAppConfig) {
     async function loader({ request }: RouteArgs) {
         // 読取ガード: 拒否は throw されるためここで処理が打ち切られる
         await config.guards.requireAccess(request, { action: "read", intent: "loader" })
-        const url = new URL(request.url)
-        const pathSegments = url.pathname.split("/").filter(Boolean)
-        const segment = pathSegments[pathSegments.length - 1] ?? "users"
+        const segment = segmentFromPathname(new URL(request.url).pathname)
 
         const [users, groups, groupMembers, allowlist, directoryStatus, myPermissions] = await Promise.all([
             config.store.listUsers(),
@@ -440,7 +462,7 @@ export function createUserAdminApp(config: UserAdminAppConfig) {
 
         return {
             resourceLabels: config.resourceLabels,
-            segment: ["groups", "group_members", "allowlist", "directory"].includes(segment) ? segment : "users",
+            segment,
             users,
             groups,
             groupMembers,