@reventlessdev/reventless-local 3.0.0-alpha.300 → 3.0.0-alpha.302

package/tests/adapter/{LocalAuthUserStoreTest.res → LocalAuthAccountStoreTest.res}

@@ -1,4 +1,4 @@
-// Stage A4 — UserStore.load resolution order and YAML parsing.
+// Stage A4 — AccountStore.load resolution order and YAML parsing.
 
 @@warning("-44")
 
@@ -7,12 +7,12 @@ open JestGlobals
 let resetAll = () => {
   LocalAuth.resetUsers()
   LocalAuth.Login.resetStore()
-  UserStore.resetResolution()
+  AccountStore.resetResolution()
 }
 
 let _writeYamlFile = (contents: string): string => {
   let dir = NodeFs.mkdtempSync(NodePath.join([NodeOs.tmpdir(), "reventless-userstore-"]))
-  let path = NodePath.join([dir, "users.yaml"])
+  let path = NodePath.join([dir, "accounts.yaml"])
   NodeFs.writeFileSync(path, contents)
   path
 }
@@ -26,7 +26,7 @@ testPromise("parseString decodes a well-formed YAML document", async () => {
   password: bob-pw
   groups: []
 `
-  switch UserStore.parseString(yaml) {
+  switch AccountStore.parseString(yaml) {
   | Ok(entries) =>
     expect(entries->Array.length)->toEqual(2)
     let first = entries->Array.getUnsafe(0)
@@ -38,7 +38,7 @@ testPromise("parseString decodes a well-formed YAML document", async () => {
 })
 
 testPromise("parseString rejects malformed YAML", async () => {
-  switch UserStore.parseString("not: valid: yaml: at all: ::") {
+  switch AccountStore.parseString("not: valid: yaml: at all: ::") {
   | Error(_) => ()
   | Ok(_) => JsError.throwWithMessage("expected Error for malformed YAML")
   }
@@ -49,21 +49,21 @@ testPromise("parseString rejects entries missing required fields", async () => {
 - username: alice
   groups: [Editor]
 `
-  switch UserStore.parseString(yaml) {
+  switch AccountStore.parseString(yaml) {
   | Error(_) => ()
   | Ok(_) => JsError.throwWithMessage("expected Error for missing password")
   }
 })
 
-testPromise("load(~users) registers credentials and returns InlineUsers", async () => {
+testPromise("load(~accounts) registers credentials and returns InlineAccounts", async () => {
   resetAll()
-  let entries: array<UserStore.entry> = [
+  let entries: array<AccountStore.entry> = [
     {username: "alice", password: "alice-pw", groups: ["Editor"]},
     {username: "bob", password: "bob-pw", groups: [], userId: "u-bob"},
   ]
-  switch UserStore.load(~users=entries, ()) {
-  | Ok(InlineUsers) => ()
-  | Ok(_) => JsError.throwWithMessage("expected InlineUsers")
+  switch AccountStore.load(~accounts=entries, ()) {
+  | Ok(InlineAccounts) => ()
+  | Ok(_) => JsError.throwWithMessage("expected InlineAccounts")
   | Error(msg) => JsError.throwWithMessage("load failed: " ++ msg)
   }
   // Verify Login.issue accepts the credentials.
@@ -79,16 +79,16 @@ testPromise("load(~users) registers credentials and returns InlineUsers", async
   }
 })
 
-testPromise("load(~usersFile) reads a YAML file from disk", async () => {
+testPromise("load(~accountsFile) reads a YAML file from disk", async () => {
   resetAll()
   let path = _writeYamlFile(`
 - username: carol
   password: carol-pw
   groups: [Admin]
 `)
-  switch UserStore.load(~usersFile=path, ()) {
-  | Ok(UsersFile(p)) => expect(p)->toEqual(path)
-  | Ok(_) => JsError.throwWithMessage("expected UsersFile resolution")
+  switch AccountStore.load(~accountsFile=path, ()) {
+  | Ok(AccountsFile(p)) => expect(p)->toEqual(path)
+  | Ok(_) => JsError.throwWithMessage("expected AccountsFile resolution")
   | Error(msg) => JsError.throwWithMessage("load failed: " ++ msg)
   }
   let result = await LocalAuth.Login.issue(~username="carol", ~password="carol-pw")
@@ -99,9 +99,9 @@ testPromise("load(~usersFile) reads a YAML file from disk", async () => {
   NodeFs.rmSync(path, {force: true})
 })
 
-testPromise("load(~usersFile) returns Error when the file is missing", async () => {
+testPromise("load(~accountsFile) returns Error when the file is missing", async () => {
   resetAll()
-  switch UserStore.load(~usersFile="/tmp/does-not-exist-reventless.yaml", ()) {
+  switch AccountStore.load(~accountsFile="/tmp/does-not-exist-reventless.yaml", ()) {
   | Error(_) => ()
   | Ok(_) => JsError.throwWithMessage("expected Error for missing file")
   }
@@ -109,12 +109,12 @@ testPromise("load(~usersFile) returns Error when the file is missing", async ()
 
 testPromise("load() with no args + no default file returns Empty", async () => {
   resetAll()
-  // The test's cwd has no .reventless/users.yaml — verify Empty is returned.
+  // The test's cwd has no .reventless/accounts.yaml — verify Empty is returned.
   // (The package's own cwd is reventless-local/ during `pnpm test`, where
   // no such file exists.)
-  switch UserStore.load() {
+  switch AccountStore.load() {
   | Ok(Empty) => ()
-  | Ok(DefaultFile(_)) => // If a .reventless/users.yaml happens to exist in CI, accept it.
+  | Ok(DefaultFile(_)) => // If a .reventless/accounts.yaml happens to exist in CI, accept it.
     ()
   | Ok(_) => JsError.throwWithMessage("expected Empty or DefaultFile")
   | Error(msg) => JsError.throwWithMessage("load failed: " ++ msg)
@@ -128,12 +128,12 @@ testPromise("inline users win over a file path", async () => {
   password: file-pw
   groups: []
 `)
-  let inline: array<UserStore.entry> = [
+  let inline: array<AccountStore.entry> = [
     {username: "inline-user", password: "inline-pw", groups: []},
   ]
-  switch UserStore.load(~users=inline, ~usersFile=path, ()) {
-  | Ok(InlineUsers) => ()
-  | Ok(_) => JsError.throwWithMessage("expected InlineUsers (inline should win)")
+  switch AccountStore.load(~accounts=inline, ~accountsFile=path, ()) {
+  | Ok(InlineAccounts) => ()
+  | Ok(_) => JsError.throwWithMessage("expected InlineAccounts (inline should win)")
   | Error(msg) => JsError.throwWithMessage("load failed: " ++ msg)
   }
   // file-user must NOT be in the registry.
@@ -150,10 +150,10 @@ testPromise("inline users win over a file path", async () => {
 
 testPromise("autoLoadOnce is a no-op after an explicit load", async () => {
   resetAll()
-  let _ = UserStore.load(~users=[{username: "x", password: "x", groups: []}], ())
-  // Second call should not crash even if .reventless/users.yaml doesn't
+  let _ = AccountStore.load(~accounts=[{username: "x", password: "x", groups: []}], ())
+  // Second call should not crash even if .reventless/accounts.yaml doesn't
   // exist; resolved=true prevents the default-discovery branch.
-  UserStore.autoLoadOnce()
+  AccountStore.autoLoadOnce()
   // Sanity: explicit-load registration persists.
   switch LocalAuth.lookupUser("x") {
   | Some(_) => ()
@@ -162,7 +162,7 @@ testPromise("autoLoadOnce is a no-op after an explicit load", async () => {
 })
 
 // What the role check counts as provided, before the servers load the store.
-describe("UserStore.providedGroups", () => {
+describe("AccountStore.providedGroups", () => {
   // Runs `f` in a directory holding `files` (path relative to it → contents).
   let inDir = (files: array<(string, string)>, f) => {
     let dir = NodeFs.mkdtempSync(NodePath.join([NodeOs.tmpdir(), "reventless-provided-"]))
@@ -188,8 +188,8 @@ describe("UserStore.providedGroups", () => {
   testSync("counts the default file the servers will load", () => {
     resetAll()
     let groups = inDir(
-      [(".reventless/users.yaml", manifest("Merchandiser"))],
-      () => UserStore.providedGroups(),
+      [(".reventless/accounts.yaml", manifest("Merchandiser"))],
+      () => AccountStore.providedGroups(),
     )
     expect(has("Merchandiser", groups))->toBe(true)
   })
@@ -197,27 +197,27 @@ describe("UserStore.providedGroups", () => {
   testSync("counts the template where setup has not made the file yet", () => {
     resetAll()
     let groups = inDir(
-      [("users.example.yaml", manifest("Fulfilment"))],
-      () => UserStore.providedGroups(),
+      [("accounts.example.yaml", manifest("Fulfilment"))],
+      () => AccountStore.providedGroups(),
     )
     expect(has("Fulfilment", groups))->toBe(true)
   })
 
   testSync("once loaded from elsewhere, counts those accounts and not the directory's", () => {
     resetAll()
-    let _ = UserStore.load(~users=[{username: "i", password: "i", groups: ["Inline"]}], ())
+    let _ = AccountStore.load(~accounts=[{username: "i", password: "i", groups: ["Inline"]}], ())
     let groups = inDir(
-      [(".reventless/users.yaml", manifest("Merchandiser"))],
-      () => UserStore.providedGroups(),
+      [(".reventless/accounts.yaml", manifest("Merchandiser"))],
+      () => AccountStore.providedGroups(),
     )
     expect((has("Inline", groups), has("Merchandiser", groups)))->toEqual((true, false))
   })
 
   testSync("loading other accounts after a plugin was checked is refused", () => {
     resetAll()
-    UserStore.pluginChecked := true
-    let refused = switch UserStore.load(
-      ~users=[{username: "late", password: "l", groups: ["Late"]}],
+    AccountStore.pluginChecked := true
+    let refused = switch AccountStore.load(
+      ~accounts=[{username: "late", password: "l", groups: ["Late"]}],
       (),
     ) {
     | _ => false
@@ -228,13 +228,13 @@ describe("UserStore.providedGroups", () => {
 
   testSync("the default load after a plugin was checked is the one the check read", () => {
     resetAll()
-    UserStore.pluginChecked := true
-    let loaded = inDir([], () => UserStore.load()->Result.isOk)
+    AccountStore.pluginChecked := true
+    let loaded = inDir([], () => AccountStore.load()->Result.isOk)
     expect(loaded)->toBe(true)
   })
 })
 
-describe("UserStore.reload", () => {
+describe("AccountStore.reload", () => {
   let signsIn = async (~username, ~password) =>
     switch await LocalAuth.Login.issue(~username, ~password) {
     | Ok(_) => true
@@ -251,7 +251,7 @@ describe("UserStore.reload", () => {
   password: b1
   groups: []
 `)
-    let _ = UserStore.load(~usersFile=path, ())
+    let _ = AccountStore.load(~accountsFile=path, ())
     NodeFs.writeFileSync(
       path,
       `
@@ -263,7 +263,7 @@ describe("UserStore.reload", () => {
   groups: [Driver]
 `,
     )
-    switch UserStore.reload(path) {
+    switch AccountStore.reload(path) {
     | Ok(said) => expect(said)->toEqual("2 accounts, removed: bob")
     | Error(e) => JsError.throwWithMessage(e)
     }
@@ -281,9 +281,9 @@ describe("UserStore.reload", () => {
   password: a1
   groups: [Editor]
 `)
-    let _ = UserStore.load(~usersFile=path, ())
+    let _ = AccountStore.load(~accountsFile=path, ())
     NodeFs.writeFileSync(path, "- username: alice\n  groups: [Editor]\n")
-    expect(UserStore.reload(path)->Result.isError)->toBe(true)
+    expect(AccountStore.reload(path)->Result.isError)->toBe(true)
     expect(await signsIn(~username="alice", ~password="a1"))->toBe(true)
   })
 
@@ -294,8 +294,8 @@ describe("UserStore.reload", () => {
   password: a1
   groups: [Editor]
 `)
-    let _ = UserStore.load(~usersFile=path, ())
-    UserStore.watch(path)
+    let _ = AccountStore.load(~accountsFile=path, ())
+    AccountStore.watch(path)
     NodeFs.writeFileSync(
       path,
       `
@@ -317,7 +317,7 @@ describe("UserStore.reload", () => {
         await waitFor(tries - 1)
       }
     let added = await waitFor(60)
-    UserStore.unwatch()
+    AccountStore.unwatch()
     expect(added)->toBe(true)
   })
 })

package/tests/adapter/{LocalAuthUserStoreTest.res.mjs → LocalAuthAccountStoreTest.res.mjs}

@@ -7,23 +7,23 @@ import * as Stdlib_Result from "@rescript/runtime/lib/es6/Stdlib_Result.js";
 import * as Stdlib_JsError from "@rescript/runtime/lib/es6/Stdlib_JsError.js";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
 import * as LocalAuth$ReventlessLocal from "../../src/adapter/Auth/LocalAuth.res.mjs";
-import * as UserStore$ReventlessLocal from "../../src/adapter/Auth/UserStore.res.mjs";
+import * as AccountStore$ReventlessLocal from "../../src/adapter/Auth/AccountStore.res.mjs";
 
 function resetAll() {
   LocalAuth$ReventlessLocal.resetUsers();
   LocalAuth$ReventlessLocal.Login.resetStore();
-  UserStore$ReventlessLocal.resetResolution();
+  AccountStore$ReventlessLocal.resetResolution();
 }
 
 function _writeYamlFile(contents) {
   let dir = Nodefs.mkdtempSync(Nodepath.join(Nodeos.tmpdir(), "reventless-userstore-"));
-  let path = Nodepath.join(dir, "users.yaml");
+  let path = Nodepath.join(dir, "accounts.yaml");
   Nodefs.writeFileSync(path, contents, "utf8");
   return path;
 }
 
 globalThis.test("parseString decodes a well-formed YAML document", async () => {
-  let entries = UserStore$ReventlessLocal.parseString(`
+  let entries = AccountStore$ReventlessLocal.parseString(`
 - username: alice
   password: alice-pw
   groups: [Editor]
@@ -43,14 +43,14 @@ globalThis.test("parseString decodes a well-formed YAML document", async () => {
 });
 
 globalThis.test("parseString rejects malformed YAML", async () => {
-  let match = UserStore$ReventlessLocal.parseString("not: valid: yaml: at all: ::");
+  let match = AccountStore$ReventlessLocal.parseString("not: valid: yaml: at all: ::");
   if (match.TAG === "Ok") {
     return Stdlib_JsError.throwWithMessage("expected Error for malformed YAML");
   }
 });
 
 globalThis.test("parseString rejects entries missing required fields", async () => {
-  let match = UserStore$ReventlessLocal.parseString(`
+  let match = AccountStore$ReventlessLocal.parseString(`
 - username: alice
   groups: [Editor]
 `);
@@ -59,7 +59,7 @@ globalThis.test("parseString rejects entries missing required fields", async ()
   }
 });
 
-globalThis.test("load(~users) registers credentials and returns InlineUsers", async () => {
+globalThis.test("load(~accounts) registers credentials and returns InlineAccounts", async () => {
   resetAll();
   let entries = [
     {
@@ -74,11 +74,11 @@ globalThis.test("load(~users) registers credentials and returns InlineUsers", as
       userId: "u-bob"
     }
   ];
-  let msg = UserStore$ReventlessLocal.load(entries, undefined, undefined);
+  let msg = AccountStore$ReventlessLocal.load(entries, undefined, undefined);
   if (msg.TAG === "Ok") {
     let tmp = msg._0;
-    if (typeof tmp === "object" || tmp !== "InlineUsers") {
-      Stdlib_JsError.throwWithMessage("expected InlineUsers");
+    if (typeof tmp === "object" || tmp !== "InlineAccounts") {
+      Stdlib_JsError.throwWithMessage("expected InlineAccounts");
     }
   } else {
     Stdlib_JsError.throwWithMessage("load failed: " + msg._0);
@@ -96,18 +96,18 @@ globalThis.test("load(~users) registers credentials and returns InlineUsers", as
   }
 });
 
-globalThis.test("load(~usersFile) reads a YAML file from disk", async () => {
+globalThis.test("load(~accountsFile) reads a YAML file from disk", async () => {
   resetAll();
   let path = _writeYamlFile(`
 - username: carol
   password: carol-pw
   groups: [Admin]
 `);
-  let msg = UserStore$ReventlessLocal.load(undefined, path, undefined);
+  let msg = AccountStore$ReventlessLocal.load(undefined, path, undefined);
   if (msg.TAG === "Ok") {
     let p = msg._0;
-    if (typeof p !== "object" || p.TAG !== "UsersFile") {
-      Stdlib_JsError.throwWithMessage("expected UsersFile resolution");
+    if (typeof p !== "object" || p.TAG !== "AccountsFile") {
+      Stdlib_JsError.throwWithMessage("expected AccountsFile resolution");
     } else {
       globalThis.expect(p._0).toEqual(path);
     }
@@ -123,9 +123,9 @@ globalThis.test("load(~usersFile) reads a YAML file from disk", async () => {
   });
 });
 
-globalThis.test("load(~usersFile) returns Error when the file is missing", async () => {
+globalThis.test("load(~accountsFile) returns Error when the file is missing", async () => {
   resetAll();
-  let match = UserStore$ReventlessLocal.load(undefined, "/tmp/does-not-exist-reventless.yaml", undefined);
+  let match = AccountStore$ReventlessLocal.load(undefined, "/tmp/does-not-exist-reventless.yaml", undefined);
   if (match.TAG === "Ok") {
     return Stdlib_JsError.throwWithMessage("expected Error for missing file");
   }
@@ -133,18 +133,18 @@ globalThis.test("load(~usersFile) returns Error when the file is missing", async
 
 globalThis.test("load() with no args + no default file returns Empty", async () => {
   resetAll();
-  let msg = UserStore$ReventlessLocal.load(undefined, undefined, undefined);
+  let msg = AccountStore$ReventlessLocal.load(undefined, undefined, undefined);
   if (msg.TAG !== "Ok") {
     return Stdlib_JsError.throwWithMessage("load failed: " + msg._0);
   }
   let tmp = msg._0;
   if (typeof tmp !== "object") {
-    if (tmp === "InlineUsers") {
+    if (tmp === "InlineAccounts") {
       return Stdlib_JsError.throwWithMessage("expected Empty or DefaultFile");
     } else {
       return;
     }
-  } else if (tmp.TAG === "UsersFile") {
+  } else if (tmp.TAG === "AccountsFile") {
     return Stdlib_JsError.throwWithMessage("expected Empty or DefaultFile");
   } else {
     return;
@@ -163,11 +163,11 @@ globalThis.test("inline users win over a file path", async () => {
       password: "inline-pw",
       groups: []
     }];
-  let msg = UserStore$ReventlessLocal.load(inline, path, undefined);
+  let msg = AccountStore$ReventlessLocal.load(inline, path, undefined);
   if (msg.TAG === "Ok") {
     let tmp = msg._0;
-    if (typeof tmp === "object" || tmp !== "InlineUsers") {
-      Stdlib_JsError.throwWithMessage("expected InlineUsers (inline should win)");
+    if (typeof tmp === "object" || tmp !== "InlineAccounts") {
+      Stdlib_JsError.throwWithMessage("expected InlineAccounts (inline should win)");
     }
   } else {
     Stdlib_JsError.throwWithMessage("load failed: " + msg._0);
@@ -189,12 +189,12 @@ globalThis.test("inline users win over a file path", async () => {
 
 globalThis.test("autoLoadOnce is a no-op after an explicit load", async () => {
   resetAll();
-  UserStore$ReventlessLocal.load([{
+  AccountStore$ReventlessLocal.load([{
       username: "x",
       password: "x",
       groups: []
     }], undefined, undefined);
-  UserStore$ReventlessLocal.autoLoadOnce();
+  AccountStore$ReventlessLocal.autoLoadOnce();
   let match = LocalAuth$ReventlessLocal.lookupUser("x");
   if (match !== undefined) {
     return;
@@ -203,7 +203,7 @@ globalThis.test("autoLoadOnce is a no-op after an explicit load", async () => {
   }
 });
 
-globalThis.describe("UserStore.providedGroups", () => {
+globalThis.describe("AccountStore.providedGroups", () => {
   let inDir = (files, f) => {
     let dir = Nodefs.mkdtempSync(Nodepath.join(Nodeos.tmpdir(), "reventless-provided-"));
     files.forEach(param => {
@@ -232,30 +232,30 @@ globalThis.describe("UserStore.providedGroups", () => {
   globalThis.test("counts the default file the servers will load", () => {
     resetAll();
     let groups = inDir([[
-        ".reventless/users.yaml",
+        ".reventless/accounts.yaml",
         `- username: m\n  password: m\n  groups: [` + "Merchandiser" + `]\n`
-      ]], () => UserStore$ReventlessLocal.providedGroups());
+      ]], () => AccountStore$ReventlessLocal.providedGroups());
     globalThis.expect(groups.includes("Merchandiser")).toBe(true);
   });
   globalThis.test("counts the template where setup has not made the file yet", () => {
     resetAll();
     let groups = inDir([[
-        "users.example.yaml",
+        "accounts.example.yaml",
         `- username: m\n  password: m\n  groups: [` + "Fulfilment" + `]\n`
-      ]], () => UserStore$ReventlessLocal.providedGroups());
+      ]], () => AccountStore$ReventlessLocal.providedGroups());
     globalThis.expect(groups.includes("Fulfilment")).toBe(true);
   });
   globalThis.test("once loaded from elsewhere, counts those accounts and not the directory's", () => {
     resetAll();
-    UserStore$ReventlessLocal.load([{
+    AccountStore$ReventlessLocal.load([{
         username: "i",
         password: "i",
         groups: ["Inline"]
       }], undefined, undefined);
     let groups = inDir([[
-        ".reventless/users.yaml",
+        ".reventless/accounts.yaml",
         `- username: m\n  password: m\n  groups: [` + "Merchandiser" + `]\n`
-      ]], () => UserStore$ReventlessLocal.providedGroups());
+      ]], () => AccountStore$ReventlessLocal.providedGroups());
     globalThis.expect([
       groups.includes("Inline"),
       groups.includes("Merchandiser")
@@ -266,10 +266,10 @@ globalThis.describe("UserStore.providedGroups", () => {
   });
   globalThis.test("loading other accounts after a plugin was checked is refused", () => {
     resetAll();
-    UserStore$ReventlessLocal.pluginChecked.contents = true;
+    AccountStore$ReventlessLocal.pluginChecked.contents = true;
     let refused;
     try {
-      UserStore$ReventlessLocal.load([{
+      AccountStore$ReventlessLocal.load([{
           username: "late",
           password: "l",
           groups: ["Late"]
@@ -287,13 +287,13 @@ globalThis.describe("UserStore.providedGroups", () => {
   });
   globalThis.test("the default load after a plugin was checked is the one the check read", () => {
     resetAll();
-    UserStore$ReventlessLocal.pluginChecked.contents = true;
-    let loaded = inDir([], () => Stdlib_Result.isOk(UserStore$ReventlessLocal.load(undefined, undefined, undefined)));
+    AccountStore$ReventlessLocal.pluginChecked.contents = true;
+    let loaded = inDir([], () => Stdlib_Result.isOk(AccountStore$ReventlessLocal.load(undefined, undefined, undefined)));
     globalThis.expect(loaded).toBe(true);
   });
 });
 
-globalThis.describe("UserStore.reload", () => {
+globalThis.describe("AccountStore.reload", () => {
   let signsIn = async (username, password) => {
     let match = await LocalAuth$ReventlessLocal.Login.issue(username, password, undefined);
     return match.TAG === "Ok";
@@ -308,7 +308,7 @@ globalThis.describe("UserStore.reload", () => {
   password: b1
   groups: []
 `);
-    UserStore$ReventlessLocal.load(undefined, path, undefined);
+    AccountStore$ReventlessLocal.load(undefined, path, undefined);
     Nodefs.writeFileSync(path, `
 - username: alice
   password: a2
@@ -317,7 +317,7 @@ globalThis.describe("UserStore.reload", () => {
   password: driver
   groups: [Driver]
 `, "utf8");
-    let said = UserStore$ReventlessLocal.reload(path);
+    let said = AccountStore$ReventlessLocal.reload(path);
     if (said.TAG === "Ok") {
       globalThis.expect(said._0).toEqual("2 accounts, removed: bob");
     } else {
@@ -336,9 +336,9 @@ globalThis.describe("UserStore.reload", () => {
   password: a1
   groups: [Editor]
 `);
-    UserStore$ReventlessLocal.load(undefined, path, undefined);
+    AccountStore$ReventlessLocal.load(undefined, path, undefined);
     Nodefs.writeFileSync(path, "- username: alice\n  groups: [Editor]\n", "utf8");
-    globalThis.expect(Stdlib_Result.isError(UserStore$ReventlessLocal.reload(path))).toBe(true);
+    globalThis.expect(Stdlib_Result.isError(AccountStore$ReventlessLocal.reload(path))).toBe(true);
     globalThis.expect(await signsIn("alice", "a1")).toBe(true);
   });
   globalThis.test("watch reads the file again once it is saved", async () => {
@@ -348,8 +348,8 @@ globalThis.describe("UserStore.reload", () => {
   password: a1
   groups: [Editor]
 `);
-    UserStore$ReventlessLocal.load(undefined, path, undefined);
-    UserStore$ReventlessLocal.watch(path);
+    AccountStore$ReventlessLocal.load(undefined, path, undefined);
+    AccountStore$ReventlessLocal.watch(path);
     Nodefs.writeFileSync(path, `
 - username: alice
   password: a1
@@ -371,7 +371,7 @@ globalThis.describe("UserStore.reload", () => {
       }
     };
     let added = await waitFor(60);
-    UserStore$ReventlessLocal.unwatch();
+    AccountStore$ReventlessLocal.unwatch();
     globalThis.expect(added).toBe(true);
   });
 });

package/tests/capability/{Capability_IdentityProvider_UserStoreTest.res → Capability_IdentityProvider_AccountStoreTest.res}

@@ -8,26 +8,28 @@ let email = address => Reventless.Messaging.ToEmail(Reventless.Email.unsafe(addr
 
 let freshFile = (): string => {
   let dir = NodeFs.mkdtempSync(NodePath.join([NodeOs.tmpdir(), "reventless-identity-"]))
-  NodePath.join([dir, ".reventless", "users.yaml"])
+  NodePath.join([dir, ".reventless", "accounts.yaml"])
 }
 
 let resetAll = () => {
   LocalAuth.resetUsers()
   LocalAuth.Login.resetStore()
-  UserStore.resetResolution()
+  AccountStore.resetResolution()
 }
 
 let restartFrom = (file: string): unit => {
   resetAll()
-  switch UserStore.load(~usersFile=file, ()) {
+  switch AccountStore.load(~accountsFile=file, ()) {
   | Ok(_) => ()
   | Error(message) => JsError.throwWithMessage(`reload failed: ${message}`)
   }
 }
 
-describe("Capability_IdentityProvider_UserStore", () => {
+describe("Capability_IdentityProvider_AccountStore", () => {
   testSync("publishes all four operations", () =>
-    expect(Capability_IdentityProvider_UserStore.make(~path=freshFile(), ()).operations)->toEqual([
+    expect(
+      Capability_IdentityProvider_AccountStore.make(~path=freshFile(), ()).operations,
+    )->toEqual([
       Reventless.IdentityProvider.CreatePrincipal,
       AddToGroup,
       RemoveFromGroup,
@@ -38,7 +40,7 @@ describe("Capability_IdentityProvider_UserStore", () => {
   testPromise("a created principal can log in now and after a restart", async () => {
     resetAll()
     let file = freshFile()
-    let provider = Capability_IdentityProvider_UserStore.make(~path=file, ())
+    let provider = Capability_IdentityProvider_AccountStore.make(~path=file, ())
     let created = await provider.createPrincipal(
       ~contact=email("new@example.com"),
       ~credential=Password("secret-1"),
@@ -66,7 +68,7 @@ describe("Capability_IdentityProvider_UserStore", () => {
 
   testPromise("the same contact twice is a Conflict, not a second account", async () => {
     resetAll()
-    let provider = Capability_IdentityProvider_UserStore.make(~path=freshFile(), ())
+    let provider = Capability_IdentityProvider_AccountStore.make(~path=freshFile(), ())
     let create = () =>
       provider.createPrincipal(
         ~contact=email("twice@example.com"),
@@ -81,7 +83,7 @@ describe("Capability_IdentityProvider_UserStore", () => {
   // exists for the next provisioning step without a credential anyone holds.
   testPromise("NoCredential writes an account no password opens", async () => {
     resetAll()
-    let provider = Capability_IdentityProvider_UserStore.make(~path=freshFile(), ())
+    let provider = Capability_IdentityProvider_AccountStore.make(~path=freshFile(), ())
     let _ = await provider.createPrincipal(
       ~contact=email("later@example.com"),
       ~credential=NoCredential,
@@ -94,7 +96,7 @@ describe("Capability_IdentityProvider_UserStore", () => {
   })
 
   testPromise("a push address is refused, since nothing signs in with one", async () => {
-    let provider = Capability_IdentityProvider_UserStore.make(~path=freshFile(), ())
+    let provider = Capability_IdentityProvider_AccountStore.make(~path=freshFile(), ())
     let answer = await provider.createPrincipal(
       ~contact=ToPush(Fcm({registrationToken: "tok"})),
       ~credential=NoCredential,
@@ -111,7 +113,7 @@ describe("Capability_IdentityProvider_UserStore", () => {
   testPromise("groups round-trip through the file", async () => {
     resetAll()
     let file = freshFile()
-    let provider = Capability_IdentityProvider_UserStore.make(~path=file, ())
+    let provider = Capability_IdentityProvider_AccountStore.make(~path=file, ())
     let principal: Reventless.IdentityProvider.principal = {providerId: "grp@example.com"}
     let _ = await provider.createPrincipal(
       ~contact=email("grp@example.com"),
@@ -133,7 +135,7 @@ describe("Capability_IdentityProvider_UserStore", () => {
 
   testPromise("grouping a principal that does not exist is refused", async () => {
     resetAll()
-    let provider = Capability_IdentityProvider_UserStore.make(~path=freshFile(), ())
+    let provider = Capability_IdentityProvider_AccountStore.make(~path=freshFile(), ())
     let answer = await provider.addToGroup(~principal={providerId: "ghost"}, ~group="Shopper")
     expect(answer)->toEqual(Error(Reventless.IdentityProvider.Refused("no principal ghost")))
   })
@@ -141,7 +143,7 @@ describe("Capability_IdentityProvider_UserStore", () => {
   testPromise("deleting removes the account from the file and the login, twice", async () => {
     resetAll()
     let file = freshFile()
-    let provider = Capability_IdentityProvider_UserStore.make(~path=file, ())
+    let provider = Capability_IdentityProvider_AccountStore.make(~path=file, ())
     let principal: Reventless.IdentityProvider.principal = {providerId: "gone@example.com"}
     let _ = await provider.createPrincipal(
       ~contact=email("gone@example.com"),
@@ -166,7 +168,7 @@ describe("Capability_IdentityProvider_UserStore", () => {
   groups: [Admin]
 `,
     )
-    let provider = Capability_IdentityProvider_UserStore.make(~path=file, ())
+    let provider = Capability_IdentityProvider_AccountStore.make(~path=file, ())
     let _ = await provider.createPrincipal(
       ~contact=email("c@example.com"),
       ~credential=Password("pw"),