Skip to content

Native iCloud apps for Windows and Linux, built in Rust. Notes, Reminders, Calendar, Contacts, Drive and Photos, offline and in sync with your iPhone.

Apple Account, as Apple now names it

Yashwanth Kamireddib65b1a03b23c
diff --git a/.uiverify/a11y.mjs b/.uiverify/a11y.mjs
index 3f5a9b8..39c55f3 100644
--- a/.uiverify/a11y.mjs
+++ b/.uiverify/a11y.mjs
@@ -26,7 +26,7 @@ const then = (...steps) => async (p) => { for (const s of steps) await s(p); };
const scenarios = [
{ name: "sign-in", screen: "signin", ready: ".signin, form" },
{ name: "code", screen: "code", ready: ".code", act: async (p) => {
- await p.fill('input[aria-label="Apple ID"]', "[email protected]");
+ await p.fill('input[aria-label="Apple Account"]', "[email protected]");
await p.fill('input[aria-label="Password"]', "secret");
await p.click('button[type="submit"]');
} },
diff --git a/.uiverify/assert.mjs b/.uiverify/assert.mjs
index 7ab7fe5..313d899 100644
--- a/.uiverify/assert.mjs
+++ b/.uiverify/assert.mjs
@@ -445,7 +445,8 @@ let failures = 0;
await page.goto("http://localhost:4173", { waitUntil: "networkidle" });
await page.getByRole("button", { name: "Calendar", exact: true }).click();
await page.waitForTimeout(300);
- await page.getByRole("button", { name: "New event" }).click();
+ // The + button opens Quick Event, as Calendar's does; Ctrl+N opens the whole new event.
+ await page.keyboard.press("Control+n");
await page.waitForTimeout(250);
const chosen = await page.locator(".cal-field .picker-button").first().innerText();
@@ -677,7 +678,7 @@ let failures = 0;
};
}, twoFactor);
await page.goto("http://localhost:4173", { waitUntil: "networkidle" });
- await page.fill('input[aria-label="Apple ID"]', "[email protected]");
+ await page.fill('input[aria-label="Apple Account"]', "[email protected]");
await page.fill('input[aria-label="Password"]', "hunter2hunter2");
await page.click('button[type="submit"]');
await page.waitForSelector(".code", { timeout: 5000 });
diff --git a/.uiverify/dbg.mjs b/.uiverify/dbg.mjs
index 8c156a7..d180885 100644
--- a/.uiverify/dbg.mjs
+++ b/.uiverify/dbg.mjs
@@ -44,7 +44,7 @@ console.log("stub reached?", await p.evaluate(() => window.__calls ?? "STUB NEVE
console.log("visible root:", (await p.innerText("#root")).slice(0,120).replace(/\n/g," "));
const btn = await p.$('button[type="submit"]');
console.log("submit button present:", !!btn, "disabled:", btn && await btn.isDisabled());
-await p.fill('input[aria-label="Apple ID"]', "[email protected]");
+await p.fill('input[aria-label="Apple Account"]', "[email protected]");
await p.fill('input[aria-label="Password"]', "secret123");
console.log("after fill, disabled:", await (await p.$('button[type="submit"]')).isDisabled());
await p.click('button[type="submit"]');
diff --git a/.uiverify/keyboard.mjs b/.uiverify/keyboard.mjs
index 28989eb..87bce09 100644
--- a/.uiverify/keyboard.mjs
+++ b/.uiverify/keyboard.mjs
@@ -125,12 +125,12 @@ const focused = (page) =>
await page.keyboard.press("Tab");
seen.push(await focused(page));
}
- check("sign-in reaches Apple ID, Password, Sign in by Tab",
- seen.includes("Apple ID") && seen.includes("Password") && seen.some((s) => /Sign in/.test(s)),
+ check("sign-in reaches Apple Account, Password, Sign in by Tab",
+ seen.includes("Apple Account") && seen.includes("Password") && seen.some((s) => /Sign in/.test(s)),
seen.join(" → "));
// A visible focus ring is the whole point of keyboard focus.
- await page.focus('input[aria-label="Apple ID"]');
+ await page.focus('input[aria-label="Apple Account"]');
const ring = await page.evaluate(() => {
const g = document.querySelector(".field-group");
return g ? getComputedStyle(g).boxShadow : "";
@@ -142,7 +142,7 @@ const focused = (page) =>
// --- code: one tab stop, not six ---
{
const { ctx, page } = await open("code");
- await page.fill('input[aria-label="Apple ID"]', "[email protected]");
+ await page.fill('input[aria-label="Apple Account"]', "[email protected]");
await page.fill('input[aria-label="Password"]', "secret");
await page.click('button[type="submit"]');
await page.waitForSelector(".code");
diff --git a/.uiverify/readme-shots.mjs b/.uiverify/readme-shots.mjs
index 102071f..38b42f1 100644
--- a/.uiverify/readme-shots.mjs
+++ b/.uiverify/readme-shots.mjs
@@ -250,7 +250,7 @@ for (const [scene, schemes] of Object.entries(stills)) {
if (want("signin")) {
for (const scheme of ["light", "dark"]) {
const { ctx, page } = await open({ scheme, screen: "signin" });
- await page.getByLabel("Apple ID").fill("[email protected]");
+ await page.getByLabel("Apple Account").fill("[email protected]");
await page.getByLabel("Password").fill("demo-password");
await page.locator("body").click({ position: { x: 5, y: 5 } });
await page.waitForTimeout(400);
diff --git a/crates/quince-auth/src/lib.rs b/crates/quince-auth/src/lib.rs
index 5d95394..ef12c04 100644
--- a/crates/quince-auth/src/lib.rs
+++ b/crates/quince-auth/src/lib.rs
@@ -90,7 +90,7 @@ const UA: &str = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/53
#[derive(Debug, thiserror::Error)]
pub enum Error {
- #[error("That Apple ID or password wasn't accepted.")]
+ #[error("That Apple Account or password wasn't accepted.")]
BadCredentials,
#[error("That code didn't match. Check your iPhone and try again.")]
BadCode,
diff --git a/packaging/flatpak/README.md b/packaging/flatpak/README.md
index 51834d8..ccaa0b7 100644
--- a/packaging/flatpak/README.md
+++ b/packaging/flatpak/README.md
@@ -40,7 +40,7 @@ lives under `~/.var/app/<id>/`), so a Flatpak starts with an empty library and f
| `--share=network` | iCloud. |
| `--socket=wayland`, `--socket=fallback-x11`, `--share=ipc` | The window; X11 only without Wayland. |
| `--device=dri` | GPU rendering for WebKitGTK. |
-| `--talk-name=org.freedesktop.secrets` | The Apple ID session lives in the Secret Service keyring. |
+| `--talk-name=org.freedesktop.secrets` | The Apple Account session lives in the Secret Service keyring. |
| `--talk-name=org.freedesktop.Notifications` | Reminder alerts. |
| `--talk-name=org.kde.StatusNotifierWatcher` | The tray icon. |
| `--filesystem=xdg-download` | Drive and Photos save straight to `~/Downloads`, not through the portal. |
diff --git a/packaging/flatpak/io.github.yashwanthkamireddi.Skykeep.metainfo.xml b/packaging/flatpak/io.github.yashwanthkamireddi.Skykeep.metainfo.xml
index 3791631..6a2695e 100644
--- a/packaging/flatpak/io.github.yashwanthkamireddi.Skykeep.metainfo.xml
+++ b/packaging/flatpak/io.github.yashwanthkamireddi.Skykeep.metainfo.xml
@@ -7,7 +7,7 @@
Every claim here has to be one the app can keep. The disclaimer is not boilerplate: this
talks to iCloud through interfaces Apple has not published, and somebody installing it is
- entitled to know that before they type their Apple ID.
+ entitled to know that before they type their Apple Account password.
-->
<component type="desktop-application">
<id>io.github.yashwanthkamireddi.Skykeep</id>
diff --git a/packaging/io.github.yashwanthkamireddi.Skykeep.metainfo.xml b/packaging/io.github.yashwanthkamireddi.Skykeep.metainfo.xml
index 3c35163..1d1f150 100644
--- a/packaging/io.github.yashwanthkamireddi.Skykeep.metainfo.xml
+++ b/packaging/io.github.yashwanthkamireddi.Skykeep.metainfo.xml
@@ -5,7 +5,7 @@
Every claim here has to be one the app can keep. The disclaimer is not boilerplate: this
talks to iCloud through interfaces Apple has not published, and somebody installing it is
- entitled to know that before they type their Apple ID.
+ entitled to know that before they type their Apple Account password.
-->
<component type="desktop-application">
<id>io.github.yashwanthkamireddi.Skykeep</id>
diff --git a/src/screens/CodeEntry.tsx b/src/screens/CodeEntry.tsx
index 3e8aed6..b57274b 100644
--- a/src/screens/CodeEntry.tsx
+++ b/src/screens/CodeEntry.tsx
@@ -192,7 +192,7 @@ export function CodeEntry({
<div className="sheet-foot">
<p className="assurance">You'll stay signed in on this computer.</p>
<button className="link" type="button" onClick={onCancel} disabled={verifying}>
- Use a different Apple ID
+ Use a different Apple Account
</button>
</div>
</div>
diff --git a/src/screens/SignIn.tsx b/src/screens/SignIn.tsx
index 7127678..bff65a7 100644
--- a/src/screens/SignIn.tsx
+++ b/src/screens/SignIn.tsx
@@ -65,8 +65,8 @@ export function SignIn({
} else {
// Apple's refusal names no field, so neither can this; it can say what to do.
setError(
- /Apple ID or password/.test(message)
- ? "Apple ID or password is incorrect. Check both and try again."
+ /Apple (ID|Account) or password/.test(message)
+ ? "Apple Account or password is incorrect. Check both and try again."
: sentence(message),
);
}
@@ -86,7 +86,7 @@ export function SignIn({
return (
<form className="sheet enter-sheet" onSubmit={submit} aria-busy={busy} noValidate>
<Mark className="mark" />
- <h1>Sign in with your Apple ID</h1>
+ <h1>Sign in with your Apple Account</h1>
<p className="lede">Your iCloud, kept on this computer.</p>
<div className={`field-group${error ? " is-invalid" : ""}`}>
@@ -105,8 +105,8 @@ export function SignIn({
autoComplete="username"
autoCapitalize="off"
spellCheck={false}
- placeholder="Apple ID"
- aria-label="Apple ID"
+ placeholder="Apple Account"
+ aria-label="Apple Account"
aria-invalid={!!error}
autoFocus
disabled={busy}