Deleted fileee from <branch-name>

Replaced the old Notesnook icon with the new one.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -4,11 +4,12 @@ labels: ["triage"]
 body:
     - type: markdown
       attributes:
-          value: >
-              Before opening a new issue, please ensure you are on the latest
-              version (it might've already been fixed), and that you've searched
-              for existing issues (please add you observations as a comment
-              there instead of creating a duplicate).
+          value: |
+              Before opening a new bug report, please ensure
+              1. you are on the latest version (it might've already been fixed),
+              2. you've searched for existing issues (please add your observations as a comment there instead of creating a duplicate).
+
+              If you are self hosting, please create a community [Q&A](https://github.com/ente-io/ente/discussions/categories/q-a) instead.
     - type: textarea
       attributes:
           label: Description
@@ -16,7 +17,8 @@ body:
               Please describe the bug. If possible, also include the steps to
               reproduce the behaviour, and the expected behaviour (sometimes
               bugs are just expectation mismatches, in which case this would be
-              a good fit for Discussions).
+              a good fit for [feature
+              requests](https://github.com/ente-io/ente/discussions/categories/feature-requests)).
       validations:
           required: true
     - type: input

.github/workflows/infra-deploy-staff.yml

@@ -1,45 +1,43 @@
 name: "Deploy (staff)"
 
 on:
-    # Run on every push to main that changes web/apps/staff/
+    # Run on every push to main that changes infra/staff/
     push:
         branches: [main]
         paths:
-            - "web/apps/staff/**"
-            - ".github/workflows/web-deploy-staff.yml"
+            - "infra/staff/**"
+            - ".github/workflows/infra-deploy-staff.yml"
     # Also allow manually running the workflow
     workflow_dispatch:
 
 jobs:
-    deploy:
+    lint:
         runs-on: ubuntu-latest
 
         defaults:
             run:
-                working-directory: web
+                working-directory: infra/staff
 
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
                   node-version: 20
                   cache: "yarn"
-                  cache-dependency-path: "web/yarn.lock"
+                  cache-dependency-path: "infra/staff/yarn.lock"
 
             - name: Install dependencies
               run: yarn install
 
-            - name: Build staff
-              run: yarn build:staff
+            - name: Build
+              run: yarn build
 
-            - name: Publish staff
+            - name: Publish
               uses: cloudflare/wrangler-action@v3
               with:
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/staff web/apps/staff/dist
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/staff infra/staff/dist

.github/workflows/infra-lint-staff.yml

@@ -0,0 +1,34 @@
+name: "Lint (staff)"
+
+on:
+    # Run on every push to a branch other than main that changes infra/staff/
+    push:
+        branches-ignore: [main]
+        paths:
+            - "infra/staff/**"
+            - ".github/workflows/infra-deploy-staff.yml"
+
+jobs:
+    deploy:
+        runs-on: ubuntu-latest
+
+        defaults:
+            run:
+                working-directory: infra/staff
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup node and enable yarn caching
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+                  cache: "yarn"
+                  cache-dependency-path: "infra/staff/yarn.lock"
+
+            - name: Install dependencies
+              run: yarn install
+
+            - name: Lint
+              run: yarn lint

.github/workflows/mobile-internal-release.yml

@@ -4,7 +4,7 @@ on:
     workflow_dispatch: # Allow manually running the action
 
 env:
-    FLUTTER_VERSION: "3.19.3"
+    FLUTTER_VERSION: "3.22.1"
 
 jobs:
     build:

.github/workflows/mobile-lint.yml

@@ -9,7 +9,8 @@ on:
             - ".github/workflows/mobile-lint.yml"
 
 env:
-    FLUTTER_VERSION: "3.19.5"
+
+    FLUTTER_VERSION: "3.22.1"
 
 jobs:
     lint:

.github/workflows/mobile-release.yml

@@ -9,7 +9,7 @@ on:
             - "photos-v*"
 
 env:
-    FLUTTER_VERSION: "3.19.3"
+    FLUTTER_VERSION: "3.22.1"
 
 jobs:
     build:

CONTRIBUTING.md

@@ -12,9 +12,10 @@ There are many ways to contribute, and most of them don't require writing code.
 
 ## Spread the word
 
-This is perhaps the most impactful contribution you can make. Spread the word.
-Online on your favorite social media channels. Offline to your friends and
-family who are looking for a privacy-friendly alternative to big tech.
+This is perhaps the most impactful contribution you can make. [Spread the
+word](https://help.ente.io/photos/features/referral-program/). Online on your
+favorite social media channels. Offline to your friends and family who are
+looking for a privacy-friendly alternative to big tech.
 
 ## Engage with the community
 
@@ -76,7 +77,10 @@ us](https://github.com/ente-io/ente/discussions). Discussing your idea with us
 first ensures that everyone is on the same page before you start working on your
 change.
 
-## Star
+## Leave a review or star
 
 If you haven't already done so, consider [starring this
-repository](https://github.com/ente-io/ente/stargazers).
+repository](https://github.com/ente-io/ente/stargazers) or leaving a review on
+[PlayStore](https://play.google.com/store/apps/details?id=io.ente.auth),
+[AppStore](https://apps.apple.com/us/app/ente-authenticator/id6444121398) or
+[AlternativeTo](https://alternativeto.net/software/ente-authenticator/).

README.md

@@ -60,8 +60,8 @@ Our labour of love. Two years ago, while building Ente Photos, we realized that
 there was no open source end-to-end encrypted authenticator app. We already had
 the building blocks, so we built one.
 
-Ente Auth is currently free. If in the future we convert this to a paid service,
-existing users will be grandfathered in.
+Ente Auth is free, and will remain free forever. If you like the service and
+want to give back, please check out Ente Photos or spread the word.
 
 <br />
 
@@ -70,7 +70,7 @@ existing users will be grandfathered in.
 [<img height="42" src=".github/assets/app-store-badge.svg">](https://apps.apple.com/app/id6444121398)
 [<img height="42" src=".github/assets/play-store-badge.png">](https://play.google.com/store/apps/details?id=io.ente.auth)
 [<img height="42" src=".github/assets/f-droid-badge.png">](https://f-droid.org/packages/io.ente.auth/)
-[<img height="42" src=".github/assets/desktop-badge.png">](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v2)
+[<img height="42" src=".github/assets/desktop-badge.png">](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v3)
 [<img height="42" src=".github/assets/web-badge.svg">](https://auth.ente.io)
 
 </div>

auth/README.md

@@ -12,7 +12,7 @@ multi-device sync.
 ### Android
 
 This repository's [GitHub
-releases](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v2)
+releases](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v3)
 contains APKs, built straight from source. These builds keep themselves updated,
 without relying on third party stores.
 
@@ -33,7 +33,7 @@ You can alternatively install the build from PlayStore or F-Droid.
 
 ### Desktop
 
-You can [**download**](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v2)
+You can [**download**](https://github.com/ente-io/ente/releases?q=tag%3Aauth-v3)
 a native desktop app from this repository's GitHub releases. The desktop app
 works on Windows, Linux and macOS.
 
@@ -95,13 +95,10 @@ more, see [docs/adding-icons](docs/adding-icons.md).
 
 ## 💚 Contribute
 
-For more ways to contribute, see [../CONTRIBUTING.md](../CONTRIBUTING.md).
+The best way to support this project is by checking out [Ente
+Photos](../mobile/README.md) or spreading the word.
 
-You can also support us by giving this project a ⭐ star on GitHub or by leaving
-a review on
-[PlayStore](https://play.google.com/store/apps/details?id=io.ente.auth),
-[AppStore](https://apps.apple.com/us/app/ente-authenticator/id6444121398) or
-[AlternativeTo](https://alternativeto.net/software/ente-authenticator/).
+For more ways to contribute, see [../CONTRIBUTING.md](../CONTRIBUTING.md).
 
 ## ⭐️ About
 

auth/assets/custom-icons/_data/custom-icons.json

@@ -18,10 +18,10 @@
       "title": "AscendEX"
     },
     {
-      "title": "BitMEX"
+      "title": "Bitfinex"
     },
     {
-      "title": "Bitfinex"
+      "title": "BitMEX"
     },
     {
       "title": "Bitvavo",
@@ -32,13 +32,12 @@
     },
     {
       "title": "Bloom Host",
-      "slug": "bloom_host"
+      "slug": "bloom_host",
+      "altNames": ["Bloom Host Billing"]
     },
     {
       "title": "BorgBase",
-      "altNames": [
-        "borg"
-      ],
+      "altNames": ["borg"],
       "slug": "BorgBase"
     },
     {
@@ -57,10 +56,10 @@
       "hex": "D14633"
     },
     {
-      "title": "ConfigCat"
+      "title": "Cloudflare"
     },
     {
-      "title": "Cloudflare"
+      "title": "ConfigCat"
     },
     {
       "title": "Control D",
@@ -72,17 +71,21 @@
     },
     {
       "title": "DCS",
-      "altNames": [
-        "Digital Combat Simulator"
-      ],
+      "altNames": ["Digital Combat Simulator"],
       "slug": "dcs"
     },
     {
       "title": "DEGIRO"
     },
+    {
+      "title": "DirectAdmin"
+    },
     {
       "title": "Discourse"
     },
+    {
+      "title": "Doppler"
+    },
     {
       "title": "dus.net",
       "slug": "dusnet"
@@ -117,14 +120,15 @@
     {
       "title": "GitLab"
     },
+    {
+      "title": "GMX"
+    },
     {
       "title": "Google"
     },
     {
       "title": "Gosuslugi",
-      "altNames": [
-        "Госуслуги"
-      ],
+      "altNames": ["Госуслуги"],
       "slug": "Gosuslugi"
     },
     {
@@ -135,21 +139,24 @@
       "slug": "healthchecks"
     },
     {
-      "title": "ING"
+      "title": "Hivelocity"
     },
     {
-      "title": "INWX"
+      "title": "IceDrive",
+      "slug": "Icedrive"
+    },
+    {
+      "title": "ING"
     },
     {
       "title": "Instagram"
     },
     {
-      "title": "IVPN",
-      "slug": "IVPN"
+      "title": "INWX"
     },
     {
-      "title": "IceDrive",
-      "slug": "Icedrive"
+      "title": "IVPN",
+      "slug": "IVPN"
     },
     {
       "title": "Jagex",
@@ -158,10 +165,6 @@
     {
       "title": "Kagi"
     },
-    {
-      "title": "KPN",
-      "color": "00CC00"
-    },
     {
       "title": "Kick",
       "hex": "53FC19"
@@ -172,6 +175,10 @@
     {
       "title": "Koofr"
     },
+    {
+      "title": "KPN",
+      "color": "00CC00"
+    },
     {
       "title": "Kraken",
       "hex": "5848D5"
@@ -190,27 +197,21 @@
     {
       "title": "Letterboxd"
     },
+    {
+      "title": "Local",
+      "slug": "local_wp",
+      "altNames": ["LocalWP", "Local WP", "Local Wordpress"]
+    },
     {
       "title": "Mastodon",
-      "altNames": [
-        "mstdn",
-        "fediscience",
-        "mathstodon",
-        "fosstodon"
-      ],
+      "altNames": ["mstdn", "fediscience", "mathstodon", "fosstodon"],
       "slug": "mastodon",
       "hex": "6364FF"
     },
     {
       "title": "Mercado Livre",
-      "slug": "mercado_livre"
-    },
-    {
-      "title": "Murena",
-      "altNames": [
-        "eCloud"
-      ],
-      "slug": "ecloud"
+      "slug": "mercado_livre",
+      "altNames": ["Mercado Libre", "MercadoLibre", "MercadoLivre"]
     },
     {
       "title": "Microsoft"
@@ -221,6 +222,11 @@
     {
       "title": "Mozilla"
     },
+    {
+      "title": "Murena",
+      "altNames": ["eCloud"],
+      "slug": "ecloud"
+    },
     {
       "title": "MyFRITZ!Net",
       "slug": "myfritz"
@@ -294,6 +300,14 @@
     {
       "title": "Proxmox"
     },
+    {
+      "title": "Real-Debrid",
+      "slug": "real_debrid"
+    },
+    {
+      "title": "Registro.br",
+      "slug": "registro_br"
+    },
     {
       "title": "Revolt",
       "hex": "858585"
@@ -302,6 +316,10 @@
       "title": "Rockstar Games",
       "slug": "rockstar_games"
     },
+    {
+      "title": "RuneMate",
+      "hex": "2ECC71"
+    },
     {
       "title": "Rust Language Forum",
       "slug": "rust_language_forum",
@@ -331,6 +349,9 @@
       "slug": "standardnotes",
       "hex": "2173E6"
     },
+    {
+      "title": "Surfshark"
+    },
     {
       "title": "Synology DSM",
       "slug": "synology_dsm"
@@ -341,7 +362,8 @@
       "hex": "FFFFFF"
     },
     {
-      "title": "Techlore"
+      "title": "Techlore",
+      "altNames": ["Techlore Courses", "Techlore Forums"]
     },
     {
       "title": "Termius",
@@ -399,19 +421,27 @@
       "slug": "wyze"
     },
     {
-      "title": "X",
+      "title": "WorkOS",
+      "slug": "workos",
       "altNames": [
-        "twitter"
-      ],
+        "Work OS"
+      ]
+    },
+    {
+      "title": "X",
+      "altNames": ["twitter"],
       "slug": "x"
     },
     {
       "title": "Yandex",
-      "altNames": [
-        "Ya",
-        "Яндекс"
-      ],
+      "altNames": ["Ya", "Яндекс"],
       "slug": "Yandex"
+    },
+    {
+      "title": "YNAB",
+      "altNames": ["You Need A Budget"],
+      "slug": "ynab",
+      "hex": "3B5EDA"
     }
   ]
-}
+}

auth/assets/custom-icons/icons/Notesnook.svg

@@ -1,20 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"
-  xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 339 339">
-  <defs />
-  <defs>
-    <linearGradient id="b" x1="193.9" x2="198.7" y1="166.8" y2="223.3" gradientTransform="rotate(5 4448 -4204) scale(2.93671)" gradientUnits="userSpaceOnUse" xlink:href="#a" />
-    <linearGradient id="a">
-      <stop offset="0" />
-      <stop offset="1" stop-color="#fff9f9" stop-opacity="0" />
-    </linearGradient>
-    <linearGradient id="c" x1="167.8" x2="270.6" y1="76.9" y2="64.2" gradientTransform="rotate(5 465 -2050) scale(1.50082)" gradientUnits="userSpaceOnUse" xlink:href="#a" />
-  </defs>
-  <g transform="translate(0 42)">
-    <path fill="url(#b)" d="M160 205l154 42-141 44-155-42z" />
-    <path fill="url(#c)" d="M160-35v240l154 42 1-253z" />
-    <path fill="none" stroke-width="1.2" d="M160 205V-35m0 240L18 249m142-44l154 41" />
-    <path d="M84 109l35 54V98l21-7v91l-27 9-35-54v65l-21 6v-91z" />
-    <rect width="86.1" height="12.6" x="185" y="97" fill="#bebebe" ry="2.3" transform="skewY(15) scale(.9669 1)" />
-    <path fill="#bebebe" d="M181 169l99 26 2 3v8c0 1-1 2-2 1l-99-26-2-3v-7c0-2 1-2 2-2zm0-47l99 27 2 2v8l-2 2-99-27c-1 0-2-1-2-3v-7l2-2z" />
-  </g>
-</svg>

auth/assets/custom-icons/icons/directadmin.svg

@@ -0,0 +1,8 @@
+<svg width="100" height="100" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-45 57.071 32.929)">
+		<path fill="#31B7E9" d="m20 0v20h-20v18h40v-38z"/>
+		<rect fill="#0682B4" y="36" width="40" height="4"/>
+		<path fill="#31B7E9" d="m50 0v50h-50v18h70v-68z"/>
+		<rect fill="#0682B4" y="66" width="70" height="4"/>
+	</g>
+</svg>

auth/assets/custom-icons/icons/doppler.svg

@@ -0,0 +1 @@
+<svg fill="none" height="800" viewBox="0 0 800 800" width="800" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><radialGradient id="a" cx="0" cy="0" gradientTransform="matrix(-423.0004 -300.00003 172.7003 -243.50762 861 448)" gradientUnits="userSpaceOnUse" r="1"><stop offset="0" stop-color="#ea5926"/><stop offset="1" stop-color="#ea5a25" stop-opacity="0"/></radialGradient><radialGradient id="b" cx="0" cy="0" gradientTransform="matrix(-318.99928 -110.0022 110.0022 -318.99928 800 736)" gradientUnits="userSpaceOnUse" r="1"><stop offset="0" stop-color="#ea5a25"/><stop offset="1" stop-color="#ed5a21" stop-opacity="0"/></radialGradient><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="505" x2="1.46826" y1="-305" y2="800.669"><stop offset="0" stop-color="#ff9efa"/><stop offset=".426562" stop-color="#ac50f7"/><stop offset=".646435" stop-color="#6b13f5"/></linearGradient><clipPath id="d"><path d="m0 0h500v500h-500z" transform="translate(150 150)"/></clipPath><rect fill="url(#c)" height="800" rx="400" width="800"/><rect fill="url(#a)" height="800" rx="400" width="800"/><rect fill="url(#b)" height="800" rx="400" width="800"/><g clip-path="url(#d)" fill="#fff"><path d="m467.396 151.3c-21.021-5.632-42.449 7.589-46.843 28.903l-19.94 96.716c-13.025 63.174-62.376 112.549-125.545 125.603l-94.873 19.607c-21.312 4.405-34.527 25.833-28.894 46.854 5.633 21.023 27.796 32.974 48.456 26.128l92.327-30.593c61.386-20.341 128.989-2.227 171.981 46.082l64.666 72.664c14.467 16.255 39.63 16.987 55.017 1.6 15.39-15.389 14.655-40.558-1.607-55.023l-73.135-65.056c-48.44-43.09-66.604-110.866-46.202-172.405l30.71-92.633c6.847-20.655-5.099-42.815-26.118-48.447z"/><path d="m216.103 272.283c-17.191-15.554-17.86-42.331-1.467-58.723 16.393-16.393 43.169-15.724 58.723 1.467l48.898 54.045c13.189 14.578 12.631 36.937-1.27 50.838s-36.261 14.46-50.839 1.271zm380.232 29.881c22.065-7.11 45.589 5.698 51.589 28.091s-7.967 45.248-30.632 50.122l-71.253 15.325c-19.22 4.133-38.305-7.53-43.393-26.52-5.088-18.989 5.608-38.632 24.32-44.662zm-217.826 315.811c-4.875 22.664-27.73 36.632-50.122 30.632-22.393-6-35.202-29.524-28.091-51.589l22.355-69.37c6.03-18.711 25.673-29.407 44.663-24.319 18.989 5.088 30.653 24.173 26.519 43.392z"/></g></svg>

auth/assets/custom-icons/icons/gmx.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+   <circle cx="512" cy="512" r="512" style="fill:#004788"/>
+   <path d="m736.6 506.6 50.1-83.3h-51.1L709 465.6l-28.6-42.3h-56l59 83.2-59 93.9h56l31.9-53.4 37.8 53.4h50l-63.5-93.8zm-185.1-83.4-38 94.8-36-94.8h-45.4L402 600.6h45.9l14.8-102.2h.5l40.7 102.2h18.4l42.6-102.2h.6l12.9 102.2h46.1l-26.9-177.4h-46.1zm-233.8 78.5v36.1h37.6c-2 20.2-17.3 30.6-37.1 30.6-30.1 0-46.4-27.7-46.4-55.2s15.6-55.6 45.7-55.6c18.5 0 31.7 11.2 38.1 27.9l43.5-18.2c-15.2-32.9-43.2-49.2-79.5-49.2-56.8 0-95.5 37.6-95.5 94.8 0 55.4 38.5 93 93.9 93 29.4 0 55.4-10.5 72.6-34.6 15.4-21.8 17.6-43.9 18-69.7h-90.9z" style="fill:#fff"/>
+</svg>

auth/assets/custom-icons/icons/hivelocity.svg

@@ -0,0 +1 @@
+<svg id="logosandtypes_com" data-name="logosandtypes com" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:none;}.cls-2{fill:#e31937;}</style></defs><g id="Layer_2" data-name="Layer 2"><path id="Layer_3" data-name="Layer 3" class="cls-1" d="M0,0H150V150H0Z" transform="translate(0 0)"/></g><rect class="cls-2" x="13.34" y="14.37" width="15.01" height="123.08"/><rect class="cls-2" x="122.92" y="14.37" width="15.01" height="123.08"/><rect class="cls-2" x="43.36" y="54.9" width="64.54" height="15.01"/><rect class="cls-2" x="43.36" y="83.42" width="64.54" height="15.01"/></svg>

auth/assets/custom-icons/icons/local_wp.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="320px" height="320px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g><path style="opacity:0.992" fill="#52bb7b" d="M 146.5,-0.5 C 155.167,-0.5 163.833,-0.5 172.5,-0.5C 183.052,2.2756 192.719,6.94227 201.5,13.5C 234.5,46.5 267.5,79.5 300.5,112.5C 318.79,135.86 322.456,161.527 311.5,189.5C 308.11,195.357 304.443,201.023 300.5,206.5C 268.052,239.07 235.385,271.404 202.5,303.5C 201.614,304.325 201.281,305.325 201.5,306.5C 197.68,307.84 194.347,310.006 191.5,313C 185.322,315.892 178.989,318.059 172.5,319.5C 163.833,319.5 155.167,319.5 146.5,319.5C 139.355,317.751 132.355,315.418 125.5,312.5C 125.5,311.5 125.5,310.5 125.5,309.5C 122.643,308.667 119.977,307.334 117.5,305.5C 84.5,272.5 51.5,239.5 18.5,206.5C 0.210219,183.14 -3.45645,157.473 7.5,129.5C 10.89,123.643 14.5567,117.977 18.5,112.5C 51.5,79.5 84.5,46.5 117.5,13.5C 126.281,6.94227 135.948,2.2756 146.5,-0.5 Z"/></g>
+<g><path style="opacity:1" fill="#fafdfb" d="M 151.5,41.5 C 152.47,57.4524 152.803,73.4524 152.5,89.5C 129.661,112.506 106.994,135.672 84.5,159C 105.661,180.994 126.994,202.828 148.5,224.5C 149.031,226.544 150.198,228.211 152,229.5C 152.5,244.496 152.667,259.496 152.5,274.5C 152.141,276.371 151.141,277.871 149.5,279C 146.833,279.667 144.167,279.667 141.5,279C 111.333,248.833 81.1667,218.667 51,188.5C 47.074,183.63 43.4073,178.63 40,173.5C 34.8493,157.438 38.1826,143.438 50,131.5C 80.1667,101.333 110.333,71.1667 140.5,41C 143.702,39.5167 147.036,39.1834 150.5,40C 151.056,40.3826 151.389,40.8826 151.5,41.5 Z"/></g>
+<g><path style="opacity:1" fill="#fbfdfc" d="M 279.5,148.5 C 280.903,153.387 281.569,158.387 281.5,163.5C 279.693,171.198 276.193,178.198 271,184.5C 239.5,216 208,247.5 176.5,279C 173.833,279.667 171.167,279.667 168.5,279C 167.177,278.184 166.511,277.017 166.5,275.5C 166.197,259.786 166.531,244.119 167.5,228.5C 189.951,205.881 212.284,183.048 234.5,160C 212.374,136.874 189.874,114.04 167,91.5C 166.536,90.9056 166.369,90.2389 166.5,89.5C 166.212,73.4649 166.545,57.4649 167.5,41.5C 167.611,40.8826 167.944,40.3826 168.5,40C 171.964,39.1834 175.298,39.5167 178.5,41C 208.667,71.1667 238.833,101.333 269,131.5C 271.667,134.833 274.333,138.167 277,141.5C 278.411,143.65 279.245,145.984 279.5,148.5 Z"/></g>
+<g><path style="opacity:1" fill="#cfecdb" d="M 151.5,41.5 C 152.117,41.6107 152.617,41.944 153,42.5C 153.828,58.3388 153.661,74.0054 152.5,89.5C 152.803,73.4524 152.47,57.4524 151.5,41.5 Z"/></g>
+<g><path style="opacity:1" fill="#cfecda" d="M 167.5,41.5 C 166.545,57.4649 166.212,73.4649 166.5,89.5C 165.339,74.0054 165.172,58.3388 166,42.5C 166.383,41.944 166.883,41.6107 167.5,41.5 Z"/></g>
+<g><path style="opacity:1" fill="#57bd7e" d="M 138.5,63.5 C 139.654,69.987 139.821,76.6536 139,83.5C 114.597,107.948 90.0967,132.281 65.5,156.5C 62.1667,161.167 58.8333,165.833 55.5,170.5C 50.2141,162.481 50.3807,154.481 56,146.5C 83.2852,118.477 110.785,90.8102 138.5,63.5 Z"/></g>
+<g><path style="opacity:1" fill="#59be80" d="M 179.5,63.5 C 180.473,63.9867 181.473,64.4867 182.5,65C 203.99,87.4562 225.823,109.623 248,131.5C 250.67,138.156 249.67,144.156 245,149.5C 223.333,127.833 201.667,106.167 180,84.5C 179.5,77.5079 179.334,70.5079 179.5,63.5 Z"/></g>
+<g><path style="opacity:1" fill="#fafdfb" d="M 144.5,113.5 C 153.839,113.334 163.173,113.5 172.5,114C 173.416,114.374 174.25,114.874 175,115.5C 175.667,118.167 175.667,120.833 175,123.5C 164.243,124.653 153.41,124.82 142.5,124C 140.522,121.503 140.022,118.669 141,115.5C 142.302,114.915 143.469,114.249 144.5,113.5 Z"/></g>
+<g><path style="opacity:1" fill="#f2faf4" d="M 122.5,142.5 C 122.287,139.549 122.954,136.882 124.5,134.5C 147.094,133.345 169.761,133.178 192.5,134C 193.416,134.374 194.25,134.874 195,135.5C 195.667,137.833 195.667,140.167 195,142.5C 194.5,143.667 193.667,144.5 192.5,145C 170.167,145.667 147.833,145.667 125.5,145C 124.309,144.302 123.309,143.469 122.5,142.5 Z"/></g>
+<g><path style="opacity:1" fill="#addfc0" d="M 124.5,134.5 C 122.954,136.882 122.287,139.549 122.5,142.5C 120.816,139.282 121.483,136.615 124.5,134.5 Z"/></g>
+<g><path style="opacity:1" fill="#57bd7f" d="M 265.5,151.5 C 267.083,157.318 266.75,162.985 264.5,168.5C 262.887,171.286 261.054,173.953 259,176.5C 232.986,202.68 206.82,228.68 180.5,254.5C 179.167,247.833 179.167,241.167 180.5,234.5C 206.181,209.652 231.348,184.319 256,158.5C 258.478,155.71 260.312,152.544 261.5,149C 263.615,148.464 264.948,149.297 265.5,151.5 Z"/></g>
+<g><path style="opacity:1" fill="#f1f9f4" d="M 105.5,153.5 C 141.168,153.333 176.835,153.5 212.5,154C 215.57,156.569 216.237,159.736 214.5,163.5C 213.975,164.192 213.308,164.692 212.5,165C 176.833,165.667 141.167,165.667 105.5,165C 100.193,161.036 100.193,157.202 105.5,153.5 Z"/></g>
+<g><path style="opacity:1" fill="#94d5ad" d="M 279.5,148.5 C 281.13,150.026 281.963,152.026 282,154.5C 282.805,157.696 282.638,160.696 281.5,163.5C 281.569,158.387 280.903,153.387 279.5,148.5 Z"/></g>
+<g><path style="opacity:1" fill="#a5dcba" d="M 265.5,151.5 C 266.117,151.611 266.617,151.944 267,152.5C 269.288,158.528 268.454,163.861 264.5,168.5C 266.75,162.985 267.083,157.318 265.5,151.5 Z"/></g>
+<g><path style="opacity:1" fill="#5abe80" d="M 73.5,169.5 C 95.4114,190.911 117.245,212.577 139,234.5C 139.667,241.5 139.667,248.5 139,255.5C 115.895,233.306 93.2279,210.64 71,187.5C 69.4661,183.289 69.1327,178.956 70,174.5C 70.6972,172.416 71.8639,170.749 73.5,169.5 Z"/></g>
+<g><path style="opacity:1" fill="#fefefe" d="M 122.5,182.5 C 122.448,180.097 122.781,177.764 123.5,175.5C 146.761,174.345 170.094,174.178 193.5,175C 196.167,178.333 196.167,181.667 193.5,185C 170.5,185.667 147.5,185.667 124.5,185C 123.619,184.292 122.953,183.458 122.5,182.5 Z"/></g>
+<g><path style="opacity:1" fill="#a0dab7" d="M 123.5,175.5 C 122.781,177.764 122.448,180.097 122.5,182.5C 121.853,181.726 121.52,180.726 121.5,179.5C 121.34,177.645 122.007,176.312 123.5,175.5 Z"/></g>
+<g><path style="opacity:1" fill="#fbfdfc" d="M 143.5,194.5 C 153.506,194.334 163.506,194.5 173.5,195C 176.936,198.06 177.269,201.393 174.5,205C 164.167,205.667 153.833,205.667 143.5,205C 141.09,204.242 140.09,202.575 140.5,200C 140.12,197.297 141.12,195.463 143.5,194.5 Z"/></g>
+<g><path style="opacity:1" fill="#d2eddd" d="M 148.5,224.5 C 150.129,225.625 151.629,226.959 153,228.5C 153.828,244.006 153.661,259.339 152.5,274.5C 152.667,259.496 152.5,244.496 152,229.5C 150.198,228.211 149.031,226.544 148.5,224.5 Z"/></g>
+<g><path style="opacity:1" fill="#d1eddc" d="M 167.5,228.5 C 166.531,244.119 166.197,259.786 166.5,275.5C 165.339,260.339 165.172,245.006 166,229.5C 166.383,228.944 166.883,228.611 167.5,228.5 Z"/></g>
+</svg>

auth/assets/custom-icons/icons/notesnook.svg

@@ -0,0 +1,12 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_24_33)">
+<path d="M1024 0H0V1024H1024V0Z" fill="black"/>
+<path d="M724.985 682.919C707.73 733.33 673.15 775.984 627.397 803.291C581.645 830.598 527.687 840.787 475.128 832.044C422.568 823.301 374.814 796.194 340.365 755.546C305.916 714.898 287.006 663.347 287 610.064V499.814L366.121 532.867V610.019C366.114 630.798 370.555 651.337 379.145 670.256C387.735 689.176 400.276 706.037 415.925 719.707C418.895 722.294 421.978 724.814 425.161 727.166C448.518 744.554 476.563 754.518 505.655 755.763C506.645 755.763 507.601 755.842 508.58 755.864C509.559 755.887 510.83 755.864 511.955 755.864C513.08 755.864 514.205 755.864 515.33 755.864C516.455 755.864 517.265 755.864 518.255 755.763C547.336 754.515 575.371 744.56 598.726 727.188C601.899 724.837 604.981 722.328 607.963 719.741C628.519 701.761 643.619 678.375 651.545 652.241L724.985 682.919Z" fill="white"/>
+<path d="M737 414V610.065C737 612.596 737 615.139 736.842 617.67L657.879 584.651V414C657.866 376.316 643.272 340.099 617.154 312.934C591.035 285.77 555.419 269.766 517.765 268.274C480.11 266.782 443.339 279.918 415.154 304.931C386.968 329.944 369.554 364.893 366.56 402.457C366.279 406.26 366.121 410.119 366.121 414V462.712L287 429.637V189H512C571.674 189 628.903 212.705 671.099 254.901C713.295 297.097 737 354.326 737 414Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_24_33">
+<rect width="1024" height="1024" rx="200" fill="white"/>
+</clipPath>
+</defs>
+</svg>

auth/assets/custom-icons/icons/real_debrid.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 90 90" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="M45.155.025c-.033.034-1.094.1-2.34.167-1.245.05-2.49.134-2.776.168-.27.05-1.077.167-1.767.267-3.282.468-7.49 1.656-10.738 3.043A45.529 45.529 0 0 0 3.787 27.014C1.867 31.28.52 36.462.117 41.027-.1 43.57 0 48.97.304 50.56c.033.167.117.736.168 1.237.084.753.522 2.793 1.027 4.766.05.184.134.585.185.87.05.3.151.552.219.552.067 0 .134.1.134.234 0 .518.943 3.093 1.111 2.993.1-.05.118-.017.067.067-.151.25.286 1.254.472 1.103.067-.083.084-.033.016.084-.084.134.085.72.421 1.421.572 1.238 2.541 4.816 2.844 5.184.101.117.489.686.859 1.271.64 1.003 2.827 3.78 3.787 4.833 6.547 7.04 14.39 11.655 23.293 13.729 1.161.267 2.474.535 2.911.602.455.05.993.133 1.178.184 2.188.418 11.075.418 12.74-.017.136-.05.523-.117.842-.167 2.794-.435 7.204-1.64 9.257-2.525.32-.15.74-.318.926-.385.185-.067 1.094-.485 2.02-.92 7.304-3.444 13.598-8.88 18.193-15.735 1.8-2.659 2.912-4.816 4.207-8.16.556-1.422 1.549-4.633 1.7-5.469.034-.234.135-.685.22-1.003.083-.318.201-.853.252-1.17.05-.318.117-.77.168-1.004.505-2.642.64-8.31.27-11.12-.203-1.555-.809-4.348-1.01-4.732-.068-.117-.455.953-.876 2.458-.404 1.455-.757 2.642-.774 2.625-.017-.016-.084-.485-.135-1.02-.185-1.923-.269-2.525-.673-4.515-.437-2.19-1.313-5.05-2.053-6.772-.572-1.304-1.767-3.512-1.902-3.512-.067 0-.118 1.305-.118 2.876-.05 8.78-1.144 16.455-3.231 22.558-1.094 3.228-3.333 8.01-4.965 10.652-3.905 6.271-9.863 11.187-16.763 13.846-1.464.552-4.746 1.472-5.975 1.656-4.948.769-8.87.685-13.33-.268-12.942-2.76-23.377-13.36-25.868-26.32-.387-1.99-.42-2.174-.555-3.997-.168-2.408-.084-5.802.202-7.124.034-.217.118-.685.168-1.02.05-.334.286-1.354.522-2.257.236-.92.438-1.773.471-1.906.354-1.505 2.44-5.987 3.67-7.943 2.558-4.014 6.479-7.927 10.586-10.552 3.786-2.408 9.054-4.33 13.784-5.017 1.211-.167 6.361-.217 7.657-.05 3.3.385 3.753.452 5.89.836 7.71 1.405 15.4 4.716 24.455 10.569 1.212.802 2.222 1.354 2.222 1.237 0-.334-1.633-3.06-2.66-4.448-1.834-2.508-4.291-5.033-6.832-7.023-.808-.652-1.448-1.187-1.38-1.187.05 0 .387.1.723.234 1.515.568 4.46 1.455 4.612 1.404.1-.033-.522-.769-1.397-1.622-4.208-4.197-9.678-7.441-15.905-9.43C56.465 1.63 53.587.91 52.325.726c-.37-.066-1.28-.2-2.02-.317-.757-.117-2.154-.234-3.113-.268-.976-.017-1.801-.067-1.868-.117-.05-.033-.135-.033-.169 0Z" fill="#B8D995"/><path d="m44.845 89.975.048-.012.296-.031.676-.048 1.32-.076 1.47-.073 1.167-.08.14-.015.195-.033.803-.122.768-.112c3.282-.468 7.49-1.656 10.738-3.043a45.525 45.525 0 0 0 23.747-23.344c1.92-4.265 3.266-9.448 3.67-14.013.023-.276.043-.585.06-.92l.027-.699.019-.751.01-.788c-.01-1.452-.079-2.806-.21-3.8l-.056-.396-.068-.432-.08-.456-.133-.708-.192-.926-.143-.634-.09-.372-.084-.319-.075-.254a1.629 1.629 0 0 0-.089-.236c-.012-.022-.035-.004-.066.05l-.054.104-.066.153-.119.314-.138.404-.154.483-.164.55-.606 2.13-.222.731-.056.16c-.002.003-.003.005-.004.004l-.014-.051-.021-.128-.041-.302-.045-.395-.116-1.16-.065-.567-.069-.521-.079-.516a28.33 28.33 0 0 0-.045-.267l-.106-.579-.207-1.049c-.437-2.19-1.313-5.05-2.053-6.772l-.142-.316-.245-.515-.178-.358-.368-.716-.27-.502-.248-.44-.144-.246-.124-.196c-.092-.141-.157-.223-.183-.223-.01 0-.018.024-.026.07l-.017.12-.015.173-.026.486-.023.822-.01.993v.212c-.051 8.78-1.145 16.455-3.232 22.558a44.95 44.95 0 0 1-1.008 2.655l-.403.954c-1.108 2.57-2.466 5.282-3.554 7.043-3.905 6.271-9.863 11.187-16.763 13.846l-.233.086-.536.184-.297.097-.638.2-.678.201-.346.1-.694.193-.34.091-.657.17-.603.144c-.38.087-.707.153-.953.19-4.767.74-8.58.69-12.841-.167l-.862-.122-.822-.132-.938-.164-.365-.065c-7.708-1.405-15.4-4.716-24.454-10.569l-.505-.327-.466-.29-.412-.244-.346-.191-.186-.095a3.307 3.307 0 0 0-.078-.036l-.125-.051c-.067-.023-.104-.025-.104-.003 0 .048.033.144.094.279l.109.229.145.277.175.318.309.536.35.58.374.6.382.59.25.373.243.35.228.316c1.72 2.351 3.987 4.718 6.358 6.644l.616.493.734.603.336.289.107.098c.055.054.078.083.062.083l-.072-.014-.14-.04-.185-.06-.214-.076-.274-.104-.536-.19-.59-.2-.823-.265-.993-.305-.833-.238-.369-.095-.174-.038-.106-.015a.08.08 0 0 0-.026.002c-.028.009 0 .072.074.178l.11.145.149.18.185.211.218.237.247.257.27.273.144.14c4.067 4.058 9.314 7.225 15.285 9.229l.62.203c.198.065.408.131.625.198l.673.2.702.198.714.191.356.092.696.173.662.155.61.133.538.106c.165.03.316.056.449.076l.584.095 1.436.222.245.035.58.068c.209.022.43.043.656.062l.68.052c.337.023.664.04.952.05l.53.014.745.033.327.025.153.018.092.019.021.009c.05.033.135.033.169 0Z" fill="#9FD3EE"/></g></svg>

auth/assets/custom-icons/icons/runemate.svg

@@ -0,0 +1,8 @@
+<svg height="512pt" viewBox="0 0 512 512" width="512pt" xmlns="http://www.w3.org/2000/svg" fill="#2ecc71">
+  <symbol id="a" viewBox="0 0 1000 1000" style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision">
+    <path d="M456.557 954.142c-51.209-5.834-105.636-23.11-164.89-52.34-77.345-38.153-130.132-84.108-171.904-149.652-13.757-21.586-34.244-56.915-41.287-71.198-26.53-53.794-41.318-128.813-39.427-200 3.104-116.883 48.87-223.866 132.312-309.3C245.728 95.508 343.98 48.75 449.405 39.326c16.075-1.437 42.857-1.633 42.857-.314 0 .84-9.912 36.005-15.619 55.41-2.335 7.94-2.459 8.099-5.794 7.366-5.02-1.103-38.597 1.5-54.588 4.23-78.184 13.352-148.872 53.08-205.858 115.696-44.404 48.79-73.222 96.544-90.72 150.33-9.247 28.422-13.436 51.91-15.467 86.718-4.603 78.927 3.852 137.972 26.617 185.88 11.44 24.075 41.212 74.137 53.452 89.88 12.95 16.658 45.5 53.571 47.225 53.557 1.003-.008 6.645-1.359 12.538-3.002 33.243-9.268 71.782-16.19 110.119-19.778 23.046-2.158 81.589-1.805 105.952.637 80.53 8.074 152.793 28.04 218.763 60.442 14.585 7.164 22.502 10.436 24.057 9.942 4.456-1.414 34.073-21.892 46.466-32.127 36.789-30.385 55.405-51.859 83.62-96.456 12.304-19.447 33.186-60.968 40.115-79.762 11.156-30.26 17.905-59.183 20.418-87.5 1.58-17.803.844-74.678-1.255-97.024-5.875-62.539-19.14-96.584-65.864-169.047-18.12-28.102-30.924-44.798-47.526-61.974-33.977-35.15-76.434-63.926-121.175-82.126-7.53-3.063-13.868-5.732-14.086-5.932-.217-.2 2.595-13.79 6.25-30.202 3.655-16.412 6.646-30.065 6.646-30.34 0-.699 20.397 5.54 29.894 9.143 48.79 18.51 94.215 50.387 138.598 97.264 28.447 30.046 56.905 68.452 77.93 105.172 23.918 41.775 43.482 101.062 51.717 156.733 12.077 81.642 3.119 156.375-27.337 228.05-26.303 61.906-59.852 113.54-102.193 157.284-24.676 25.493-52.838 48.34-76.347 61.935-5.239 3.03-14.647 8.58-20.908 12.333-39.579 23.728-89.618 43.541-136.83 54.177-30.244 6.813-50.423 9.032-86.31 9.49-23.602.3-37.675-.07-48.205-1.27z"/>
+    <path d="M500.595 722.575c-49.27-3.036-105.94-12.2-150.595-24.354-49.438-13.455-103.365-35.123-141.369-56.803-12.536-7.15-12.797-7.387-12.786-11.562.006-2.343 1.876-23.814 4.155-47.713 2.28-23.899 4.15-44.297 4.155-45.328.01-1.554-3.775-2.292-22.044-4.298-12.131-1.332-22.383-2.75-22.782-3.148-.891-.891 9.648-113.624 10.723-114.698.423-.423 11.314.114 24.203 1.193 12.89 1.08 23.606 1.79 23.816 1.581.27-.27 14.667-126.689 14.667-128.792 0-.604 20.651-7.884 29.762-10.492 34.467-9.866 97.903-19.388 152.496-22.89l12.614-.81 1.922-15.477c1.056-8.512 2.076-15.622 2.266-15.799.19-.177 12.08.182 26.425.797 14.344.616 26.479.695 26.966.176.487-.52 15.317-42.194 32.956-92.61 31.657-90.487 32.112-91.672 35.394-92.059 4.302-.507 31.608 2.981 39.318 5.023 3.274.867 5.892 2.055 5.818 2.64-.073.584-8.608 42.17-18.966 92.413-10.358 50.243-18.592 91.591-18.298 91.886.294.294 13.353 2.995 29.019 6.003 15.666 3.007 28.707 5.69 28.979 5.963.272.272-.376 8.106-1.44 17.409-1.065 9.303-1.681 17.168-1.37 17.479.31.31 6.685 1.808 14.166 3.328 27.185 5.523 59.165 15.788 92.694 29.752 18.402 7.665 72.77 34.438 74.732 36.802.998 1.202-.2 17.922-4.742 66.131-3.342 35.487-5.827 64.772-5.52 65.079.306.306 10.781 1.422 23.278 2.48 19.132 1.62 22.722 2.221 22.722 3.81 0 3.471-10.586 114.581-10.95 114.934-.198.192-11.208-.558-24.467-1.666-16.147-1.35-24.13-1.608-24.176-.783-.038.678-2.583 22.36-5.656 48.182l-5.587 46.95-15.475 3.924c-48.273 12.242-94.678 20.005-144.642 24.197-20.767 1.742-81.67 2.427-102.38 1.15zm83.334-73.78c32.215-2.204 65.058-6.745 96.16-13.295 10.325-2.175 12.312-2.962 12.758-5.05.29-1.36 5.928-54.426 12.529-117.924 11.371-109.385 11.891-115.53 9.9-116.986-4.135-3.024-25.054-13.273-39.086-19.15-47.244-19.786-97.576-32.17-158.928-39.105-26.75-3.023-100.774-3.013-129.096.019-24.927 2.667-45.3 5.631-67.127 9.764l-16.763 3.175-.677 4.938c-2.761 20.122-25.65 226.992-25.376 229.34.296 2.531 2.763 4.19 16.42 11.041C351.133 623.9 427.686 643.701 500 648.678c20.699 1.425 63.937 1.485 83.929.117z"/>
+    <path d="M441.221 506.496c-2.209-.959-9.779-7.098-16.821-13.644-7.043-6.545-13.208-11.9-13.7-11.9-.494 0-7.17 4.746-14.838 10.547-9.216 6.972-15.442 10.829-18.369 11.378-12.159 2.28-25.707-8.772-25.707-20.972 0-10.383 3.31-14.929 22.964-31.532 20.158-17.029 29.05-20.901 41.876-18.239 9.676 2.01 17.414 8.276 33.054 26.77 15.838 18.73 19.347 24.737 19.36 33.152.007 5.098-.483 6.196-4.344 9.734-6.791 6.223-15.813 8.032-23.475 4.706zm171.214 16.261c-2.91-1.89-9.834-8.05-15.385-13.69-5.55-5.642-10.54-10.257-11.088-10.257-.547 0-6.88 4.576-14.073 10.17-14.107 10.97-16.86 12.449-23.195 12.449-6.057 0-11.222-2.58-16.19-8.084-7.604-8.428-8.187-17.083-1.791-26.58 4.035-5.992 31.416-29.148 38.829-32.838 12.562-6.252 26.061-4.757 37.253 4.125 3.083 2.446 11.776 11.884 19.318 20.973 14.946 18.01 19.353 26.332 17.938 33.874-2.207 11.769-20.08 17.341-31.616 9.858z"/>
+  </symbol>
+  <use xlink:href="#a" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+</svg>

auth/assets/custom-icons/icons/surfshark.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+   <circle cx="512" cy="512" r="512" style="fill:#178a9e"/>
+   <path d="M706 356.3v-.3c-.3-4.3-.6-9.3-.9-14.6-.6-10-1.3-20.8-1.9-29-1-5.7-2.4-10.8-4-15.4-10.2-22.6-30.1-33.5-51.1-38.7-9.6-1.7-21.3-2-33.8-2.3H493.7c-77.7 4.2-110.3 49.2-119.1 73.1-34 101.7-55.2 233.5-70.5 328.6-.3 1.9-.6 3.7-.9 5.5l-5 45.2c-.3 7.1.4 14.9 2.3 22.4 9.5 27.6 38.3 50.8 101.7 27.7 59.9-26 130.6-58.4 203.7-94.7 41.6-24 102.6-79.2 105.8-148.9-.5-51.6-2.2-105.8-5.7-158.6zm-96.3 38.2c0 6-4.9 10.9-10.9 10.9-36.3 0-65.6 29.4-65.6 65.6v40.2c0 67.5-54.7 122.1-122.1 122.1-5.9 0-10.6-4.8-10.6-10.6v-33.3c0-6 4.9-10.9 10.9-10.9 36.3 0 65.6-29.4 65.6-65.6v-40.2c0-67.4 54.7-122.1 122.1-122.1 5.9 0 10.6 4.8 10.6 10.6v33.3z" style="fill:#fff"/>
+</svg>

auth/assets/custom-icons/icons/workos.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="300px" height="260px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g><path style="opacity:0.989" fill="#6262f1" d="M 81.5,-0.5 C 112.5,-0.5 143.5,-0.5 174.5,-0.5C 169.154,3.68235 164.654,8.68235 161,14.5C 138.96,52.7486 116.793,90.9152 94.5,129C 111.174,158.016 127.84,187.016 144.5,216C 139.386,225.729 133.886,235.229 128,244.5C 121.475,251.672 113.642,256.672 104.5,259.5C 97.5,259.5 90.5,259.5 83.5,259.5C 73.8126,256.222 65.6459,250.556 59,242.5C 38.6208,208.399 18.7875,174.065 -0.5,139.5C -0.5,132.833 -0.5,126.167 -0.5,119.5C 19.3711,84.4302 39.5378,49.4302 60,14.5C 65.987,7.65895 73.1537,2.65895 81.5,-0.5 Z"/></g>
+<g><path style="opacity:0.989" fill="#6262f1" d="M 193.5,-0.5 C 200.833,-0.5 208.167,-0.5 215.5,-0.5C 225.781,2.8978 234.281,8.8978 241,17.5C 260.794,51.4318 280.294,85.4318 299.5,119.5C 299.5,125.833 299.5,132.167 299.5,138.5C 279.641,173.869 259.475,209.203 239,244.5C 232.912,251.778 225.412,256.778 216.5,259.5C 185.833,259.5 155.167,259.5 124.5,259.5C 129.821,254.339 134.654,248.672 139,242.5C 160.081,205.337 181.414,168.337 203,131.5C 203.635,129.365 203.301,127.365 202,125.5C 185.781,98.2288 169.947,70.7288 154.5,43C 159.614,33.2707 165.114,23.7707 171,14.5C 177.343,7.59119 184.843,2.59119 193.5,-0.5 Z"/></g>
+</svg>

auth/assets/custom-icons/icons/ynab.svg

@@ -0,0 +1,20 @@
+<svg width="576" height="569" viewBox="0 0 576 569" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M464.493 260.334H359.255C357.022 260.334 354.236 261.878 353.078 263.765L290.011 366.435C288.854 368.323 286.969 368.313 285.812 366.435L223.411 263.786C222.264 261.898 219.488 260.344 217.255 260.344H111.526C109.293 260.344 108.473 261.838 109.723 263.675L234.392 446.992C235.641 448.819 236.655 452.129 236.655 454.33V564.377C236.655 566.577 238.489 568.383 240.722 568.383H335.255C337.488 568.383 339.322 566.577 339.322 564.377V454.33C339.322 452.129 340.346 448.819 341.586 446.992L466.285 263.675C467.535 261.848 466.715 260.344 464.482 260.344L464.493 260.334Z" fill="#3B5EDA"/>
+<path d="M280.775 101.732C283.521 103.236 286.184 104.457 287.587 104.457C288.99 104.457 291.347 103.62 294.379 101.732C353.983 64.118 304.386 17.9556 287.587 0.566406C270.778 17.9556 221.181 64.118 280.775 101.732Z" fill="#3B5EDA"/>
+<path d="M218.089 238.947C221.48 238.675 224.624 238.201 225.884 237.363C227.154 236.525 228.763 234.386 230.34 230.884C261.09 161.69 188.241 149.479 162.49 143.756C157.952 169.381 141.44 240.35 218.089 238.937V238.947Z" fill="#3B5EDA"/>
+<path d="M120.44 223.836C123.308 222.029 125.858 220.172 126.585 218.85C127.313 217.528 127.722 214.884 127.456 211.069C121.812 135.739 51.6162 158.488 26.1416 165.3C34.2951 190.037 53.3678 260.39 120.44 223.836V223.836Z" fill="#3B5EDA"/>
+<path d="M132.607 350.144C133.826 347.016 134.747 344.018 134.532 342.535C134.317 341.041 133.047 338.69 130.538 335.773C80.5514 278.509 37.8274 337.912 21.4487 358.309C42.9285 373.428 100.71 418.823 132.596 350.144H132.607Z" fill="#3B5EDA"/>
+<path d="M287.578 120.822C274.426 135.446 235.615 174.241 282.242 205.86C284.393 207.122 286.472 208.151 287.578 208.151C288.684 208.151 290.518 207.445 292.895 205.86C339.532 174.241 300.73 135.436 287.578 120.822Z" fill="#3B5EDA"/>
+<path d="M159.196 382.333C158.448 381.818 156.861 381.445 154.495 381.425C107.786 381.233 115.561 425.518 117.487 441.525C133.384 437.71 178.218 429.404 161.706 386.36C160.846 384.513 159.934 382.848 159.186 382.333H159.196Z" fill="#3B5EDA"/>
+<path d="M282.242 306.502C284.393 307.763 286.472 308.793 287.578 308.793C288.684 308.793 290.518 308.086 292.894 306.502C339.531 274.882 300.73 236.077 287.578 221.463C274.426 236.087 235.615 274.882 282.242 306.502Z" fill="#3B5EDA"/>
+<path d="M85.4788 282.937C86.9436 280.939 88.1727 278.991 88.2751 277.911C88.3776 276.831 87.8244 274.964 86.4416 272.492C58.6623 223.887 15.9587 258.494 0 270.09C13.6028 284.31 49.3517 325.87 85.4893 282.937H85.4788Z" fill="#3B5EDA"/>
+<path d="M133.537 149.101C136.036 148.93 138.341 148.607 139.242 147.981C140.143 147.355 141.25 145.751 142.284 143.116C162.279 90.9288 107.939 80.8768 88.6822 76.2646C86.3468 95.6621 76.9434 149.353 133.547 149.101H133.537Z" fill="#3B5EDA"/>
+<path d="M210.076 132.318C212.831 132.792 215.433 133.054 216.591 132.621C217.748 132.187 219.387 130.733 221.23 128.14C257.286 76.719 200.949 51.3166 181.262 41.1737C173.395 61.6511 148.453 117.522 210.076 132.318V132.318Z" fill="#3B5EDA"/>
+<path d="M349.542 237.37C350.812 238.207 353.946 238.672 357.337 238.954C433.976 240.367 417.464 169.398 412.937 143.773C387.185 149.486 314.336 161.707 345.086 230.901C346.664 234.393 348.272 236.542 349.542 237.38V237.37Z" fill="#3B5EDA"/>
+<path d="M448 211.065C447.734 214.879 448.143 217.524 448.871 218.846C449.598 220.168 452.148 222.035 455.016 223.832C522.098 260.376 541.171 190.032 549.314 165.296C523.839 158.494 453.644 135.735 448 211.065V211.065Z" fill="#3B5EDA"/>
+<path d="M444.868 335.773C442.359 338.69 441.089 341.051 440.874 342.535C440.659 344.018 441.59 347.016 442.809 350.144C474.696 418.823 532.478 373.428 553.957 358.309C537.579 337.912 494.865 278.509 444.868 335.773V335.773Z" fill="#3B5EDA"/>
+<path d="M420.923 381.408C418.557 381.428 416.969 381.811 416.222 382.316C415.474 382.821 414.562 384.486 413.702 386.343C397.2 429.387 442.024 437.693 457.921 441.508C459.847 425.511 467.621 381.216 420.913 381.408H420.923Z" fill="#3B5EDA"/>
+<path d="M488.991 272.502C487.598 274.974 487.055 276.841 487.158 277.921C487.26 279.001 488.479 280.949 489.954 282.947C526.092 325.87 561.84 284.32 575.443 270.099C559.484 258.513 516.781 223.907 489.002 272.502H488.991Z" fill="#3B5EDA"/>
+<path d="M436.185 147.981C437.086 148.596 439.391 148.919 441.89 149.101C498.493 149.353 489.091 95.6621 486.755 76.2646C467.498 80.8768 413.148 90.9389 433.153 143.116C434.177 145.751 435.283 147.365 436.195 147.981H436.185Z" fill="#3B5EDA"/>
+<path d="M358.842 132.621C359.999 133.054 362.591 132.792 365.357 132.318C426.979 117.522 402.037 61.6411 394.171 41.1737C374.494 51.3166 318.156 76.719 354.202 128.14C356.046 130.733 357.684 132.187 358.842 132.621V132.621Z" fill="#3B5EDA"/>
+</svg>

auth/lib/app/view/app.dart

@@ -189,7 +189,7 @@ class _AppState extends State<App> with WindowListener, TrayListener {
         windowManager.show();
         break;
       case 'exit_app':
-        windowManager.close();
+        windowManager.destroy();
         break;
     }
   }

auth/lib/l10n/arb/app_de.arb

@@ -20,6 +20,8 @@
   "codeIssuerHint": "Aussteller",
   "codeSecretKeyHint": "Geheimer Schlüssel",
   "codeAccountHint": "Konto (you@domain.com)",
+  "codeTagHint": "Tag",
+  "accountKeyType": "Art des Keys",
   "sessionExpired": "Sitzung abgelaufen",
   "@sessionExpired": {
     "description": "Title of the dialog when the users current session is invalid/expired"
@@ -156,6 +158,7 @@
       }
     }
   },
+  "invalidQRCode": "Ungültiger QR-Code",
   "noRecoveryKeyTitle": "Kein Wiederherstellungsschlüssel?",
   "enterEmailHint": "Geben Sie Ihre E-Mail Adresse ein",
   "invalidEmailTitle": "Ungültige E-Mail Adresse",
@@ -420,5 +423,18 @@
   "invalidEndpoint": "Ungültiger Endpunkt",
   "invalidEndpointMessage": "Der eingegebene Endpunkt ist ungültig. Bitte geben Sie einen gültigen Endpunkt ein und versuchen Sie es erneut.",
   "endpointUpdatedMessage": "Endpunkt erfolgreich aktualisiert",
-  "customEndpoint": "Mit {endpoint} verbunden"
+  "customEndpoint": "Mit {endpoint} verbunden",
+  "pinText": "Anpinnen",
+  "unpinText": "Lösen",
+  "pinnedCodeMessage": "{code} wurde angepinnt",
+  "unpinnedCodeMessage": "{code} wurde Losgelöst",
+  "tags": "Tags",
+  "createNewTag": "Neuen Tag erstellen",
+  "tag": "Tag",
+  "create": "Erstellen",
+  "editTag": "Tag bearbeiten",
+  "deleteTagTitle": "Tag löschen?",
+  "deleteTagMessage": "Sind Sie sicher, dass Sie diesen Code löschen wollen? Diese Aktion ist unumkehrbar.",
+  "somethingWentWrongParsingCode": "Wir konnten {x} Codes nicht parsen.",
+  "updateNotAvailable": "Update ist nicht verfügbar"
 }

auth/lib/l10n/arb/app_fr.arb

@@ -20,6 +20,8 @@
   "codeIssuerHint": "Émetteur",
   "codeSecretKeyHint": "Clé secrète",
   "codeAccountHint": "Compte (vous@exemple.com)",
+  "codeTagHint": "Tag",
+  "accountKeyType": "Type de clé",
   "sessionExpired": "Session expirée",
   "@sessionExpired": {
     "description": "Title of the dialog when the users current session is invalid/expired"
@@ -77,12 +79,14 @@
   "data": "Données",
   "importCodes": "Importer les codes",
   "importTypePlainText": "Texte brut",
+  "importTypeEnteEncrypted": "Export chiffré Ente",
   "passwordForDecryptingExport": "Mot de passe pour déchiffrer l'exportation",
   "passwordEmptyError": "Le mot de passe ne peut pas être vide",
   "importFromApp": "Importer des codes depuis {appName}",
   "importGoogleAuthGuide": "Exportez vos comptes depuis Google Authenticator vers un code QR en utilisant l'option \"Transférer des comptes\". Ensuite, en utilisant un autre appareil, scannez le code QR.\n\nAstuce : Vous pouvez utiliser la webcam de votre ordinateur portable pour prendre une photo du code QR.",
   "importSelectJsonFile": "Sélectionnez un fichier JSON",
   "importSelectAppExport": "Sélectionnez le fichier d'exportation {appName}",
+  "importEnteEncGuide": "Sélectionnez le fichier chiffré JSON exporté depuis Ente",
   "importRaivoGuide": "Utilisez l'option \"Exporter les OTPs vers l'archive Zip\" dans les paramètres de Raivo.\n\nExtrayez le fichier zip et importez le fichier JSON.",
   "importBitwardenGuide": "Utilisez l'option « Exporter le coffre » dans les outils Bitwarden et importez le fichier JSON non chiffré.",
   "importAegisGuide": "Utilisez l'option \"Exporter le coffre-fort\" dans les paramètres d'Aegis.\n\nSi votre coffre-fort est crypté, vous devrez saisir le mot de passe du coffre-fort pour déchiffrer le coffre-fort.",
@@ -112,18 +116,22 @@
   "copied": "Copié",
   "pleaseTryAgain": "Veuillez réessayer",
   "existingUser": "Utilisateur existant",
+  "newUser": "Nouveau dans Ente",
   "delete": "Supprimer",
   "enterYourPasswordHint": "Saisir votre mot de passe",
   "forgotPassword": "Mot de passe oublié",
   "oops": "Oups",
   "suggestFeatures": "Suggérer des fonctionnalités",
   "faq": "FAQ",
+  "faq_q_1": "Quelle est la sécurité de Auth?",
+  "faq_a_1": "Tous les codes que vous sauvegardez via ente sont chiffrés de bout en bout. Cela signifie que vous seul pouvez accéder à vos codes. Nos applications sont open source et notre cryptographie ont fait l'objet d'un audit externe.",
   "faq_q_2": "Puis-je accéder à mes codes sur mon ordinateur ?",
   "faq_a_2": "Vous pouvez accéder à vos codes sur le web via auth.ente.io.",
   "faq_q_3": "Comment puis-je supprimer des codes ?",
   "faq_a_3": "Vous pouvez supprimer un code en glissant vers la gauche.",
   "faq_q_4": "Comment puis-je soutenir le projet ?",
   "faq_a_4": "Vous pouvez soutenir le développement de ce projet en vous abonnant à notre application Photos, ente.io.",
+  "faq_q_5": "Comment puis-je activer le verrouillage FaceID dans Auth",
   "faq_a_5": "Vous pouvez activer le verrouillage FaceID dans Paramètres → Sécurité → Écran de verrouillage.",
   "somethingWentWrongMessage": "Quelque chose s'est mal passé, veuillez recommencer",
   "leaveFamily": "Quitter le plan familial",
@@ -150,6 +158,7 @@
       }
     }
   },
+  "invalidQRCode": "QR code non valide",
   "noRecoveryKeyTitle": "Pas de clé de récupération ?",
   "enterEmailHint": "Entrez votre adresse e-mail",
   "invalidEmailTitle": "Adresse e-mail invalide",
@@ -343,6 +352,7 @@
   "deleteCodeAuthMessage": "Authentification requise pour supprimer le code",
   "showQRAuthMessage": "Authentification requise pour afficher le code QR",
   "confirmAccountDeleteTitle": "Confirmer la suppression du compte",
+  "confirmAccountDeleteMessage": "Ce compte est lié à d'autres applications ente, si vous en utilisez une.\n\nVos données téléchargées, dans toutes les applications ente, seront planifiées pour suppression, et votre compte sera définitivement supprimé.",
   "androidBiometricHint": "Vérifier l’identité",
   "@androidBiometricHint": {
     "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
@@ -413,5 +423,18 @@
   "invalidEndpoint": "Point de terminaison non valide",
   "invalidEndpointMessage": "Désolé, le point de terminaison que vous avez entré n'est pas valide. Veuillez en entrer un valide puis réessayez.",
   "endpointUpdatedMessage": "Point de terminaison mis à jour avec succès",
-  "customEndpoint": "Connecté à {endpoint}"
+  "customEndpoint": "Connecté à {endpoint}",
+  "pinText": "Épingler",
+  "unpinText": "Désépingler",
+  "pinnedCodeMessage": "{code} a été épinglé",
+  "unpinnedCodeMessage": "{code} a été désépinglé",
+  "tags": "Tags",
+  "createNewTag": "Créer un nouveau tag",
+  "tag": "Tag",
+  "create": "Créer",
+  "editTag": "Modifier le tag",
+  "deleteTagTitle": "Supprimer le tag ?",
+  "deleteTagMessage": "Êtes-vous sûr de vouloir supprimer ce tag ? Cette action est irréversible.",
+  "somethingWentWrongParsingCode": "Impossible d'analyser les codes {x}.",
+  "updateNotAvailable": "Mise à jour non disponible"
 }

auth/lib/l10n/arb/app_id.arb

@@ -0,0 +1,39 @@
+{
+  "setupFirstAccount": "Siapkan akun pertama kamu",
+  "importScanQrCode": "Pindai Kode QR",
+  "reportABug": "Laporkan bug",
+  "rateUsOnStore": "Nilai kami di {storeName}",
+  "blog": "Blog",
+  "welcomeBack": "Selamat datang kembali!",
+  "supportDiscount": "Gunakan kode kupon \"AUTH\" untuk mendapatkan potongan 10% pada tahun pertamamu",
+  "data": "Data",
+  "ok": "Oke",
+  "cancel": "Batal",
+  "email": "Email",
+  "support": "Dukungan",
+  "general": "Umum",
+  "settings": "Pengaturan",
+  "suggestFeatures": "Sarankan fitur",
+  "faq": "Tanya Jawab Umum",
+  "scan": "Pindai",
+  "scanACode": "Pindai kode",
+  "createNewAccount": "Buat akun baru",
+  "confirmPassword": "Konfirmasi sandi",
+  "selectLanguage": "Pilih bahasa",
+  "language": "Bahasa",
+  "social": "Sosial",
+  "security": "Keamanan",
+  "searchHint": "Cari...",
+  "scanAQrCode": "Pindai kode QR",
+  "createAccount": "Buat akun",
+  "password": "Sandi",
+  "signUpTerms": "Saya menyetujui <u-terms>ketentuan layanan</u-terms> dan <u-policy>kebijakan privasi</u-policy> Ente",
+  "ackPasswordLostWarning": "Saya mengerti bahwa jika saya lupa sandi saya, data saya bisa hilang karena <underline>dienkripsi secara end-to-end</underline>.",
+  "loginTerms": "Dengan mengklik masuk akun, saya menyetujui <u-terms>ketentuan layanan</u-terms> dan <u-policy>kebijakan privasi</u-policy> Ente",
+  "warning": "Peringatan",
+  "androidCancelButton": "Batal",
+  "@androidCancelButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on Android side. Maximum 30 characters."
+  },
+  "hearUsWhereTitle": "Dari mana Anda menemukan Ente? (opsional)"
+}

auth/lib/l10n/arb/app_ja.arb

@@ -20,6 +20,8 @@
   "codeIssuerHint": "発行者",
   "codeSecretKeyHint": "秘密鍵",
   "codeAccountHint": "アカウント (you@domain.com)",
+  "codeTagHint": "タグ",
+  "accountKeyType": "鍵の種類",
   "sessionExpired": "セッションが失効しました",
   "@sessionExpired": {
     "description": "Title of the dialog when the users current session is invalid/expired"
@@ -77,6 +79,7 @@
   "data": "データ",
   "importCodes": "コードをインポート",
   "importTypePlainText": "プレーンテキスト",
+  "importTypeEnteEncrypted": "Ente 暗号化されたエクスポート",
   "passwordForDecryptingExport": "復号化用パスワード",
   "passwordEmptyError": "パスワードは空欄にできません",
   "importFromApp": "{appName} からコードをインポート",
@@ -121,6 +124,7 @@
   "suggestFeatures": "機能を提案",
   "faq": "FAQ",
   "faq_q_1": "Authはどのくらい安全ですか？",
+  "faq_a_1": "Ente Authでバックアップされたコードはすべてエンドツーエンドで暗号化されて保存されます。つまり、コードにアクセスできるのはあなただけです。当社のアプリはオープンソースであり、暗号化技術は外部監査を受けています。",
   "faq_q_2": "パソコンから私のコードにアクセスできますか？",
   "faq_a_2": "auth.ente.io で Web からコードにアクセス可能です。",
   "faq_q_3": "コードを削除するにはどうすればいいですか？",
@@ -154,6 +158,7 @@
       }
     }
   },
+  "invalidQRCode": "QRコードが無効です",
   "noRecoveryKeyTitle": "回復キーがありませんか？",
   "enterEmailHint": "メールアドレスを入力してください",
   "invalidEmailTitle": "メールアドレスが無効です",
@@ -347,6 +352,7 @@
   "deleteCodeAuthMessage": "コードを削除するためには認証が必要です",
   "showQRAuthMessage": "QR コードを表示するためには認証が必要です",
   "confirmAccountDeleteTitle": "アカウントの削除に同意",
+  "confirmAccountDeleteMessage": "このアカウントは他のEnteアプリも使用している場合はそれらにも紐づけされています。\nすべてのEnteアプリでアップロードされたデータは削除され、アカウントは完全に削除されます。",
   "androidBiometricHint": "本人を確認する",
   "@androidBiometricHint": {
     "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
@@ -417,5 +423,18 @@
   "invalidEndpoint": "無効なエンドポイントです",
   "invalidEndpointMessage": "入力されたエンドポイントは無効です。有効なエンドポイントを入力して再試行してください。",
   "endpointUpdatedMessage": "エンドポイントの更新に成功しました",
-  "customEndpoint": "{endpoint} に接続しました"
+  "customEndpoint": "{endpoint} に接続しました",
+  "pinText": "固定",
+  "unpinText": "固定を解除",
+  "pinnedCodeMessage": "{code} を固定しました",
+  "unpinnedCodeMessage": "{code} の固定が解除されました",
+  "tags": "タグ",
+  "createNewTag": "新しいタグの作成",
+  "tag": "タグ",
+  "create": "作成",
+  "editTag": "タグの編集",
+  "deleteTagTitle": "タグを削除しますか？",
+  "deleteTagMessage": "このタグを削除してもよろしいですか？この操作は取り消しできません。",
+  "somethingWentWrongParsingCode": "{x} のコードを解析できませんでした。",
+  "updateNotAvailable": "アップデートは利用できません"
 }

auth/lib/l10n/arb/app_nl.arb

@@ -20,6 +20,8 @@
   "codeIssuerHint": "Uitgever",
   "codeSecretKeyHint": "Geheime sleutel",
   "codeAccountHint": "Account (jij@domein.nl)",
+  "codeTagHint": "Label",
+  "accountKeyType": "Type sleutel",
   "sessionExpired": "Sessie verlopen",
   "@sessionExpired": {
     "description": "Title of the dialog when the users current session is invalid/expired"
@@ -156,6 +158,7 @@
       }
     }
   },
+  "invalidQRCode": "Ongeldige QR-code",
   "noRecoveryKeyTitle": "Geen herstelsleutel?",
   "enterEmailHint": "Voer je e-mailadres in",
   "invalidEmailTitle": "Ongeldig e-mailadres",
@@ -420,5 +423,18 @@
   "invalidEndpoint": "Ongeldig eindpunt",
   "invalidEndpointMessage": "Sorry, het eindpunt dat u hebt ingevoerd is ongeldig. Voer een geldig eindpunt in en probeer het opnieuw.",
   "endpointUpdatedMessage": "Eindpunt met succes bijgewerkt",
-  "customEndpoint": "Verbonden met {endpoint}"
+  "customEndpoint": "Verbonden met {endpoint}",
+  "pinText": "Vastzetten",
+  "unpinText": "Losmaken",
+  "pinnedCodeMessage": "{code} is vastgezet",
+  "unpinnedCodeMessage": "{code} is losgemaakt",
+  "tags": "Labels",
+  "createNewTag": "Nieuw label maken",
+  "tag": "Label",
+  "create": "Creëren",
+  "editTag": "Bewerk label",
+  "deleteTagTitle": "Label verwijderen?",
+  "deleteTagMessage": "Weet je zeker dat je deze label wilt verwijderen? Deze actie is onomkeerbaar.",
+  "somethingWentWrongParsingCode": "We konden {x} codes niet verwerken.",
+  "updateNotAvailable": "Update niet beschikbaar"
 }

auth/lib/l10n/arb/app_pt.arb

@@ -7,7 +7,7 @@
     "description": "Text shown in the AppBar of the Counter Page"
   },
   "onBoardingBody": "Proteja seus códigos 2FA",
-  "onBoardingGetStarted": "Vamos Começar",
+  "onBoardingGetStarted": "Introdução",
   "setupFirstAccount": "Configure sua primeira conta",
   "importScanQrCode": "Escanear QR code",
   "qrCode": "QR Code",
@@ -20,6 +20,8 @@
   "codeIssuerHint": "Emissor",
   "codeSecretKeyHint": "Chave secreta",
   "codeAccountHint": "Conta (voce@dominio.com)",
+  "codeTagHint": "Etiqueta",
+  "accountKeyType": "Tipo de chave",
   "sessionExpired": "Sessão expirada",
   "@sessionExpired": {
     "description": "Title of the dialog when the users current session is invalid/expired"
@@ -29,13 +31,13 @@
   "timeBasedKeyType": "Baseado no horário (TOTP)",
   "counterBasedKeyType": "Baseado em um contador (HOTP)",
   "saveAction": "Salvar",
-  "nextTotpTitle": "próximo",
-  "deleteCodeTitle": "Excluir código?",
+  "nextTotpTitle": "avançar",
+  "deleteCodeTitle": "Apagar código?",
   "deleteCodeMessage": "Tem certeza de que deseja excluir este código? Esta ação é irreversível.",
   "viewLogsAction": "Ver logs",
   "sendLogsDescription": "Isto irá compartilhar seus logs para nos ajudar a depurar seu problema. Embora tomemos precauções para garantir que informações sensíveis não sejam enviadas, encorajamos você a ver esses logs antes de compartilhá-los.",
   "preparingLogsTitle": "Preparando logs...",
-  "emailLogsTitle": "Logs por e-mail",
+  "emailLogsTitle": "Logs (e-mail)",
   "emailLogsMessage": "Por favor, envie os logs para {email}",
   "@emailLogsMessage": {
     "placeholders": {
@@ -46,9 +48,9 @@
   },
   "copyEmailAction": "Copiar e-mail",
   "exportLogsAction": "Exportar logs",
-  "reportABug": "Reportar um problema",
+  "reportABug": "Informar um problema",
   "crashAndErrorReporting": "Reporte de erros e falhas",
-  "reportBug": "Reportar problema",
+  "reportBug": "Informar problema",
   "emailUsMessage": "Por favor, envie um e-mail para {email}",
   "@emailUsMessage": {
     "placeholders": {
@@ -103,14 +105,14 @@
   "authToChangeYourPassword": "Por favor, autentique-se para alterar sua senha",
   "authToViewSecrets": "Por favor, autentique-se para ver as suas chaves secretas",
   "authToInitiateSignIn": "Por favor, autentique-se para iniciar o login para um backup.",
-  "ok": "Ok",
+  "ok": "OK",
   "cancel": "Cancelar",
   "yes": "Sim",
   "no": "Não",
   "email": "E-mail",
   "support": "Suporte",
   "general": "Geral",
-  "settings": "Configurações",
+  "settings": "Ajustes",
   "copied": "Copiado",
   "pleaseTryAgain": "Por favor, tente novamente",
   "existingUser": "Usuário Existente",
@@ -118,7 +120,7 @@
   "delete": "Excluir",
   "enterYourPasswordHint": "Insira sua senha",
   "forgotPassword": "Esqueci a senha",
-  "oops": "Oops",
+  "oops": "Opa",
   "suggestFeatures": "Sugerir funcionalidades",
   "faq": "Perguntas frequentes",
   "faq_q_1": "Quão seguro é o Auth?",
@@ -137,7 +139,7 @@
   "inFamilyPlanMessage": "Você está em um plano familiar!",
   "swipeHint": "Deslize para a esquerda para editar ou remover os códigos",
   "scan": "Escanear",
-  "scanACode": "Escanear um código",
+  "scanACode": "Escanear código",
   "verify": "Verificar",
   "verifyEmail": "Verificar e-mail",
   "enterCodeHint": "Digite o código de 6 dígitos de\nseu aplicativo autenticador",
@@ -156,6 +158,7 @@
       }
     }
   },
+  "invalidQRCode": "QR Code inválido",
   "noRecoveryKeyTitle": "Sem chave de recuperação?",
   "enterEmailHint": "Insira o seu endereço de e-mail",
   "invalidEmailTitle": "Endereço de e-mail inválido",
@@ -182,7 +185,7 @@
   "lockScreenEnablePreSteps": "Para ativar o bloqueio de tela, por favor ative um método de autenticação nas configurações do sistema do seu dispositivo.",
   "viewActiveSessions": "Ver sessões ativas",
   "authToViewYourActiveSessions": "Por favor, autentique-se para ver as sessões ativas",
-  "searchHint": "Pesquisar...",
+  "searchHint": "Buscar...",
   "search": "Pesquisar",
   "sorryUnableToGenCode": "Desculpe, não foi possível gerar um código para {issuerName}",
   "noResult": "Nenhum resultado",
@@ -236,10 +239,10 @@
   "howItWorks": "Como funciona",
   "ackPasswordLostWarning": "Eu entendo que se eu perder minha senha, posso perder meus dados, já que meus dados são <underline>criptografados de ponta a ponta</underline>.",
   "loginTerms": "Ao clicar em login, eu concordo com os <u-terms>termos de serviço</u-terms> e a <u-policy>política de privacidade</u-policy>",
-  "logInLabel": "Login",
-  "logout": "Encerrar sessão",
+  "logInLabel": "Entrar",
+  "logout": "Sair",
   "areYouSureYouWantToLogout": "Você tem certeza que deseja encerrar a sessão?",
-  "yesLogout": "Sim, encerrar sessão",
+  "yesLogout": "Sim, sair",
   "exit": "Sair",
   "verifyingRecoveryKey": "Verificando chave de recuperação...",
   "recoveryKeyVerified": "Chave de recuperação verificada",
@@ -279,7 +282,7 @@
     "description": "Text for the button to confirm the user understands the warning"
   },
   "authToExportCodes": "Por favor, autentique-se para exportar seus códigos",
-  "importSuccessTitle": "Yay!",
+  "importSuccessTitle": "Oba!",
   "importSuccessDesc": "Você importou {count} códigos!",
   "@importSuccessDesc": {
     "placeholders": {
@@ -314,7 +317,7 @@
   "thisWillLogYouOutOfTheFollowingDevice": "Isso fará com que você saia do seguinte dispositivo:",
   "terminateSession": "Encerrar sessão?",
   "terminate": "Encerrar",
-  "thisDevice": "Este dispositivo",
+  "thisDevice": "Esse dispositivo",
   "toResetVerifyEmail": "Para redefinir a sua senha, por favor verifique o seu email primeiro.",
   "thisEmailIsAlreadyInUse": "Este e-mail já está em uso",
   "verificationFailedPleaseTryAgain": "Falha na verificação. Por favor, tente novamente",
@@ -336,7 +339,7 @@
   "export": "Exportar",
   "useOffline": "Usar sem backups",
   "signInToBackup": "Entre para fazer backup de seus códigos",
-  "singIn": "Iniciar sessão",
+  "singIn": "Entrar",
   "sigInBackupReminder": "Por favor, exporte seus códigos para garantir que você tenha um backup do qual você possa restaurar.",
   "offlineModeWarning": "Você escolheu prosseguir sem backups. Por favor, faça backups manuais para ter certeza de que seus códigos estão seguros.",
   "showLargeIcons": "Mostrar ícones grandes",
@@ -358,7 +361,7 @@
   "@androidBiometricNotRecognized": {
     "description": "Message to let the user know that authentication was failed. It is used on Android side. Maximum 60 characters."
   },
-  "androidBiometricSuccess": "Bem-sucedido",
+  "androidBiometricSuccess": "Êxito",
   "@androidBiometricSuccess": {
     "description": "Message to let the user know that authentication was successful. It is used on Android side. Maximum 60 characters."
   },
@@ -398,7 +401,7 @@
   "@iOSGoToSettingsDescription": {
     "description": "Message advising the user to go to the settings and configure Biometrics for their device. It shows in a dialog on iOS side."
   },
-  "iOSOkButton": "Ok",
+  "iOSOkButton": "OK",
   "@iOSOkButton": {
     "description": "Message showed on a button that the user can click to leave the current dialog. It is used on iOS side. Maximum 30 characters."
   },
@@ -420,5 +423,18 @@
   "invalidEndpoint": "Endpoint inválido",
   "invalidEndpointMessage": "Desculpe, o endpoint que você inseriu é inválido. Por favor, insira um endpoint válido e tente novamente.",
   "endpointUpdatedMessage": "Endpoint atualizado com sucesso",
-  "customEndpoint": "Conectado a {endpoint}"
+  "customEndpoint": "Conectado a {endpoint}",
+  "pinText": "Fixar",
+  "unpinText": "Desafixar",
+  "pinnedCodeMessage": "{code} foi fixado",
+  "unpinnedCodeMessage": "{code} foi desafixado",
+  "tags": "Etiquetas",
+  "createNewTag": "Criar etiqueta",
+  "tag": "Etiqueta",
+  "create": "Criar",
+  "editTag": "Editar etiqueta",
+  "deleteTagTitle": "Apagar etiqueta?",
+  "deleteTagMessage": "Tem certeza de que deseja excluir esta etiqueta? Essa ação é irreversível.",
+  "somethingWentWrongParsingCode": "Não foi possível analisar os códigos {x}.",
+  "updateNotAvailable": "Atualização não está disponível"
 }

auth/lib/l10n/arb/app_ru.arb

@@ -20,6 +20,8 @@
   "codeIssuerHint": "Эмитент",
   "codeSecretKeyHint": "Секретный ключ",
   "codeAccountHint": "Аккаунт (you@domain.com)",
+  "codeTagHint": "Метка",
+  "accountKeyType": "Тип ключа",
   "sessionExpired": "Сеанс истек",
   "@sessionExpired": {
     "description": "Title of the dialog when the users current session is invalid/expired"
@@ -77,16 +79,19 @@
   "data": "Данные",
   "importCodes": "Импортировать коды",
   "importTypePlainText": "Обычный текст",
+  "importTypeEnteEncrypted": "Ente Зашифрованный экспорт",
   "passwordForDecryptingExport": "Пароль для расшифровки экспорта",
   "passwordEmptyError": "Пароль не может быть пустым",
   "importFromApp": "Импорт кодов из {appName}",
   "importGoogleAuthGuide": "Экспортируйте учетные записи из Google Authenticator в QR-код, используя опцию «Перенести учетные записи». Затем с помощью другого устройства отсканируйте QR-код.\n\nСовет: Чтобы сфотографировать QR-код, можно воспользоваться веб-камерой ноутбука.",
   "importSelectJsonFile": "Выбрать JSON-файл",
   "importSelectAppExport": "Выбрать файл экспорта {appName}",
+  "importEnteEncGuide": "Выберите зашифрованный JSON файл, экспортированный из Ente",
   "importRaivoGuide": "Используйте опцию «Export OTPs to Zip archive» в настройках Raivo.\n\nРаспакуйте zip-архив и импортируйте JSON-файл.",
   "importBitwardenGuide": "Используйте опцию \"Экспортировать хранилище\" в Bitwarden Tools и импортируйте незашифрованный JSON файл.",
   "importAegisGuide": "Используйте опцию «Экспортировать хранилище» в настройках Aegis.\n\nЕсли ваше хранилище зашифровано, то для его расшифровки потребуется ввести пароль хранилища.",
   "import2FasGuide": "Используйте опцию \"Settings->Backup -Export\" в 2FAS.\n\nЕсли ваша резервная копия зашифрована, то для расшифровки резервной копии необходимо ввести пароль",
+  "importLastpassGuide": "Используйте опцию \"Перенести аккаунты\" в настройках Lastpass Authenticator и нажмите на \"Экспортировать учетные записи в файл\". Импортируйте загружённый JSON файл.",
   "exportCodes": "Экспортировать коды",
   "importLabel": "Импорт",
   "importInstruction": "Пожалуйста, выберите файл, содержащий список ваших кодов в следующем формате",
@@ -99,6 +104,7 @@
   "authToChangeYourEmail": "Пожалуйста, авторизуйтесь, чтобы изменить адрес электронной почты",
   "authToChangeYourPassword": "Пожалуйста, авторизуйтесь, чтобы изменить пароль",
   "authToViewSecrets": "Пожалуйста, авторизуйтесь для просмотра ваших секретов",
+  "authToInitiateSignIn": "Пожалуйста, авторизуйтесь, чтобы начать вход для резервного копирования.",
   "ok": "Ок",
   "cancel": "Отменить",
   "yes": "Да",
@@ -110,18 +116,22 @@
   "copied": "Скопировано",
   "pleaseTryAgain": "Пожалуйста, попробуйте ещё раз",
   "existingUser": "Существующий пользователь",
+  "newUser": "Впервые здесь, в Ente",
   "delete": "Удалить",
   "enterYourPasswordHint": "Введите пароль",
   "forgotPassword": "Забыл пароль",
   "oops": "Ой",
   "suggestFeatures": "Предложить идеи",
   "faq": "FAQ",
+  "faq_q_1": "Насколько безопасен Auth?",
+  "faq_a_1": "Все коды, которые вы резервируете с помощью Auth, хранятся в зашифрованном виде. Это означает, что только вы можете получить доступ к своим кодам. Наши приложения имеют открытый исходный код, а наша криптография прошла внешний аудит.",
   "faq_q_2": "Могу ли я получить доступ к моим кодам на компьютере?",
   "faq_a_2": "Вы можете получить доступ к своим кодам на сайте @ auth.ente.io.",
   "faq_q_3": "Как я могу удалить коды?",
   "faq_a_3": "Вы можете удалить код, проведя пальцем влево по этому элементу.",
   "faq_q_4": "Как я могу поддержать этот проект?",
   "faq_a_4": "Вы можете поддержать развитие этого проекта, подписавшись на наше приложение Photos @ ente.io.",
+  "faq_q_5": "Как мне включить FaceID в Auth",
   "faq_a_5": "Вы можете включить блокировку FaceID в Настройки → Безопасность → Экран блокировки.",
   "somethingWentWrongMessage": "Что-то пошло не так. Попробуйте еще раз",
   "leaveFamily": "Покинуть семью",
@@ -135,6 +145,8 @@
   "enterCodeHint": "Введите 6-значный код из\nвашего приложения-аутентификатора",
   "lostDeviceTitle": "Потеряно устройство?",
   "twoFactorAuthTitle": "Двухфакторная аутентификация",
+  "passkeyAuthTitle": "Проверка с помощью пароля",
+  "verifyPasskey": "Подтвердить пароль",
   "recoverAccount": "Восстановить аккаунт",
   "enterRecoveryKeyHint": "Введите свой ключ восстановления",
   "recover": "Восстановить",
@@ -146,6 +158,7 @@
       }
     }
   },
+  "invalidQRCode": "Неверный QR-код",
   "noRecoveryKeyTitle": "Нет ключа восстановления?",
   "enterEmailHint": "Введите свою почту",
   "invalidEmailTitle": "Неверный адрес электронной почты",
@@ -190,6 +203,8 @@
   "saveKey": "Сохранить ключ",
   "save": "Сохранить",
   "send": "Отправить",
+  "saveOrSendDescription": "Вы хотите сохранить это в хранилище (папку загрузок по умолчанию) или отправить в другие приложения?",
+  "saveOnlyDescription": "Вы хотите сохранить это в хранилище (по умолчанию папка загрузок)?",
   "back": "Вернуться",
   "createAccount": "Создать аккаунт",
   "passwordStrength": "Мощность пароля: {passwordStrengthValue}",
@@ -337,6 +352,7 @@
   "deleteCodeAuthMessage": "Аутентификация для удаления кода",
   "showQRAuthMessage": "Аутентификация для отображения QR-кода",
   "confirmAccountDeleteTitle": "Подтвердить удаление аккаунта",
+  "confirmAccountDeleteMessage": "Эта учетная запись связана с другими приложениями Ente, если вы ими пользуетесь.\n\nЗагруженные вами данные во всех приложениях ente будут запланированы к удалению, а ваша учетная запись будет удалена без возможности восстановления.",
   "androidBiometricHint": "Подтвердите личность",
   "@androidBiometricHint": {
     "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
@@ -397,12 +413,28 @@
   "doNotSignOut": "Не выходить",
   "hearUsWhereTitle": "Как вы узнали о Ente? (необязательно)",
   "hearUsExplanation": "Будет полезно, если вы укажете, где нашли нас, так как мы не отслеживаем установки приложения",
+  "recoveryKeySaved": "Ключ восстановления сохранён в папке Загрузки!",
+  "waitingForBrowserRequest": "Ожидание запроса браузера...",
   "waitingForVerification": "Ожидание подтверждения...",
+  "passkey": "Ключ",
   "developerSettingsWarning": "Вы уверены, что хотите изменить настройки разработчика?",
   "developerSettings": "Настройки разработчика",
   "serverEndpoint": "Конечная точка сервера",
   "invalidEndpoint": "Неверная конечная точка",
   "invalidEndpointMessage": "Извините, введенная вами конечная точка неверна. Пожалуйста, введите корректную конечную точку и повторите попытку.",
   "endpointUpdatedMessage": "Конечная точка успешно обновлена",
-  "customEndpoint": "Подключено к {endpoint}"
+  "customEndpoint": "Подключено к {endpoint}",
+  "pinText": "Прикрепить",
+  "unpinText": "Открепить",
+  "pinnedCodeMessage": "{code} прикреплен",
+  "unpinnedCodeMessage": "{code} откреплен",
+  "tags": "Метки",
+  "createNewTag": "Создать новую метку",
+  "tag": "Метка",
+  "create": "Создать",
+  "editTag": "Изменить метку",
+  "deleteTagTitle": "Удалить метку?",
+  "deleteTagMessage": "Вы уверены, что хотите удалить эту метку? Это действие необратимо.",
+  "somethingWentWrongParsingCode": "Мы не смогли разобрать коды {x}.",
+  "updateNotAvailable": "Обновление недоступно"
 }

auth/lib/l10n/arb/app_sv.arb

@@ -61,6 +61,7 @@
   "welcomeBack": "Välkommen tillbaka!",
   "changePassword": "Ändra lösenord",
   "importCodes": "Importera koder",
+  "exportCodes": "Exportera koder",
   "cancel": "Avbryt",
   "yes": "Ja",
   "no": "Nej",
@@ -76,6 +77,7 @@
   "scan": "Skanna",
   "twoFactorAuthTitle": "Tvåfaktorsautentisering",
   "enterRecoveryKeyHint": "Ange din återställningsnyckel",
+  "invalidQRCode": "Ogiltig QR-kod",
   "noRecoveryKeyTitle": "Ingen återställningsnyckel?",
   "enterEmailHint": "Ange din e-postadress",
   "invalidEmailTitle": "Ogiltig e-postadress",
@@ -143,6 +145,8 @@
   },
   "pendingSyncs": "Varning",
   "activeSessions": "Aktiva sessioner",
+  "incorrectCode": "Felaktig kod",
+  "incorrectRecoveryKey": "Felaktig återställningsnyckel",
   "enterPassword": "Ange lösenord",
   "export": "Exportera",
   "singIn": "Logga in",

auth/lib/l10n/arb/app_tr.arb

@@ -20,6 +20,8 @@
   "codeIssuerHint": "Yayınlayan",
   "codeSecretKeyHint": "Gizli Anahtar",
   "codeAccountHint": "Hesap (ornek@domain.com)",
+  "codeTagHint": "Etiket",
+  "accountKeyType": "Anahtar türü",
   "sessionExpired": "Oturum süresi doldu",
   "@sessionExpired": {
     "description": "Title of the dialog when the users current session is invalid/expired"
@@ -46,7 +48,7 @@
   },
   "copyEmailAction": "E-postayı Kopyala",
   "exportLogsAction": "Günlüğü dışa aktar",
-  "reportABug": "Bir hata bildir",
+  "reportABug": "Hata bildirin",
   "crashAndErrorReporting": "Çökme ve hata bildirimi",
   "reportBug": "Hata bildir",
   "emailUsMessage": "Lütfen bize {email} adresinden ulaşın",
@@ -77,12 +79,14 @@
   "data": "Veri",
   "importCodes": "Kodu içe aktar",
   "importTypePlainText": "Salt metin",
+  "importTypeEnteEncrypted": "Ente Şifreli dışa aktarma",
   "passwordForDecryptingExport": "Dışa aktarımın şifresini çözmek için parola",
   "passwordEmptyError": "Şifre boş olamaz",
   "importFromApp": "Kodları {appName} uygulamasından içe aktarın",
   "importGoogleAuthGuide": "\"Hesapları Aktar\" seçeneğini kullanarak hesaplarınızı Google Authenticator'dan bir QR koduna aktarın. Ardından başka bir cihaz kullanarak QR kodunu tarayın.\n\nİpucu: QR kodunun fotoğrafını çekmek için dizüstü bilgisayarınızın kamerasını kullanabilirsiniz.",
   "importSelectJsonFile": "JSON dosyasını seçin",
   "importSelectAppExport": "{appName} dışarı aktarma dosyasını seçin",
+  "importEnteEncGuide": "Ente'den dışa aktarılan şifrelenmiş JSON dosyasını seçin",
   "importRaivoGuide": "Raivo'nun ayarlarında \"OTP'leri Zip arşivine aktar\" seçeneğini kullanın.\n\nZip dosyasını çıkarın ve JSON dosyasını içe aktarın.",
   "importBitwardenGuide": "Bitwarden Tools içindeki \"Kasayı dışa aktar\" seçeneğini kullanın ve şifrelenmemiş JSON dosyasını içe aktarın.",
   "importAegisGuide": "Aegis'in Ayarlarında \"Kasayı dışa aktar\" seçeneğini kullanın.\n\nKasanız şifrelenmişse, kasanın şifresini çözmek için kasa parolasını girmeniz gerekecektir.",
@@ -112,18 +116,22 @@
   "copied": "Kopyalandı",
   "pleaseTryAgain": "Lütfen tekrar deneyin",
   "existingUser": "Mevcut kullanıcı",
+  "newUser": "Ente'de Yeni",
   "delete": "Sil",
   "enterYourPasswordHint": "Parolanızı girin",
   "forgotPassword": "Şifremi unuttum",
   "oops": "Hay aksi",
   "suggestFeatures": "Özellik önerin",
   "faq": "SSS",
+  "faq_q_1": "Kimlik doğrulayıcı ne kadar güvenli?",
+  "faq_a_1": "Auth aracılığıyla yedeklediğiniz tüm kodlar uçtan uca şifrelenmiş olarak saklanır. Böylece kodlarınıza yalnızca siz erişebilirsiniz. Uygulamalarımız açık kaynaklıdır ve şifrelememiz dış denetimden geçmiştir.",
   "faq_q_2": "Kodlarıma masaüstünden erişebilir miyim?",
   "faq_a_2": "Kodlarınıza internet üzerinden @ auth.ente.io adresinden erişebilirsiniz.",
   "faq_q_3": "Kodları nasıl silebilirim?",
   "faq_a_3": "Bir kodu, o öğenin üzerinde sola kaydırarak silebilirsiniz.",
   "faq_q_4": "Bu projeye nasıl destek olabilirim?",
   "faq_a_4": "Fotoğraflar uygulamamıza @ ente.io abone olarak bu projenin geliştirilmesine destek olabilirsiniz.",
+  "faq_q_5": "Auth'ta FaceID kilidini nasıl etkinleştirebilirim",
   "faq_a_5": "FaceID kilidini Ayarlar → Güvenlik → Kilit Ekranı altında etkinleştirebilirsiniz.",
   "somethingWentWrongMessage": "Bir şeyler ters gitti, lütfen tekrar deneyin",
   "leaveFamily": "Aile planından ayrıl",
@@ -137,6 +145,8 @@
   "enterCodeHint": "Kimlik doğrulayıcı uygulamanızdaki 6 haneli doğrulama kodunu girin",
   "lostDeviceTitle": "Cihazınızı mı kaybettiniz?",
   "twoFactorAuthTitle": "İki faktörlü kimlik doğrulama",
+  "passkeyAuthTitle": "Geçiş anahtarı doğrulaması",
+  "verifyPasskey": "Geçiş anahtarını doğrula",
   "recoverAccount": "Hesap kurtarma",
   "enterRecoveryKeyHint": "Kurtarma anahtarınızı girin",
   "recover": "Kurtar",
@@ -148,6 +158,7 @@
       }
     }
   },
+  "invalidQRCode": "Geçersiz QR kodu",
   "noRecoveryKeyTitle": "Kurtarma anahtarınız yok mu?",
   "enterEmailHint": "E-posta adresinizi girin",
   "invalidEmailTitle": "Geçersiz e-posta adresi",
@@ -190,6 +201,10 @@
   "recoveryKeySaveDescription": "Biz bu anahtarı saklamıyoruz, lütfen. bu 24 kelimelik anahtarı güvenli bir yerde saklayın.",
   "doThisLater": "Bunu daha sonra yap",
   "saveKey": "Anahtarı kaydet",
+  "save": "Kaydet",
+  "send": "Gönder",
+  "saveOrSendDescription": "Bunu belleğinize mi kaydedeceksiniz (İndirilenler klasörü varsayılandır) yoksa diğer uygulamalara mı göndereceksiniz?",
+  "saveOnlyDescription": "Bunu belleğinize kaydetmek ister misiniz? (İndirilenler klasörü varsayılandır)",
   "back": "Geri",
   "createAccount": "Hesap oluştur",
   "passwordStrength": "Şifre gücü: {passwordStrengthValue}",
@@ -337,6 +352,7 @@
   "deleteCodeAuthMessage": "Kodu silmek için doğrulama yapın",
   "showQRAuthMessage": "QR kodunu göstermek için doğrulama yapın",
   "confirmAccountDeleteTitle": "Hesap silme işlemini onayla",
+  "confirmAccountDeleteMessage": "Kullandığınız Ente uygulamaları varsa bu hesap diğer Ente uygulamalarıyla bağlantılıdır.\n\nTüm Ente uygulamalarına yüklediğiniz veriler ve hesabınız kalıcı olarak silinecektir.",
   "androidBiometricHint": "Kimliği doğrula",
   "@androidBiometricHint": {
     "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
@@ -396,5 +412,29 @@
   "signOutOtherDevices": "Diğer cihazlardan çıkış yap",
   "doNotSignOut": "Çıkış yapma",
   "hearUsWhereTitle": "Ente'yi nereden duydunuz? (opsiyonel)",
-  "hearUsExplanation": "Biz uygulama kurulumlarını takip etmiyoruz. Bizi nereden duyduğunuzdan bahsetmeniz bize çok yardımcı olacak!"
+  "hearUsExplanation": "Biz uygulama kurulumlarını takip etmiyoruz. Bizi nereden duyduğunuzdan bahsetmeniz bize çok yardımcı olacak!",
+  "recoveryKeySaved": "Kurtarma anahtarı İndirilenler klasörüne kaydedildi!",
+  "waitingForBrowserRequest": "Tarayıcı isteği bekleniyor...",
+  "waitingForVerification": "Doğrulama bekleniyor...",
+  "passkey": "Geçiş anahtarı",
+  "developerSettingsWarning": "Geliştirici ayarlarını değiştirmekten emin misiniz?",
+  "developerSettings": "Geliştirici ayarları",
+  "serverEndpoint": "Sunucu uç noktası",
+  "invalidEndpoint": "Geçersiz uç nokta",
+  "invalidEndpointMessage": "Üzgünüz, girdiğiniz uç nokta geçersiz. Lütfen geçerli bir uç nokta girin ve tekrar deneyin.",
+  "endpointUpdatedMessage": "Uç nokta başarıyla güncellendi",
+  "customEndpoint": "Bağlandı: {endpoint}",
+  "pinText": "Sabitle",
+  "unpinText": "Sabitlemeyi kaldır",
+  "pinnedCodeMessage": "{code} sabitlendi",
+  "unpinnedCodeMessage": "{code} sabitlemesi kaldırıldı",
+  "tags": "Etiketler",
+  "createNewTag": "Yeni etiket oluştur",
+  "tag": "Etiket",
+  "create": "Oluştur",
+  "editTag": "Etiketi düzenle",
+  "deleteTagTitle": "Etiket silinsin mi?",
+  "deleteTagMessage": "Bu etiketi silmek istediğinizden emin misiniz? Bu işlem geri alınamaz.",
+  "somethingWentWrongParsingCode": "{x} kodu ayrıştıramadık.",
+  "updateNotAvailable": "Güncelleme mevcut değil"
 }

auth/lib/l10n/arb/app_zh.arb

@@ -20,6 +20,8 @@
   "codeIssuerHint": "发行人",
   "codeSecretKeyHint": "私钥",
   "codeAccountHint": "账户 (you@domain.com)",
+  "codeTagHint": "标签",
+  "accountKeyType": "密钥类型",
   "sessionExpired": "会话已过期",
   "@sessionExpired": {
     "description": "Title of the dialog when the users current session is invalid/expired"
@@ -156,6 +158,7 @@
       }
     }
   },
+  "invalidQRCode": "二维码无效",
   "noRecoveryKeyTitle": "没有恢复密钥吗？",
   "enterEmailHint": "请输入您的电子邮件地址",
   "invalidEmailTitle": "无效的电子邮件地址",
@@ -420,5 +423,18 @@
   "invalidEndpoint": "端点无效",
   "invalidEndpointMessage": "抱歉，您输入的端点无效。请输入有效的端点，然后重试。",
   "endpointUpdatedMessage": "端点更新成功",
-  "customEndpoint": "已连接至 {endpoint}"
+  "customEndpoint": "已连接至 {endpoint}",
+  "pinText": "置顶",
+  "unpinText": "取消置顶",
+  "pinnedCodeMessage": "{code} 已被置顶",
+  "unpinnedCodeMessage": "{code} 已被取消置顶",
+  "tags": "标签",
+  "createNewTag": "创建新标签",
+  "tag": "标签",
+  "create": "创建",
+  "editTag": "编辑标签",
+  "deleteTagTitle": "要删除标签吗？",
+  "deleteTagMessage": "您确定要删除此标签吗？此操作是不可逆的。",
+  "somethingWentWrongParsingCode": "我们无法解析 {x} 代码。",
+  "updateNotAvailable": "更新不可用"
 }

auth/lib/models/code.dart

@@ -128,7 +128,7 @@ class Code {
       final code = Code(
         _getAccount(uri),
         issuer,
-        _getDigits(uri, issuer),
+        _getDigits(uri),
         _getPeriod(uri),
         getSanitizedSecret(uri.queryParameters['secret']!),
         _getAlgorithm(uri),
@@ -201,11 +201,11 @@ class Code {
     }
   }
 
-  static int _getDigits(Uri uri, String issuer) {
+  static int _getDigits(Uri uri) {
     try {
       return int.parse(uri.queryParameters['digits']!);
     } catch (e) {
-      if (issuer.toLowerCase() == "steam") {
+      if (uri.host == "steam") {
         return steamDigits;
       }
       return defaultDigits;

auth/lib/onboarding/view/setup_enter_secret_key_page.dart

@@ -240,7 +240,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
       final account = _accountController.text.trim();
       final issuer = _issuerController.text.trim();
       final secret = _secretController.text.trim().replaceAll(' ', '');
-      final isStreamCode = issuer.toLowerCase() == "steam";
+      final isStreamCode = issuer.toLowerCase() == "steam" || issuer.toLowerCase().contains('steampowered.com');
       if (widget.code != null && widget.code!.secret != secret) {
         ButtonResult? result = await showChoiceActionSheet(
           context,

auth/lib/ui/code_widget.dart

@@ -48,7 +48,6 @@ class _CodeWidgetState extends State<CodeWidget> {
   late bool _shouldShowLargeIcon;
   late bool _hideCode;
   bool isMaskingEnabled = false;
-  late final colorScheme = getEnteColorScheme(context);
 
   @override
   void initState() {
@@ -78,6 +77,7 @@ class _CodeWidgetState extends State<CodeWidget> {
 
   @override
   Widget build(BuildContext context) {
+    final colorScheme = getEnteColorScheme(context);
     if (isMaskingEnabled != PreferenceService.instance.shouldHideCodes()) {
       isMaskingEnabled = PreferenceService.instance.shouldHideCodes();
       _hideCode = isMaskingEnabled;
@@ -91,6 +91,100 @@ class _CodeWidgetState extends State<CodeWidget> {
       _isInitialized = true;
     }
     final l10n = context.l10n;
+
+    Widget getCardContents(AppLocalizations l10n) {
+      return Stack(
+        children: [
+          if (widget.code.isPinned)
+            Align(
+              alignment: Alignment.topRight,
+              child: CustomPaint(
+                painter: PinBgPainter(
+                  color: colorScheme.pinnedBgColor,
+                ),
+                size: const Size(39, 39),
+              ),
+            ),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              if (widget.code.type.isTOTPCompatible)
+                CodeTimerProgress(
+                  period: widget.code.period,
+                ),
+              const SizedBox(height: 16),
+              Row(
+                children: [
+                  _shouldShowLargeIcon ? _getIcon() : const SizedBox.shrink(),
+                  Expanded(
+                    child: Column(
+                      children: [
+                        _getTopRow(),
+                        const SizedBox(height: 4),
+                        _getBottomRow(l10n),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(
+                height: 20,
+              ),
+            ],
+          ),
+          if (widget.code.isPinned) ...[
+            Align(
+              alignment: Alignment.topRight,
+              child: Padding(
+                padding: const EdgeInsets.only(right: 6, top: 6),
+                child: SvgPicture.asset("assets/svg/pin-card.svg"),
+              ),
+            ),
+          ],
+        ],
+      );
+    }
+
+    Widget clippedCard(AppLocalizations l10n) {
+      return Container(
+        height: 132,
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(8),
+          color: Theme.of(context).colorScheme.codeCardBackgroundColor,
+          boxShadow:
+              widget.code.isPinned ? colorScheme.pinnedCardBoxShadow : [],
+        ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(8),
+          child: Material(
+            color: Colors.transparent,
+            child: InkWell(
+              customBorder: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(10),
+              ),
+              onTap: () {
+                _copyCurrentOTPToClipboard();
+              },
+              onDoubleTap: isMaskingEnabled
+                  ? () {
+                      setState(
+                        () {
+                          _hideCode = !_hideCode;
+                        },
+                      );
+                    }
+                  : null,
+              onLongPress: () {
+                _copyCurrentOTPToClipboard();
+              },
+              child: getCardContents(l10n),
+            ),
+          ),
+        ),
+      );
+    }
+
     return Container(
       margin: const EdgeInsets.only(left: 16, right: 16, bottom: 8, top: 8),
       child: Builder(
@@ -126,7 +220,7 @@ class _CodeWidgetState extends State<CodeWidget> {
                 ],
                 padding: const EdgeInsets.all(8.0),
               ),
-              child: _clippedCard(l10n),
+              child: clippedCard(l10n),
             );
           }
 
@@ -216,7 +310,7 @@ class _CodeWidgetState extends State<CodeWidget> {
               ],
             ),
             child: Builder(
-              builder: (context) => _clippedCard(l10n),
+              builder: (context) => clippedCard(l10n),
             ),
           );
         },
@@ -224,98 +318,6 @@ class _CodeWidgetState extends State<CodeWidget> {
     );
   }
 
-  Widget _clippedCard(AppLocalizations l10n) {
-    return Container(
-      height: 132,
-      decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(8),
-        color: Theme.of(context).colorScheme.codeCardBackgroundColor,
-        boxShadow: widget.code.isPinned ? colorScheme.pinnedCardBoxShadow : [],
-      ),
-      child: ClipRRect(
-        borderRadius: BorderRadius.circular(8),
-        child: Material(
-          color: Colors.transparent,
-          child: InkWell(
-            customBorder: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(10),
-            ),
-            onTap: () {
-              _copyCurrentOTPToClipboard();
-            },
-            onDoubleTap: isMaskingEnabled
-                ? () {
-                    setState(
-                      () {
-                        _hideCode = !_hideCode;
-                      },
-                    );
-                  }
-                : null,
-            onLongPress: () {
-              _copyCurrentOTPToClipboard();
-            },
-            child: _getCardContents(l10n),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _getCardContents(AppLocalizations l10n) {
-    return Stack(
-      children: [
-        if (widget.code.isPinned)
-          Align(
-            alignment: Alignment.topRight,
-            child: CustomPaint(
-              painter: PinBgPainter(
-                color: colorScheme.pinnedBgColor,
-              ),
-              size: const Size(39, 39),
-            ),
-          ),
-        Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            if (widget.code.type.isTOTPCompatible)
-              CodeTimerProgress(
-                period: widget.code.period,
-              ),
-            const SizedBox(height: 16),
-            Row(
-              children: [
-                _shouldShowLargeIcon ? _getIcon() : const SizedBox.shrink(),
-                Expanded(
-                  child: Column(
-                    children: [
-                      _getTopRow(),
-                      const SizedBox(height: 4),
-                      _getBottomRow(l10n),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(
-              height: 20,
-            ),
-          ],
-        ),
-        if (widget.code.isPinned) ...[
-          Align(
-            alignment: Alignment.topRight,
-            child: Padding(
-              padding: const EdgeInsets.only(right: 6, top: 6),
-              child: SvgPicture.asset("assets/svg/pin-card.svg"),
-            ),
-          ),
-        ],
-      ],
-    );
-  }
-
   Widget _getBottomRow(AppLocalizations l10n) {
     return Container(
       padding: const EdgeInsets.only(left: 16, right: 16),
@@ -585,7 +587,7 @@ class _CodeWidgetState extends State<CodeWidget> {
   String _getFormattedCode(String code) {
     if (_hideCode) {
       // replace all digits with •
-      code = code.replaceAll(RegExp(r'\d'), '•');
+      code = code.replaceAll(RegExp(r'\S'), '•');
     }
     if (code.length == 6) {
       return "${code.substring(0, 3)} ${code.substring(3, 6)}";

auth/lib/ui/settings/data/import/aegis_import.dart

@@ -6,6 +6,7 @@ import 'dart:typed_data';
 import 'package:convert/convert.dart';
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/models/code.dart';
+import 'package:ente_auth/models/code_display.dart';
 import 'package:ente_auth/services/authenticator_service.dart';
 import 'package:ente_auth/store/code_store.dart';
 import 'package:ente_auth/ui/common/progress_dialog.dart';
@@ -76,7 +77,7 @@ Future<void> _pickAegisJsonFile(BuildContext context) async {
     await showErrorDialog(
       context,
       context.l10n.sorry,
-      context.l10n.importFailureDesc,
+      "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
     );
   }
 }
@@ -126,8 +127,19 @@ Future<int?> _processAegisExportFile(
   } else {
     aegisDB = decodedJson['db'];
   }
+  final Map<String, String> groupIDToName = {};
+  try {
+    for (var item in aegisDB?['groups']) {
+      groupIDToName[item['uuid']] = item['name'];
+    }
+  } catch (e) {
+    Logger("AegisImport").warning("Failed to parse groups", e);
+  }
+
   final parsedCodes = [];
   for (var item in aegisDB?['entries']) {
+    bool isFavorite = item['favorite'] ?? false;
+    List<String> tags = [];
     var kind = item['type'];
     var account = item['name'];
     var issuer = item['issuer'];
@@ -137,20 +149,27 @@ Future<int?> _processAegisExportFile(
     var digits = item['info']['digits'];
 
     var counter = item['info']['counter'];
-
+    for (var group in item['groups']) {
+      if (groupIDToName.containsKey(group)) {
+        tags.add(groupIDToName[group]!);
+      }
+    }
     // Build the OTP URL
     String otpUrl;
 
-    if (kind.toLowerCase() == 'totp') {
+    if (kind.toLowerCase() == 'totp' || kind.toLowerCase() == 'steam') {
       otpUrl =
           'otpauth://$kind/$issuer:$account?secret=$secret&issuer=$issuer&algorithm=$algorithm&digits=$digits&period=$timer';
     } else if (kind.toLowerCase() == 'hotp') {
       otpUrl =
           'otpauth://$kind/$issuer:$account?secret=$secret&issuer=$issuer&algorithm=$algorithm&digits=$digits&counter=$counter';
     } else {
-      throw Exception('Invalid OTP type');
+      throw Exception('Invalid OTP type: $kind');
     }
-    parsedCodes.add(Code.fromOTPAuthUrl(otpUrl));
+
+    Code code = Code.fromOTPAuthUrl(otpUrl);
+    code = code.copyWith(display: CodeDisplay(pinned: isFavorite, tags: tags));
+    parsedCodes.add(code);
   }
 
   for (final code in parsedCodes) {

auth/lib/ui/settings/data/import/bitwarden_import.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/models/code.dart';
+import 'package:ente_auth/models/code_display.dart';
 import 'package:ente_auth/services/authenticator_service.dart';
 import 'package:ente_auth/store/code_store.dart';
 import 'package:ente_auth/ui/components/buttons/button_widget.dart';
@@ -14,6 +15,7 @@ import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
 
 Future<void> showBitwardenImportInstruction(BuildContext context) async {
   final l10n = context.l10n;
@@ -60,12 +62,13 @@ Future<void> _pickBitwardenJsonFile(BuildContext context) async {
     if (count != null) {
       await importSuccessDialog(context, count);
     }
-  } catch (e) {
+  } catch (e, s) {
+    Logger("BitwardenImport").severe('Failed to import', e, s);
     await progressDialog.hide();
     await showErrorDialog(
       context,
       context.l10n.sorry,
-      context.l10n.importFailureDesc,
+      "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
     );
   }
 }
@@ -78,19 +81,36 @@ Future<int?> _processBitwardenExportFile(
   final jsonString = await file.readAsString();
   final data = jsonDecode(jsonString);
   List<dynamic> jsonArray = data['items'];
+  final Map<String, String> folderIdToName = {};
+  try {
+    for (var item in data['folders']) {
+      folderIdToName[item['id']] = item['name'];
+    }
+  } catch (e) {
+    debugPrint("Failed to get folder details $e");
+  }
   final parsedCodes = [];
   for (var item in jsonArray) {
     if (item['login'] != null && item['login']['totp'] != null) {
       var totp = item['login']['totp'];
+      String? folderID = item['folderId'];
 
       Code code;
-
       if (totp.contains("otpauth://")) {
         code = Code.fromOTPAuthUrl(totp);
+      } else if (totp.contains("steam://")) {
+        var secret = totp.split("steam://")[1];
+        code = Code.fromAccountAndSecret(
+          Type.steam,
+          item['login']['username'],
+          item['name'],
+          secret,
+          null,
+          Code.steamDigits,
+        );
       } else {
-        var issuer = item['name'];
-        var account = item['login']['username'];
-
+        var issuer = item['name'] ?? '';
+        var account = item['login']['username'] ?? '';
         code = Code.fromAccountAndSecret(
           Type.totp,
           account,
@@ -100,6 +120,11 @@ Future<int?> _processBitwardenExportFile(
           Code.defaultDigits,
         );
       }
+      if (folderID != null && folderIdToName.containsKey(folderID)) {
+        code = code.copyWith(
+          display: CodeDisplay(tags: [folderIdToName[folderID]!]),
+        );
+      }
 
       parsedCodes.add(code);
     }

auth/lib/ui/settings/data/import/lastpass_import.dart

@@ -14,6 +14,7 @@ import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
 
 Future<void> showLastpassImportInstruction(BuildContext context) async {
   final l10n = context.l10n;
@@ -60,12 +61,13 @@ Future<void> _pickLastpassJsonFile(BuildContext context) async {
     if (count != null) {
       await importSuccessDialog(context, count);
     }
-  } catch (e) {
+  } catch (e, s) {
+    Logger('LastPassImport').severe('exception while processing import', e, s);
     await progressDialog.hide();
     await showErrorDialog(
       context,
       context.l10n.sorry,
-      context.l10n.importFailureDesc,
+      "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
     );
   }
 }

auth/lib/ui/settings/data/import/raivo_plain_text_import.dart

@@ -14,6 +14,7 @@ import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
 
 Future<void> showRaivoImportInstruction(BuildContext context) async {
   final l10n = context.l10n;
@@ -60,12 +61,13 @@ Future<void> _pickRaivoJsonFile(BuildContext context) async {
     if (count != null) {
       await importSuccessDialog(context, count);
     }
-  } catch (e) {
+  } catch (e, s) {
+    Logger("RaivoImport").severe('Failed to import', e, s);
     await progressDialog.hide();
     await showErrorDialog(
       context,
       context.l10n.sorry,
-      context.l10n.importFailureDesc,
+      "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
     );
   }
 }
@@ -103,7 +105,7 @@ Future<int?> _processRaivoExportFile(BuildContext context, String path) async {
       otpUrl =
           'otpauth://$kind/$issuer:$account?secret=$secret&issuer=$issuer&algorithm=$algorithm&digits=$digits&counter=$counter';
     } else {
-      throw Exception('Invalid OTP type');
+      throw Exception('Invalid OTP type $kind');
     }
     parsedCodes.add(Code.fromOTPAuthUrl(otpUrl));
   }

auth/lib/ui/settings/data/import/two_fas_import.dart

@@ -72,7 +72,7 @@ Future<void> _pick2FasFile(BuildContext context) async {
     await showErrorDialog(
       context,
       context.l10n.sorry,
-      context.l10n.importFailureDesc,
+      "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
     );
   }
 }

auth/lib/utils/totp_util.dart

@@ -4,7 +4,7 @@ import 'package:otp/otp.dart' as otp;
 import 'package:steam_totp/steam_totp.dart';
 
 String getOTP(Code code) {
-  if (code.issuer.toLowerCase() == 'steam') {
+  if (code.type == Type.steam || code.issuer.toLowerCase() == 'steam') {
     return _getSteamCode(code);
   }
   if (code.type == Type.hotp) {
@@ -39,7 +39,7 @@ String _getSteamCode(Code code, [bool isNext = false]) {
 }
 
 String getNextTotp(Code code) {
-  if (code.issuer.toLowerCase() == 'steam') {
+  if (code.type == Type.steam || code.issuer.toLowerCase() == 'steam') {
     return _getSteamCode(code, true);
   }
   return otp.OTP.generateTOTPCodeString(

auth/pubspec.yaml

@@ -1,6 +1,6 @@
 name: ente_auth
 description: ente two-factor authenticator
-version: 3.0.4+304
+version: 3.0.8+308
 publish_to: none
 
 environment:

cli/README.md

@@ -107,11 +107,7 @@ docker-compose up -d
 
 `exec` into the container
 ```shell
-docker-compose exec ente /bin/sh
+docker-compose exec ente-cli /bin/sh -c "./ente-cli version"
+docker-compose exec ente-cli /bin/sh -c "./ente-cli account add" 
 ```
 
-#### Directly executing commands
-
-```shell
-docker run -it --rm ente:latest ls
-```

cli/docker-compose.yml

@@ -4,8 +4,11 @@ services:
     image: ente-cli:latest
     command: /bin/sh
     volumes:
-      # Replace /Volumes/Data/ with a folder path on your system, typically $HOME/.ente-cli/
-      - ~/.ente-cli/:/cli-data:rw
-#      - ~/Downloads/export-data:/data:rw
+      # This is mandatory to mount the local directory to the container at /cli-data
+      # CLI will use this directory to store the data required for syncing export
+      - /path/to/local/directory/cli/:/cli-data:rw
+      # You can add additional volumes to mount the export directory to the container
+      # While adding account for export, you can use /data as the export directory.
+      - /path/to/local/directory/export:/data:rw
     stdin_open: true
     tty: true

cli/internal/crypto/crypto.go

@@ -113,3 +113,23 @@ func DecryptChaChaBase64(data string, key []byte, nonce string) (string, []byte,
 	}
 	return base64.StdEncoding.EncodeToString(decryptedData), decryptedData, nil
 }
+
+func DecryptChaChaBase64Auth(data string, key []byte, nonce string) (string, []byte, error) {
+	// Decode data from base64
+	dataBytes, err := base64.StdEncoding.DecodeString(data)
+	if err != nil {
+		// safe to log the encrypted data
+		return "", nil, fmt.Errorf("invalid base64 data %s: %v", data, err)
+	}
+	// Decode nonce from base64
+	nonceBytes, err := base64.StdEncoding.DecodeString(nonce)
+	if err != nil {
+		return "", nil, fmt.Errorf("invalid nonce: %v", err)
+	}
+	// Decrypt data
+	decryptedData, err := decryptChaCha20poly1305V2(dataBytes, key, nonceBytes)
+	if err != nil {
+		return "", nil, fmt.Errorf("failed to decrypt data: %v", err)
+	}
+	return base64.StdEncoding.EncodeToString(decryptedData), decryptedData, nil
+}

cli/internal/crypto/crypto_libsodium.go

@@ -88,6 +88,23 @@ func decryptChaCha20poly1305(data []byte, key []byte, nonce []byte) ([]byte, err
 	return decoded, nil
 }
 
+// decryptChaCha20poly1305V2 is used only to decrypt Ente Auth data. Ente Auth use new version of LibSodium.
+// In that version, the final tag value is 0x0 instead of TagFinal.
+func decryptChaCha20poly1305V2(data []byte, key []byte, nonce []byte) ([]byte, error) {
+	decryptor, err := NewDecryptor(key, nonce)
+	if err != nil {
+		return nil, err
+	}
+	decoded, tag, err := decryptor.Pull(data)
+	if tag != TagFinal && tag != TagMessage {
+		return nil, errors.New("invalid tag")
+	}
+	if err != nil {
+		return nil, err
+	}
+	return decoded, nil
+}
+
 //func SecretBoxOpenLibSodium(c []byte, n []byte, k []byte) ([]byte, error) {
 //	var cp sodium.Bytes = c
 //	res, err := cp.SecretBoxOpen(sodium.SecretBoxNonce{Bytes: n}, sodium.SecretBoxKey{Bytes: k})

cli/main.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 )
 
-var AppVersion = "0.1.13"
+var AppVersion = "0.1.14"
 
 func main() {
 	cliDBPath, err := GetCLIConfigPath()
@@ -23,7 +23,7 @@ func main() {
 		cliDBPath = constants.CliDataPath
 		_, err := internal.ValidateDirForWrite(cliDBPath)
 		if err != nil {
-			log.Fatalf("Please mount a volume to %s to persist cli data\n%v\n", cliDBPath, err)
+			log.Fatalf("Please mount a volume to %s\n%v\n", cliDBPath, err)
 		}
 	}
 	if err != nil {

cli/pkg/authenticator/decrypt.go

@@ -55,7 +55,7 @@ func DecryptExport(inputPath string, outputPath string) error {
 		return fmt.Errorf("error deriving key: %v", err)
 	}
 
-	_, decryptedData, err := eCrypto.DecryptChaChaBase64(export.EncryptedData, key, export.EncryptionNonce)
+	_, decryptedData, err := eCrypto.DecryptChaChaBase64Auth(export.EncryptedData, key, export.EncryptionNonce)
 	if err != nil {
 		fmt.Printf("\nerror decrypting data %v", err)
 		fmt.Println("\nPlease check your password and try again")

desktop/.github/workflows/desktop-release.yml

@@ -5,12 +5,19 @@ name: "Release"
 # For more details, see `docs/release.md` in ente-io/ente.
 
 on:
-    # Trigger manually or `gh workflow run desktop-release.yml`.
+    # Trigger manually or `gh workflow run desktop-release.yml --source=foo`.
     workflow_dispatch:
+        inputs:
+            source:
+                description: "Branch (ente-io/ente) to build"
+                type: string
+    schedule:
+        # Run everyday at ~8:00 AM IST (except Sundays).
+        # See: [Note: Run workflow every 24 hours]
+        #
+        - cron: "45 2 * * 1-6"
     push:
         # Run when a tag matching the pattern "v*"" is pushed.
-        #
-        # See: [Note: Testing release workflows that are triggered by tags].
         tags:
             - "v*"
 
@@ -30,9 +37,13 @@ jobs:
             - name: Checkout code
               uses: actions/checkout@v4
               with:
-                  # Checkout the desktop/rc branch from the source repository.
+                  # If triggered by a tag, checkout photosd-$tag from the source
+                  # repository. Otherwise checkout $source (default: "main").
                   repository: ente-io/ente
-                  ref: desktop/rc
+                  ref:
+                      "${{ startsWith(github.ref, 'refs/tags/v') &&
+                      format('photosd-{0}', github.ref_name) || ( inputs.source
+                      || 'main' ) }}"
                   submodules: recursive
 
             - name: Setup node
@@ -64,10 +75,8 @@ jobs:
                   # (No need to define this secret in the repo settings)
                   github_token: ${{ secrets.GITHUB_TOKEN }}
 
-                  # If the commit is tagged with a version (e.g. "v1.0.0"),
-                  # create a (draft) release after building. Otherwise upload
-                  # assets to the existing draft named after the version.
-                  release: ${{ startsWith(github.ref, 'refs/tags/v') }}
+                  # Passes `--publish always` to electron-builder
+                  release: true
 
                   mac_certs: ${{ secrets.MAC_CERTS }}
                   mac_certs_password: ${{ secrets.MAC_CERTS_PASSWORD }}
@@ -77,4 +86,13 @@ jobs:
                   APPLE_APP_SPECIFIC_PASSWORD:
                       ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
                   APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+                  # Default is "draft", but since our nightly builds update
+                  # existing pre-releases, set this to "prerelease".
+                  EP_PRE_RELEASE: true
+                  # By default, electron-builder does not update releases that
+                  # were more than 2 hours ago. Override this to allow us to
+                  # continually update our nightly pre-releases.
+                  EP_GH_IGNORE_TIME: true
+                  # Workaround recommended in
+                  # https://github.com/electron-userland/electron-builder/issues/3179
                   USE_HARD_LINKS: false

desktop/CHANGELOG.md

@@ -1,6 +1,11 @@
 # CHANGELOG
 
-## v1.7.0 (Unreleased)
+## v1.7.1 (Unreleased)
+
+-   Remember the window size across app restarts.
+-   Revert changes to the Linux icon.
+
+## v1.7.0
 
 v1.7 is a major rewrite to improve the security of our app. In particular, the
 UI and the native parts of the app now run isolated from each other and

desktop/docs/release.md

@@ -1,65 +1,94 @@
 ## Releases
 
-Conceptually, the release is straightforward: We trigger a GitHub workflow that
-creates a draft release with artifacts built. When ready, we publish that
-release. The download links on our website, and existing apps already check the
-latest GitHub release and update accordingly.
+Conceptually, the release is straightforward:
 
-The complication comes by the fact that electron-builder's auto updaterr (the
+1.  We trigger a GitHub workflow that creates a (pre-)release with the build.
+
+2.  When ready, we make that release the latest.
+
+3.  The download links on our website, and existing apps already check the
+    latest GitHub release and update automatically.
+
+The complication comes by the fact that electron-builder's auto updater (the
 mechanism that we use for auto updates) doesn't work with monorepos. So we need
-to keep a separate (non-mono) repository just for doing releases.
+to keep a separate repository just for holding the releases.
 
 -   Source code lives here, in [ente-io/ente](https://github.com/ente-io/ente).
 
 -   Releases are done from
     [ente-io/photos-desktop](https://github.com/ente-io/photos-desktop).
 
-## Workflow - Release Candidates
+## Workflow - Release candidates
 
-Leading up to the release, we can make one or more draft releases that are not
-intended to be published, but serve as test release candidates.
+Nightly RC builds of `main` are published by a scheduled workflow automatically.
+If needed, these builds can also be manually updated, and the branch of the
+source repository to build (default "main") also specified:
 
-The workflow for making such "rc" builds is:
+```sh
+gh workflow run desktop-release.yml --source=<branch>
+```
 
-1.  Update `package.json` in the source repo to use version `1.x.x-rc`. Create a
-    new draft release in the release repo with title `1.x.x-rc`. In the tag
-    input enter `v1.x.x-rc` and select the option to "create a new tag on
-    publish".
-
-2.  Push code to the `desktop/rc` branch in the source repo.
-
-3.  Trigger the GitHub action in the release repo
-
-    ```sh
-    gh workflow run desktop-release.yml
-    ```
-
-We can do steps 2 and 3 multiple times: each time it'll just update the
-artifacts attached to the same draft.
+Each such workflow run will update the artifacts attached to the same
+(pre-existing) pre-release.
 
 ## Workflow - Release
 
-1.  Update source repo to set version `1.x.x` in `package.json` and finialize
-    the CHANGELOG.
+1.  Update source repo to set version `1.x.x` in `package.json` and finalize the
+    CHANGELOG.
 
-2.  Push code to the `desktop/rc` branch in the source repo.
+2.  Merge PR then tag the merge commit on `main` in the source repo:
 
-3.  In the release repo
+    ```sh
+    git tag photosd-v1.x.x
+    git push origin photosd-v1.x.x
+    ```
+
+3.  In the release repo:
 
     ```sh
     ./.github/trigger-release.sh v1.x.x
     ```
 
-4.  If the build is successful, tag `desktop/rc` in the source repo.
+This'll trigger the workflow and create a new pre-release. We can edit this to
+add the release notes, convert it to a release. Once it is marked as latest, the
+release goes live.
+
+We are done at this point, and can now create a new pre-release to host
+subsequent nightly builds.
+
+1.  Update `package.json` in the source repo to use version `1.x.x-rc`, and
+    merge these changes into `main`.
+
+2.  In the release repo:
 
     ```sh
-    # Assuming we're on desktop/rc that just got build
-
-    git tag photosd-v1.x.x
-    git push origin photosd-v1.x.x
+    git tag 1.x.x-rc
+    git push origin 1.x.x-rc
     ```
 
-## Post build
+3.  Once the workflow finishes and the pre-release is created, edit its
+    description to "Nightly builds".
+
+4.  Delete the pre-release for the previous (already released) version.
+
+## Workflow - Extra pre-releases
+
+To create extra one off pre-releases in addition to the nightly `1.x.x-rc` ones,
+
+1.  In your branch in the source repository, set the version in `package.json`
+    to something different, say `1.x.x-my-test`.
+
+2.  Create a new pre-release in the release repo with title `1.x.x-test`. In the
+    tag input enter `v1.x.x-test` and select the option to "create a new tag on
+    publish".
+
+3.  Trigger the workflow in the release repo:
+
+    ```sh
+    gh workflow run desktop-release.yml --source=my-branch
+    ```
+
+## Details
 
 The GitHub Action runs on Windows, Linux and macOS. It produces the artifacts
 defined in the `build` value in `package.json`.
@@ -87,8 +116,3 @@ everything is automated:
     now their maintainers automatically bump the SHA, version number and the
     (derived from the version) URL in the formula when their tools notice a new
     release on our GitHub.
-
-We can also publish the draft releases by checking the "pre-release" option.
-Such releases don't cause any of the channels (our website, or the desktop app
-auto updater, or brew) to be notified, instead these are useful for giving links
-to pre-release builds to customers.

desktop/electron-builder.yml

@@ -23,6 +23,7 @@ linux:
         - target: pacman
           arch: [x64, arm64]
     category: Photography
+    icon: ./build/icon.icns
 mac:
     target:
         target: default

desktop/eslint.config.mjs

@@ -0,0 +1,43 @@
+// @ts-check
+
+import js from "@eslint/js";
+import ts from "typescript-eslint";
+
+export default ts.config(
+    js.configs.recommended,
+    ...ts.configs.strictTypeChecked,
+    ...ts.configs.stylisticTypeChecked,
+    {
+        // typescript-eslint needs this enabling type checked rules.
+        languageOptions: {
+            parserOptions: {
+                project: true,
+                tsconfigRootDir: import.meta.dirname,
+            },
+        },
+    },
+    {
+        // The list of (minimatch) globs to ignore. This needs to be the only
+        // key in this configuration object.
+        ignores: ["eslint.config.mjs", "app/", "out/", "dist/"],
+    },
+    {
+        // Rule customizations.
+        rules: {
+            // Allow numbers to be used in template literals.
+            "@typescript-eslint/restrict-template-expressions": [
+                "error",
+                {
+                    allowNumber: true,
+                },
+            ],
+            // Allow void expressions as the entire body of an arrow function.
+            "@typescript-eslint/no-confusing-void-expression": [
+                "error",
+                {
+                    ignoreArrowShorthand: true,
+                },
+            ],
+        },
+    },
+);

desktop/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.0-rc",
+    "version": "1.7.1-rc",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",
@@ -17,8 +17,8 @@
         "dev-main": "tsc && electron .",
         "dev-renderer": "cd ../web && yarn install && yarn dev:photos",
         "postinstall": "electron-builder install-app-deps",
-        "lint": "yarn prettier --check --log-level warn . && eslint --ext .ts src && yarn tsc",
-        "lint-fix": "yarn prettier --write --log-level warn . && eslint --fix --ext .ts src && yarn tsc"
+        "lint": "yarn prettier --check --log-level warn . && yarn eslint && yarn tsc",
+        "lint-fix": "yarn prettier --write --log-level warn . && yarn eslint && yarn tsc"
     },
     "resolutions": {
         "jackspeak": "2.1.1"
@@ -30,29 +30,30 @@
         "compare-versions": "^6.1",
         "electron-log": "^5.1",
         "electron-store": "^8.2",
-        "electron-updater": "^6.1",
+        "electron-updater": "^6.2",
         "ffmpeg-static": "^5.2",
         "html-entities": "^2.5",
         "jpeg-js": "^0.4",
         "next-electron-server": "^1",
         "node-stream-zip": "^1.15",
-        "onnxruntime-node": "^1.17"
+        "onnxruntime-node": "^1.18"
     },
     "devDependencies": {
+        "@eslint/js": "^9.4.0",
         "@tsconfig/node20": "^20.1.4",
         "@types/auto-launch": "^5.0",
+        "@types/eslint__js": "^8.42.3",
         "@types/ffmpeg-static": "^3.0",
-        "@typescript-eslint/eslint-plugin": "^7",
-        "@typescript-eslint/parser": "^7",
         "concurrently": "^8",
         "electron": "^30",
-        "electron-builder": "25.0.0-alpha.6",
-        "eslint": "^8",
+        "electron-builder": "25.0.0-alpha.8",
+        "eslint": "^9.4.0",
         "prettier": "^3",
         "prettier-plugin-organize-imports": "^3",
         "prettier-plugin-packagejson": "^2",
         "shx": "^0.3",
-        "typescript": "^5"
+        "typescript": "^5",
+        "typescript-eslint": "8.0.0-alpha.10"
     },
     "packageManager": "yarn@1.22.21",
     "productName": "ente"

desktop/src/main.ts

@@ -143,12 +143,22 @@ const registerPrivilegedSchemes = () => {
  * This window will show the HTML served from {@link rendererURL}.
  */
 const createMainWindow = () => {
+    const icon = nativeImage.createFromPath(
+        path.join(isDev ? "build" : process.resourcesPath, "window-icon.png"),
+    );
+    const bounds = windowBounds();
+
     // Create the main window. This'll show our web content.
     const window = new BrowserWindow({
         webPreferences: {
             preload: path.join(__dirname, "preload.js"),
             sandbox: true,
         },
+        icon,
+        // Set the window's position and size (if we have one saved).
+        ...(bounds ?? {}),
+        // Enforce a minimum size
+        ...minimumWindowSize(),
         // The color to show in the window until the web content gets loaded.
         // See: https://www.electronjs.org/docs/latest/api/browser-window#setting-the-backgroundcolor-property
         backgroundColor: "black",
@@ -162,8 +172,10 @@ const createMainWindow = () => {
         // On macOS, also hide the dock icon on macOS.
         if (process.platform == "darwin") app.dock.hide();
     } else {
-        // Show our window (maximizing it) otherwise.
-        window.maximize();
+        // Show our window otherwise.
+        //
+        // If we did not give it an explicit size, maximize it
+        bounds ? window.show() : window.maximize();
     }
 
     // Open the DevTools automatically when running in dev mode
@@ -209,11 +221,64 @@ const createMainWindow = () => {
     return window;
 };
 
+/**
+ * The position and size to use when showing the main window.
+ *
+ * The return value is `undefined` if the app's window was maximized the last
+ * time around, and so if we should restore it to the maximized state.
+ *
+ * Otherwise it returns the position and size of the window the last time the
+ * app quit.
+ *
+ * If there is no such saved value (or if it is the first time the user is
+ * running the app), return a default size.
+ */
+const windowBounds = () => {
+    if (userPreferences.get("isWindowMaximized")) return undefined;
+
+    const bounds = userPreferences.get("windowBounds");
+    if (bounds) return bounds;
+
+    // Default size. Picked arbitrarily as something that should look good on
+    // first launch. We don't provide a position to let Electron center the app.
+    return { width: 1170, height: 710 };
+};
+
+/**
+ * If for some reason {@link windowBounds} is outside the screen's bounds (e.g.
+ * if the user's screen resolution has changed), then the previously saved
+ * bounds might not be appropriate.
+ *
+ * Luckily, if we try to set an x/y position that is outside the screen's
+ * bounds, then Electron automatically clamps x + width and y + height to lie
+ * within the screen's available space, and we do not need to tackle such out of
+ * bounds cases specifically.
+ *
+ * However there is no minimum window size the Electron enforces by default. As
+ * a safety valve, provide an (arbitrary) minimum size so that the user can
+ * resize it back to sanity if something I cannot currently anticipate happens.
+ */
+const minimumWindowSize = () => ({ minWidth: 200, minHeight: 200 });
+
+/**
+ * Sibling of {@link windowBounds}, see that function's documentation for more
+ * details.
+ */
+const saveWindowBounds = (window: BrowserWindow) => {
+    if (window.isMaximized()) {
+        userPreferences.set("isWindowMaximized", true);
+        userPreferences.delete("windowBounds");
+    } else {
+        userPreferences.delete("isWindowMaximized");
+        userPreferences.set("windowBounds", window.getBounds());
+    }
+};
+
 /**
  * Automatically set the save path for user initiated downloads to the system's
  * "downloads" directory instead of asking the user to select a save location.
  */
-export const setDownloadPath = (webContents: WebContents) => {
+const setDownloadPath = (webContents: WebContents) => {
     webContents.session.on("will-download", (_, item) => {
         item.setSavePath(
             uniqueSavePath(app.getPath("downloads"), item.getFilename()),
@@ -241,7 +306,7 @@ const uniqueSavePath = (dirPath: string, fileName: string) => {
  *
  * @param webContents The renderer to configure.
  */
-export const allowExternalLinks = (webContents: WebContents) =>
+const allowExternalLinks = (webContents: WebContents) =>
     // By default, if the user were open a link, say
     // https://github.com/ente-io/ente/discussions, then it would open a _new_
     // BrowserWindow within our app.
@@ -273,7 +338,7 @@ export const allowExternalLinks = (webContents: WebContents) =>
  * "Access-Control-Allow-Origin: *" or do a echo-back of `Origin`, we add a
  * workaround here instead, intercepting the ACAO header and allowing `*`.
  */
-export const allowAllCORSOrigins = (webContents: WebContents) =>
+const allowAllCORSOrigins = (webContents: WebContents) =>
     webContents.session.webRequest.onHeadersReceived(
         ({ responseHeaders }, callback) => {
             const headers: NonNullable<typeof responseHeaders> = {};
@@ -322,6 +387,13 @@ const setupTrayItem = (mainWindow: BrowserWindow) => {
  * once most people have upgraded to newer versions.
  */
 const deleteLegacyDiskCacheDirIfExists = async () => {
+    const removeIfExists = async (dirPath: string) => {
+        if (existsSync(dirPath)) {
+            log.info(`Removing legacy disk cache from ${dirPath}`);
+            await fs.rm(dirPath, { recursive: true });
+        }
+    };
+
     // [Note: Getting the cache path]
     //
     // The existing code was passing "cache" as a parameter to getPath.
@@ -338,9 +410,18 @@ const deleteLegacyDiskCacheDirIfExists = async () => {
     //
     // @ts-expect-error "cache" works but is not part of the public API.
     const cacheDir = path.join(app.getPath("cache"), "ente");
-    if (existsSync(cacheDir)) {
-        log.info(`Removing legacy disk cache from ${cacheDir}`);
-        await fs.rm(cacheDir, { recursive: true });
+    if (process.platform == "win32") {
+        // On Windows the cache dir is the same as the app data (!). So deleting
+        // the ente subfolder of the cache dir is equivalent to deleting the
+        // user data dir.
+        //
+        // Obviously, that's not good. So instead of Windows we explicitly
+        // delete the named cache directories.
+        await removeIfExists(path.join(cacheDir, "thumbs"));
+        await removeIfExists(path.join(cacheDir, "files"));
+        await removeIfExists(path.join(cacheDir, "face-crops"));
+    } else {
+        await removeIfExists(cacheDir);
     }
 };
 
@@ -428,7 +509,10 @@ const main = () => {
     // app, e.g. by clicking on its dock icon.
     app.on("activate", () => mainWindow?.show());
 
-    app.on("before-quit", allowWindowClose);
+    app.on("before-quit", () => {
+        if (mainWindow) saveWindowBounds(mainWindow);
+        allowWindowClose();
+    });
 };
 
 main();

desktop/src/main/services/logout.ts

@@ -12,19 +12,22 @@ import { watchReset } from "./watch";
  * See: [Note: Do not throw during logout].
  */
 export const logout = (watcher: FSWatcher) => {
+    const ignoreError = (label: string, e: unknown) =>
+        log.error(`Ignoring error during logout (${label})`, e);
+
     try {
         watchReset(watcher);
     } catch (e) {
-        log.error("Ignoring error during logout (FS watch)", e);
+        ignoreError("FS watch", e);
     }
     try {
         clearConvertToMP4Results();
     } catch (e) {
-        log.error("Ignoring error during logout (convert-to-mp4)", e);
+        ignoreError("convert-to-mp4", e);
     }
     try {
         clearStores();
     } catch (e) {
-        log.error("Ignoring error during logout (native stores)", e);
+        ignoreError("native stores", e);
     }
 };

desktop/src/main/stores/user-preferences.ts

@@ -1,21 +1,47 @@
 import Store, { Schema } from "electron-store";
 
 interface UserPreferences {
+    /**
+     * If true, then the user has set a preference to also hide the dock icon on
+     * macOS whenever the app is hidden. The tray icon is always visible and can
+     * then be used to reopen the app when needed.
+     */
     hideDockIcon?: boolean;
     skipAppVersion?: string;
     muteUpdateNotificationVersion?: string;
+    /**
+     * The last position and size of our app's window.
+     *
+     * This value is saved when the app is about to quit, and is used to restore
+     * the window to the previous state when it restarts. It is only saved if
+     * the app is not maximized (when the app was maximized when it was being
+     * quit then {@link isWindowMaximized} will be set instead).
+     */
+    windowBounds?: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    /**
+     * `true` if the app's main window is maximized the last time it was closed.
+     */
+    isWindowMaximized?: boolean;
 }
 
 const userPreferencesSchema: Schema<UserPreferences> = {
-    hideDockIcon: {
-        type: "boolean",
-    },
-    skipAppVersion: {
-        type: "string",
-    },
-    muteUpdateNotificationVersion: {
-        type: "string",
+    hideDockIcon: { type: "boolean" },
+    skipAppVersion: { type: "string" },
+    muteUpdateNotificationVersion: { type: "string" },
+    windowBounds: {
+        properties: {
+            x: { type: "number" },
+            y: { type: "number" },
+            width: { type: "number" },
+            height: { type: "number" },
+        },
     },
+    isWindowMaximized: { type: "boolean" },
 };
 
 export const userPreferences = new Store({

desktop/src/main/stream.ts

@@ -106,7 +106,7 @@ const handleRead = async (path: string) => {
         res.headers.set("Content-Length", `${fileSize}`);
 
         // Add the file's last modified time (as epoch milliseconds).
-        const mtimeMs = stat.mtimeMs;
+        const mtimeMs = stat.mtime.getTime();
         res.headers.set("X-Last-Modified-Ms", `${mtimeMs}`);
     }
     return res;
@@ -132,6 +132,13 @@ const handleReadZip = async (zipPath: string, entryName: string) => {
     // Close the zip handle when the underlying stream closes.
     stream.on("end", () => void zip.close());
 
+    // While it is documented that entry.time is the modification time,
+    // the units are not mentioned. By seeing the source code, we can
+    // verify that it is indeed epoch milliseconds. See `parseZipTime`
+    // in the node-stream-zip source,
+    // https://github.com/antelle/node-stream-zip/blob/master/node_stream_zip.js
+    const modifiedMs = entry.time;
+
     return new Response(webReadableStream, {
         headers: {
             // We don't know the exact type, but it doesn't really matter, just
@@ -139,12 +146,7 @@ const handleReadZip = async (zipPath: string, entryName: string) => {
             // doesn't tinker with it thinking of it as text.
             "Content-Type": "application/octet-stream",
             "Content-Length": `${entry.size}`,
-            // While it is documented that entry.time is the modification time,
-            // the units are not mentioned. By seeing the source code, we can
-            // verify that it is indeed epoch milliseconds. See `parseZipTime`
-            // in the node-stream-zip source,
-            // https://github.com/antelle/node-stream-zip/blob/master/node_stream_zip.js
-            "X-Last-Modified-Ms": `${entry.time}`,
+            "X-Last-Modified-Ms": `${modifiedMs}`,
         },
     });
 };

desktop/src/main/types/any-shell-escape.d.ts

@@ -19,7 +19,6 @@
  *     curl -v -H "Location;" -H "User-Agent: FooBar's so-called ""Browser""" "http://www.daveeddy.com/?name=dave&age=24"
 Which is suitable for being executed by the shell.
  */
-/* eslint-disable no-unused-vars */
 declare module "any-shell-escape" {
     declare const shellescape: (args: readonly string | string[]) => string;
     export default shellescape;

desktop/src/preload.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 /**
  * @file The preload script
  *

desktop/src/thirdparty/clip-bpe-ts/mod.ts

@@ -373,7 +373,6 @@ export default class {
             return token + "</w>";
         }
 
-        // eslint-disable-next-line no-constant-condition
         while (1) {
             let bigram: [string, string] | null = null;
             let minRank = Infinity;

desktop/tsconfig.json

@@ -32,6 +32,6 @@
         "noUncheckedIndexedAccess": true,
         "exactOptionalPropertyTypes": true
     },
-    /* Transpile all `.ts` files in `src/` */
-    "include": ["src/**/*.ts"]
+    /* Include all `.ts` files in `src/` */
+    "include": ["src"]
 }

desktop/yarn.lock

@@ -65,10 +65,10 @@
     fs-extra "^9.0.1"
     promise-retry "^2.0.1"
 
-"@electron/osx-sign@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.5.tgz#0af7149f2fce44d1a8215660fd25a9fb610454d8"
-  integrity sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==
+"@electron/osx-sign@1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.3.0.tgz#bd6fb60c519b76ca8a000e5801f5685690e8adad"
+  integrity sha512-TEXhxlYSDRr9JWK5nWdOv5MtuUdaZ412uxIIEQ0hLt80o0HYWtQJBlW5QmrQDMtebzATaOjKG9UfCzLyA90zWQ==
   dependencies:
     compare-version "^0.1.2"
     debug "^4.3.4"
@@ -122,49 +122,54 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+"@eslint/config-array@^0.15.1":
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.15.1.tgz#1fa78b422d98f4e7979f2211a1fde137e26c7d61"
+  integrity sha512-K4gzNq+yymn/EVsXYmf+SBcBro8MTf+aXJZUphM96CdzUEr+ClGDvAbpmaEK+cGVigVXIgs9gNmvHAlrzzY5JQ==
+  dependencies:
+    "@eslint/object-schema" "^2.1.3"
+    debug "^4.3.1"
+    minimatch "^3.0.5"
+
+"@eslint/eslintrc@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6"
+  integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
+    espree "^10.0.1"
+    globals "^14.0.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.57.0":
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
-  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+"@eslint/js@9.4.0", "@eslint/js@^9.4.0":
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.4.0.tgz#96a2edd37ec0551ce5f9540705be23951c008a0c"
+  integrity sha512-fdI7VJjP3Rvc70lC4xkFXHB0fiPeojiL1PxVG6t1ZvXQrarj893PweuBTujxDUFk0Fxj4R7PIIAZ/aiiyZPZcg==
+
+"@eslint/object-schema@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.3.tgz#e65ae80ee2927b4fd8c5c26b15ecacc2b2a6cc2a"
+  integrity sha512-HAbhAYKfsAC2EkTqve00ibWIZlaU74Z1EHwAjYr4PXF0YU2VEA1zSIKSSpKszRLRWwHzzRZXvK632u+uXzvsvw==
 
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.11.14":
-  version "0.11.14"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
-  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
-  dependencies:
-    "@humanwhocodes/object-schema" "^2.0.2"
-    debug "^4.3.1"
-    minimatch "^3.0.5"
-
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
-  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+"@humanwhocodes/retry@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570"
+  integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==
 
 "@isaacs/fs-minipass@^4.0.0":
   version "4.0.1"
@@ -281,6 +286,26 @@
   dependencies:
     "@types/ms" "*"
 
+"@types/eslint@*":
+  version "8.56.10"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d"
+  integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/eslint__js@^8.42.3":
+  version "8.42.3"
+  resolved "https://registry.yarnpkg.com/@types/eslint__js/-/eslint__js-8.42.3.tgz#d1fa13e5c1be63a10b4e3afe992779f81c1179a0"
+  integrity sha512-alfG737uhmPdnvkrLdZLcEKJ/B8s9Y4hrZ+YAdzUeoArBlSUERA2E87ROfOaS4jd/C45fzOoZzidLc1IPwLqOw==
+  dependencies:
+    "@types/eslint" "*"
+
+"@types/estree@*":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+
 "@types/ffmpeg-static@^3.0":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/ffmpeg-static/-/ffmpeg-static-3.0.3.tgz#605358ac6304507a75c2fd5fd861534837b19e2f"
@@ -298,7 +323,7 @@
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4"
   integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==
 
-"@types/json-schema@^7.0.15":
+"@types/json-schema@*", "@types/json-schema@^7.0.15":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -316,9 +341,9 @@
   integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
 
 "@types/node@*", "@types/node@^20.9.0":
-  version "20.12.12"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050"
-  integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==
+  version "20.13.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.13.0.tgz#011a76bc1e71ae9a026dddcfd7039084f752c4b6"
+  integrity sha512-FM6AOb3khNkNIXPnHFDYaHerSv8uN22C91z098AnGccVu+Pcdhi+pNUFDi0iLmPIsVE0JBD0KVS7mzUYt4nRzQ==
   dependencies:
     undici-types "~5.26.4"
 
@@ -359,16 +384,16 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^7":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.8.0.tgz#c78e309fe967cb4de05b85cdc876fb95f8e01b6f"
-  integrity sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==
+"@typescript-eslint/eslint-plugin@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.0.0-alpha.10.tgz#a102e40da7b72a2981cb2da43064d9b3c865ca58"
+  integrity sha512-jsNKqn41nIS8jz5Li5xsueGEBBmRYLaflUKlclEkj8cWrO1tMK1/7xITeiVz7ZlNFZF2nop2NlXrbLtRpLEzhg==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.8.0"
-    "@typescript-eslint/type-utils" "7.8.0"
-    "@typescript-eslint/utils" "7.8.0"
-    "@typescript-eslint/visitor-keys" "7.8.0"
+    "@typescript-eslint/scope-manager" "8.0.0-alpha.10"
+    "@typescript-eslint/type-utils" "8.0.0-alpha.10"
+    "@typescript-eslint/utils" "8.0.0-alpha.10"
+    "@typescript-eslint/visitor-keys" "8.0.0-alpha.10"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.3.1"
@@ -376,47 +401,47 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/parser@^7":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.8.0.tgz#1e1db30c8ab832caffee5f37e677dbcb9357ddc8"
-  integrity sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==
+"@typescript-eslint/parser@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.0.0-alpha.10.tgz#fbefd39da010d65407b985f2b5c6e0a79bc8a6f4"
+  integrity sha512-4EerPviLfBKgExHARehJgWrCtX2a7+PXBc0LBPlH93ypSgj0LU1ejMgjrB0gcfd6bJ7LN/UGNAAy3B7/Y785sA==
   dependencies:
-    "@typescript-eslint/scope-manager" "7.8.0"
-    "@typescript-eslint/types" "7.8.0"
-    "@typescript-eslint/typescript-estree" "7.8.0"
-    "@typescript-eslint/visitor-keys" "7.8.0"
+    "@typescript-eslint/scope-manager" "8.0.0-alpha.10"
+    "@typescript-eslint/types" "8.0.0-alpha.10"
+    "@typescript-eslint/typescript-estree" "8.0.0-alpha.10"
+    "@typescript-eslint/visitor-keys" "8.0.0-alpha.10"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz#bb19096d11ec6b87fb6640d921df19b813e02047"
-  integrity sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==
+"@typescript-eslint/scope-manager@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.0.0-alpha.10.tgz#25506ce51ab64e99f2bc0b7d3f0f82656e14a794"
+  integrity sha512-SUU0yhqehjuWilWRJWfhcxf6eMKVrZ3bpV2w6NF6GmBHR3FJo6oWZYLVXP04s6//INxpC2ynvKSglo4LRzWVTw==
   dependencies:
-    "@typescript-eslint/types" "7.8.0"
-    "@typescript-eslint/visitor-keys" "7.8.0"
+    "@typescript-eslint/types" "8.0.0-alpha.10"
+    "@typescript-eslint/visitor-keys" "8.0.0-alpha.10"
 
-"@typescript-eslint/type-utils@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz#9de166f182a6e4d1c5da76e94880e91831e3e26f"
-  integrity sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==
+"@typescript-eslint/type-utils@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.0.0-alpha.10.tgz#d27f0fdd81450380887b3a07297440ba3588a70e"
+  integrity sha512-6aTcbnDZWKgKr3gquECJSFyvXWLSKtUHrk2ZXDP4DEzmzTDjrkY7tIQpqv4SczPQJ+3/aky3ArPhtnQYJbAMzg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "7.8.0"
-    "@typescript-eslint/utils" "7.8.0"
+    "@typescript-eslint/typescript-estree" "8.0.0-alpha.10"
+    "@typescript-eslint/utils" "8.0.0-alpha.10"
     debug "^4.3.4"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.8.0.tgz#1fd2577b3ad883b769546e2d1ef379f929a7091d"
-  integrity sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==
+"@typescript-eslint/types@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.0.0-alpha.10.tgz#89be400c6a1751fe86f5917ed8087ec100e002da"
+  integrity sha512-prbN+b/I4yH6H43WmyenMz8K5e34Hs73BQuWXR4wwij3Cg2xNGLPcpjr2cKWKlH4dZQPTz6R6oBeC+LfaoKi8g==
 
-"@typescript-eslint/typescript-estree@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz#b028a9226860b66e623c1ee55cc2464b95d2987c"
-  integrity sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==
+"@typescript-eslint/typescript-estree@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.0-alpha.10.tgz#e850056d2a5029688269a60206dec3bbd7beb953"
+  integrity sha512-8wBUIhu6IRa440hv5/0ZEnb5JLp/UsfzIXYKRwICUOMTVj2ss1n+w3m1CtT5ghVWy5Z05qkscsbhlKFmZguU8w==
   dependencies:
-    "@typescript-eslint/types" "7.8.0"
-    "@typescript-eslint/visitor-keys" "7.8.0"
+    "@typescript-eslint/types" "8.0.0-alpha.10"
+    "@typescript-eslint/visitor-keys" "8.0.0-alpha.10"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -424,32 +449,27 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.8.0.tgz#57a79f9c0c0740ead2f622e444cfaeeb9fd047cd"
-  integrity sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==
+"@typescript-eslint/utils@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.0.0-alpha.10.tgz#b77f743227353bfa493e95409c0e079044c9258e"
+  integrity sha512-WZyNf49CuvaW/whz/B8XjYwXE/wm/EQAXq+Vqgp6BrJb8SC3bMCwGuUxReNDN1o+dNdOC96ofVSvqa8NUQ65Jg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.15"
     "@types/semver" "^7.5.8"
-    "@typescript-eslint/scope-manager" "7.8.0"
-    "@typescript-eslint/types" "7.8.0"
-    "@typescript-eslint/typescript-estree" "7.8.0"
+    "@typescript-eslint/scope-manager" "8.0.0-alpha.10"
+    "@typescript-eslint/types" "8.0.0-alpha.10"
+    "@typescript-eslint/typescript-estree" "8.0.0-alpha.10"
     semver "^7.6.0"
 
-"@typescript-eslint/visitor-keys@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz#7285aab991da8bee411a42edbd5db760d22fdd91"
-  integrity sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==
+"@typescript-eslint/visitor-keys@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.0-alpha.10.tgz#d0a9250c69cc2f73c7f423c36183d222a329e260"
+  integrity sha512-UohTNnT7S29uQgXsGZY489nWmoBBSJucNdRvog62R1QX9pQQb2pKVV1kHepUxoY2vd+M4tb9SQwZQ3gPNgqQ6w==
   dependencies:
-    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/types" "8.0.0-alpha.10"
     eslint-visitor-keys "^3.4.3"
 
-"@ungap/structured-clone@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
-
 "@xmldom/xmldom@^0.8.8":
   version "0.8.10"
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
@@ -465,7 +485,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.9.0:
+acorn@^8.11.3:
   version "8.11.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
@@ -554,14 +574,14 @@ app-builder-bin@4.0.0:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
   integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
 
-app-builder-lib@25.0.0-alpha.6:
-  version "25.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.0.0-alpha.6.tgz#3edb49843b249a1dd52b32a80f9787677bc5a32b"
-  integrity sha512-kXveR7MFTJXBwb2xB2geKWeWP+YGcJ3IzWRgTEV96zwyo4IxzE5xRXcndSQQglmlzw/VoM5Mx322E9ErYbMCVg==
+app-builder-lib@25.0.0-alpha.8:
+  version "25.0.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.0.0-alpha.8.tgz#e8065005b0b5d43f22153ac72101f71bf4e1022b"
+  integrity sha512-d/pcaTcDv3gfdl9AGGP/DKvc+A+TdJmG15f+vqPeEGKOoqLE0ukReaEevXAtH3wOOs5CqgX6QgNPdszeeqFn3Q==
   dependencies:
     "@develar/schema-utils" "~2.6.5"
     "@electron/notarize" "2.3.0"
-    "@electron/osx-sign" "1.0.5"
+    "@electron/osx-sign" "1.3.0"
     "@electron/rebuild" "3.6.0"
     "@electron/universal" "2.0.1"
     "@malept/flatpak-bundler" "^0.4.0"
@@ -573,7 +593,7 @@ app-builder-lib@25.0.0-alpha.6:
     chromium-pickle-js "^0.2.0"
     debug "^4.3.4"
     ejs "^3.1.8"
-    electron-publish "25.0.0-alpha.6"
+    electron-publish "25.0.0-alpha.7"
     form-data "^4.0.0"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
@@ -582,7 +602,7 @@ app-builder-lib@25.0.0-alpha.6:
     js-yaml "^4.1.0"
     lazy-val "^1.0.5"
     minimatch "^5.1.1"
-    read-config-file "6.3.2"
+    read-config-file "6.4.0"
     sanitize-filename "^1.6.3"
     semver "^7.3.8"
     tar "^6.1.12"
@@ -718,7 +738,14 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  dependencies:
+    fill-range "^7.1.1"
+
+braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -743,10 +770,10 @@ buffer@^5.1.0, buffer@^5.5.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-builder-util-runtime@9.2.3:
-  version "9.2.3"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz#0a82c7aca8eadef46d67b353c638f052c206b83c"
-  integrity sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==
+builder-util-runtime@9.2.4:
+  version "9.2.4"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz#13cd1763da621e53458739a1e63f7fcba673c42a"
+  integrity sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==
   dependencies:
     debug "^4.3.4"
     sax "^1.2.4"
@@ -1007,6 +1034,14 @@ conf@^10.2.0:
     pkg-up "^3.1.0"
     semver "^7.3.5"
 
+config-file-ts@0.2.8-rc1:
+  version "0.2.8-rc1"
+  resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz#fb7fc6ccb2e313f69dbeb78f1db0b00038049de0"
+  integrity sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg==
+  dependencies:
+    glob "^10.3.12"
+    typescript "^5.4.3"
+
 config-file-ts@^0.2.4:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.6.tgz#b424ff74612fb37f626d6528f08f92ddf5d22027"
@@ -1055,13 +1090,20 @@ debounce-fn@^4.0.0:
   dependencies:
     mimic-fn "^3.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+debug@4, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.4:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
+  dependencies:
+    ms "2.1.2"
+
 decompress-response@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -1149,12 +1191,12 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-dmg-builder@25.0.0-alpha.6:
-  version "25.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.0.0-alpha.6.tgz#1a13008de0543c3080595534ab294cde2a5e57e8"
-  integrity sha512-GStVExwsuumGN6rPGJksA5bLN5n5QEQd5iQrGKyBSxuwR1+LWidFkM+anroXnANIyTwbppk2S7+808vHjT/Eyw==
+dmg-builder@25.0.0-alpha.8:
+  version "25.0.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.0.0-alpha.8.tgz#fe887023ffc9ce72dfd2472303a76ec008a156d2"
+  integrity sha512-1/Sfl1sQugHkHEobFafyx1HcmgkFj8pV7HFEK0NQ8bH5K2qsGvknjAeHjtYhV2sBoSNGod4P0SfbScS6p6h4eg==
   dependencies:
-    app-builder-lib "25.0.0-alpha.6"
+    app-builder-lib "25.0.0-alpha.8"
     builder-util "25.0.0-alpha.6"
     builder-util-runtime "9.2.5-alpha.2"
     fs-extra "^10.1.0"
@@ -1177,13 +1219,6 @@ dmg-license@^1.0.11:
     smart-buffer "^4.0.2"
     verror "^1.10.0"
 
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
 dot-prop@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
@@ -1191,11 +1226,23 @@ dot-prop@^6.0.1:
   dependencies:
     is-obj "^2.0.0"
 
+dotenv-expand@^11.0.6:
+  version "11.0.6"
+  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-11.0.6.tgz#f2c840fd924d7c77a94eff98f153331d876882d3"
+  integrity sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==
+  dependencies:
+    dotenv "^16.4.4"
+
 dotenv-expand@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
+dotenv@^16.4.4, dotenv@^16.4.5:
+  version "16.4.5"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
+  integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
+
 dotenv@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
@@ -1208,16 +1255,16 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-builder@25.0.0-alpha.6:
-  version "25.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.0.0-alpha.6.tgz#a72f96f7029539ac28f92ce5c83f872ba3b6e7c1"
-  integrity sha512-qXzzdID2W9hhx3TXddwXv1C5HsqjF6bKnftUtywAB/gtDwu+neifPZvnXDNHI4ZamRrZpJJH59esfkqkc2KNSQ==
+electron-builder@25.0.0-alpha.8:
+  version "25.0.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.0.0-alpha.8.tgz#7238623cf7a753d0da31f16daea8767d0ef6d572"
+  integrity sha512-nfrtTljEZackbhJE1BcK+RFXrPvrkrBo0TgR0gH2GxNhPiRTwj/S24K3zHbYj6vBaDVtnqlS6Mqm8tMUrRU4tA==
   dependencies:
-    app-builder-lib "25.0.0-alpha.6"
+    app-builder-lib "25.0.0-alpha.8"
     builder-util "25.0.0-alpha.6"
     builder-util-runtime "9.2.5-alpha.2"
     chalk "^4.1.2"
-    dmg-builder "25.0.0-alpha.6"
+    dmg-builder "25.0.0-alpha.8"
     fs-extra "^10.1.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
@@ -1226,14 +1273,14 @@ electron-builder@25.0.0-alpha.6:
     yargs "^17.6.2"
 
 electron-log@^5.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.1.2.tgz#fb40ad7f4ae694dd0e4c02c662d1a65c03e1243e"
-  integrity sha512-Cpg4hAZ27yM9wzE77c4TvgzxzavZ+dVltCczParXN+Vb3jocojCSAuSMCVOI9fhFuuOR+iuu3tZLX1cu0y0kgQ==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.1.5.tgz#70d5051fc5ab7669b2592f53f72034867269c96e"
+  integrity sha512-vuq10faUAxRbILgQx7yHoMObKZDEfj7hMSZrJPsVrDNeCpV/HN11dU7QuY4UDUe055pzBxhSCB3m0+6D3Aktjw==
 
-electron-publish@25.0.0-alpha.6:
-  version "25.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-25.0.0-alpha.6.tgz#8af3cb6e2435c00b8c71de43c330483808df5924"
-  integrity sha512-Hin+6j+jiXBc5g6Wlv9JB5Xu7MADBHxZAndt4WE7luCw7b3+OJdQeDvD/uYiCLpiG8cc2NLxu4MyBSVu86MrJA==
+electron-publish@25.0.0-alpha.7:
+  version "25.0.0-alpha.7"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-25.0.0-alpha.7.tgz#3c1944c8890b22d5f674772bf16c5382da248861"
+  integrity sha512-d9R6Jnds3PjzBM4Wt3nRn9ramkbM3kBzt9a6WHQL4/09ByyZGZ1Cu9GS9atRCkH3tBJlOIotUYVhVO36lk3sAA==
   dependencies:
     "@types/fs-extra" "^9.0.11"
     builder-util "25.0.0-alpha.6"
@@ -1251,12 +1298,12 @@ electron-store@^8.2:
     conf "^10.2.0"
     type-fest "^2.17.0"
 
-electron-updater@^6.1:
-  version "6.1.8"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.1.8.tgz#17637bca165322f4e526b13c99165f43e6f697d8"
-  integrity sha512-hhOTfaFAd6wRHAfUaBhnAOYc+ymSGCWJLtFkw4xJqOvtpHmIdNHnXDV9m1MHC+A6q08Abx4Ykgyz/R5DGKNAMQ==
+electron-updater@^6.2:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.2.1.tgz#1c9adb9ba2a21a5dc50a8c434c45360d5e9fe6c9"
+  integrity sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q==
   dependencies:
-    builder-util-runtime "9.2.3"
+    builder-util-runtime "9.2.4"
     fs-extra "^10.1.0"
     js-yaml "^4.1.0"
     lazy-val "^1.0.5"
@@ -1266,9 +1313,9 @@ electron-updater@^6.1:
     tiny-typed-emitter "^2.1.0"
 
 electron@^30:
-  version "30.0.6"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-30.0.6.tgz#9ddea5f68396ecca88ad7c2c466a30fc9c16144b"
-  integrity sha512-PkhEPFdpYcTzjAO3gMHZ+map7g2+xCrMDedo/L1i0ir2BRXvAB93IkTJX497U6Srb/09r2cFt+k20VPNVCdw3Q==
+  version "30.0.9"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-30.0.9.tgz#b11400e4642a4b635e79244ba365f1d401ee60b5"
+  integrity sha512-ArxgdGHVu3o5uaP+Tqj8cJDvU03R6vrGrOqiMs7JXLnvQHMqXJIIxmFKQAIdJW8VoT3ac3hD21tA7cPO10RLow==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^20.9.0"
@@ -1330,54 +1377,55 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+eslint-scope@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.1.tgz#a9601e4b81a0b9171657c343fb13111688963cfc"
+  integrity sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8:
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
-  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+eslint-visitor-keys@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
+  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
+
+eslint@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.4.0.tgz#79150c3610ae606eb131f1d648d5f43b3d45f3cd"
+  integrity sha512-sjc7Y8cUD1IlwYcTS9qPSvGjAC8Ne9LctpxKKu3x/1IC9bnOg98Zy6GxEJUfr1NojMgVPlyANXYns8oE2c1TAA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.0"
-    "@humanwhocodes/config-array" "^0.11.14"
+    "@eslint/config-array" "^0.15.1"
+    "@eslint/eslintrc" "^3.1.0"
+    "@eslint/js" "9.4.0"
     "@humanwhocodes/module-importer" "^1.0.1"
+    "@humanwhocodes/retry" "^0.3.0"
     "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
     ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
-    doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
+    eslint-scope "^8.0.1"
+    eslint-visitor-keys "^4.0.0"
+    espree "^10.0.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^8.0.0"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
     ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
@@ -1387,14 +1435,14 @@ eslint@^8:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^9.6.0, espree@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+espree@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f"
+  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==
   dependencies:
-    acorn "^8.9.0"
+    acorn "^8.11.3"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
+    eslint-visitor-keys "^4.0.0"
 
 esquery@^1.4.2:
   version "1.5.0"
@@ -1491,12 +1539,12 @@ ffmpeg-static@^5.2:
     https-proxy-agent "^5.0.0"
     progress "^2.0.3"
 
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
   dependencies:
-    flat-cache "^3.0.4"
+    flat-cache "^4.0.0"
 
 filelist@^1.0.4:
   version "1.0.4"
@@ -1505,10 +1553,10 @@ filelist@^1.0.4:
   dependencies:
     minimatch "^5.0.1"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.0.1, fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -1527,14 +1575,13 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
   dependencies:
     flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
+    keyv "^4.5.4"
 
 flatted@^3.2.9:
   version "3.3.1"
@@ -1678,7 +1725,7 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@^10.3.10, glob@^10.3.7:
+glob@^10.3.10:
   version "10.3.12"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
   integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==
@@ -1689,6 +1736,17 @@ glob@^10.3.10, glob@^10.3.7:
     minipass "^7.0.4"
     path-scurry "^1.10.2"
 
+glob@^10.3.12, glob@^10.3.7:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
+  integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    path-scurry "^1.11.1"
+
 glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -1724,12 +1782,10 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
-globals@^13.19.0:
-  version "13.24.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
-  dependencies:
-    type-fest "^0.20.2"
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
 globalthis@^1.0.1:
   version "1.0.4"
@@ -2048,7 +2104,7 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-jackspeak@2.1.1, jackspeak@^2.3.6:
+jackspeak@2.1.1, jackspeak@^2.3.6, jackspeak@^3.1.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.1.1.tgz#2a42db4cfbb7e55433c28b6f75d8b796af9669cd"
   integrity sha512-juf9stUEwUaILepraGOWIJTLwg48bUnBmRqd2ln2Os1sW987zeoj/hzhbvRB95oMuS2ZTpjULmdwHNX4rzZIZw==
@@ -2114,7 +2170,7 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@^2.2.0:
+json5@^2.2.0, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -2135,7 +2191,7 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-keyv@^4.0.0, keyv@^4.5.3:
+keyv@^4.0.0, keyv@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
   integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
@@ -2255,11 +2311,11 @@ merge2@^1.3.0, merge2@^1.4.1:
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
+  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.52.0:
@@ -2376,10 +2432,10 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
-  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4, minipass@^7.1.0, minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
 minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
@@ -2526,17 +2582,17 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-onnxruntime-common@1.17.3:
-  version "1.17.3"
-  resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.17.3.tgz#aadc456477873a540ee3d611ae9cd4f3de7c43e5"
-  integrity sha512-IkbaDelNVX8cBfHFgsNADRIq2TlXMFWW+nG55mwWvQT4i0NZb32Jf35Pf6h9yjrnK78RjcnlNYaI37w394ovMw==
+onnxruntime-common@1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.18.0.tgz#b904dc6ff134e7f21a3eab702fac17538f59e116"
+  integrity sha512-lufrSzX6QdKrktAELG5x5VkBpapbCeS3dQwrXbN0eD9rHvU0yAWl7Ztju9FvgAKWvwd/teEKJNj3OwM6eTZh3Q==
 
-onnxruntime-node@^1.17:
-  version "1.17.3"
-  resolved "https://registry.yarnpkg.com/onnxruntime-node/-/onnxruntime-node-1.17.3.tgz#53b8b7ef68bf3834bba9d7be592e4c2d718d2018"
-  integrity sha512-NtbN1pfApTSEjVq46LrJ396aPP2Gjhy+oYZi5Bu1leDXAEvVap/BQ8CZELiLs7z0UnXy3xjJW23HiB4P3//FIw==
+onnxruntime-node@^1.18:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/onnxruntime-node/-/onnxruntime-node-1.18.0.tgz#ad3947365ca038ec3a16fa4c48972708ccd294e9"
+  integrity sha512-iTnFcxKpmywCatx8ov4GTbECe3tJk2Bp1OA2mWRJde78q+7tpPYBhKMnwhlaoKy9oKQcy4UoEuuhoy2PSD13ww==
   dependencies:
-    onnxruntime-common "1.17.3"
+    onnxruntime-common "1.18.0"
     tar "^7.0.1"
 
 optionator@^0.9.3:
@@ -2648,10 +2704,10 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-scurry@^1.10.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7"
-  integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==
+path-scurry@^1.10.2, path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
   dependencies:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
@@ -2706,9 +2762,9 @@ prettier-plugin-packagejson@^2:
     synckit "0.9.0"
 
 prettier@^3:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
-  integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.0.tgz#d173ea0524a691d4c0b1181752f2b46724328cdf"
+  integrity sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==
 
 progress@^2.0.3:
   version "2.0.3"
@@ -2770,6 +2826,18 @@ read-config-file@6.3.2:
     json5 "^2.2.0"
     lazy-val "^1.0.4"
 
+read-config-file@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.4.0.tgz#970542833216cccff6b1d83320495003dcf85a45"
+  integrity sha512-uB5QOBeF84PT61GlV11OTV4jUGHAO3iDEOP6v9ygxhG6Bs9PLg7WsjNT6mtIX2G+x8lJTr4ZWNeG6LDTKkNf2Q==
+  dependencies:
+    config-file-ts "0.2.8-rc1"
+    dotenv "^16.4.5"
+    dotenv-expand "^11.0.6"
+    js-yaml "^4.1.0"
+    json5 "^2.2.3"
+    lazy-val "^1.0.5"
+
 readable-stream@^3.0.2, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
@@ -2860,9 +2928,9 @@ rimraf@^3.0.2:
     glob "^7.1.3"
 
 rimraf@^5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf"
-  integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.7.tgz#27bddf202e7d89cb2e0381656380d1734a854a74"
+  integrity sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==
   dependencies:
     glob "^10.3.7"
 
@@ -2924,12 +2992,12 @@ semver@^6.2.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2:
+semver@^7.3.2, semver@^7.6.0:
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
   integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
 
-semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.6.0:
+semver@^7.3.5, semver@^7.3.8, semver@^7.5.3:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
@@ -3169,13 +3237,13 @@ tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2:
     yallist "^4.0.0"
 
 tar@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-7.0.1.tgz#8f6ccebcd91b69e9767a6fc4892799e8b0e606d5"
-  integrity sha512-IjMhdQMZFpKsHEQT3woZVxBtCQY+0wk3CVxdRkGXEgyGa0dNS/ehPvOMr2nmfC7x5Zj2N+l6yZUpmICjLGS35w==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-7.2.0.tgz#f03ae6ecd2e2bab880f2ef33450f502e761d7548"
+  integrity sha512-hctwP0Nb4AB60bj8WQgRYaMOuJYRAPMGiQUAotms5igN8ppfQM+IvjQ5HcKu1MaZh2Wy2KWVTe563Yj8dfc14w==
   dependencies:
     "@isaacs/fs-minipass" "^4.0.0"
     chownr "^3.0.0"
-    minipass "^5.0.0"
+    minipass "^7.1.0"
     minizlib "^3.0.1"
     mkdirp "^3.0.1"
     yallist "^5.0.0"
@@ -3251,11 +3319,6 @@ type-fest@^0.13.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
   integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
 
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
 type-fest@^2.17.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
@@ -3266,7 +3329,16 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript@^5, typescript@^5.3.3:
+typescript-eslint@8.0.0-alpha.10:
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.0.0-alpha.10.tgz#2172d41ab30c8447927c3823c5a549b9c09be89f"
+  integrity sha512-iMbN7boDtUmcSDor/J022+H4G018W3r3RSUUr7yoghMTmFuKVIkI89xJHDg82DBGYkA0xOoDNPBr7XfRFbEXKQ==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "8.0.0-alpha.10"
+    "@typescript-eslint/parser" "8.0.0-alpha.10"
+    "@typescript-eslint/utils" "8.0.0-alpha.10"
+
+typescript@^5, typescript@^5.3.3, typescript@^5.4.3:
   version "5.4.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
   integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==

docs/docs/.vitepress/sidebar.ts

@@ -163,6 +163,14 @@ export const sidebar = [
                         text: "From Authy",
                         link: "/auth/migration-guides/authy/",
                     },
+                    {
+                        text: "From Steam",
+                        link: "/auth/migration-guides/steam/",
+                    },
+                    {
+                        text: "From others",
+                        link: "/auth/migration-guides/import",
+                    },
                     {
                         text: "Exporting your data",
                         link: "/auth/migration-guides/export",

docs/docs/auth/migration-guides/import.md

@@ -0,0 +1,39 @@
+---
+title: Migrating from other providers
+description:
+    Guide for importing your existing 2FA tokens into Ente Auth from other
+    providers
+---
+
+# Migrating from other providers
+
+---
+
+Ente Auth natively supports imports from many 2FA providers. In addition to the
+providers specifically listed in the documentation, the supported providers are:
+
+-   2FAS Authenticator
+-   Aegis Authenticator
+-   Bitwarden
+-   Google Authenticator
+-   Ravio OTP
+-   LastPass
+
+Details as to how codes may be imported from these providers may be found within
+the app.
+
+> [!NOTE]
+>
+> Please note that this list may be out of sync, please see the app for the
+> latest set of supported providers.
+
+Ente Auth also supports imports from Auth's own encrypted exports and plain text
+files. Plain text files must be in the following format:
+
+`otpauth://totp/provider.com:you@email.com?secret=YOUR_SECRET`
+
+The codes can be seperated by a comma or a new line.
+
+So if your provider is not specifically listed, you might be still able to
+import from them by first converting the data from your old provider into these
+plaintext files and then importing those into Ente.

docs/docs/auth/migration-guides/index.md

@@ -7,4 +7,6 @@ description:
 # Migrating to/from Ente Auth
 
 -   [Migrating from Authy](authy/)
+-   [Importing codes from Steam](steam/)
+-   [Migrating from other apps](import)
 -   [Exporting your data out of Ente Auth](export)

docs/docs/auth/migration-guides/steam/index.md

@@ -0,0 +1,77 @@
+---
+title: Migrating from Steam Authenticator
+description: Guide for importing from Steam Authenticator to Ente Auth
+---
+
+# Migrating from Steam Authenticator
+
+> [!WARNING]
+>
+> Steam Authenticator code is only supported after auth-v3.0.3, check the app's
+> version number before migration.
+
+One way to migrate is to
+[use this tool by dyc3](https://github.com/dyc3/steamguard-cli/releases/latest)
+to simplify the process and skip directly to generating a qr code to Ente
+Authenticator.
+
+## Download/Install steamguard-cli
+
+### Windows
+
+1. Download `steamguard.exe` from the [releases page][releases].
+2. Place `steamguard.exe` in a folder of your choice. For this example, we will
+   use `%USERPROFILE%\Desktop`.
+3. Open Powershell or Command Prompt. The prompt should be at `%USERPROFILE%`
+   (eg. `C:\Users\<username>`).
+4. Use `cd` to change directory into the folder where you placed
+   `steamguard.exe`. For this example, it would be `cd Desktop`.
+5. You should now be able to run `steamguard.exe` by typing
+   `.\steamguard.exe --help` and pressing enter.
+
+### Linux
+
+#### Ubuntu/Debian
+
+1. Download the `.deb` from the [releases page][releases].
+2. Open a terminal and run this to install it:
+
+```bash
+sudo dpkg -i ./steamguard-cli_<version>_amd64.deb
+```
+
+#### Other Linux
+
+1. Download `steamguard` from the [releases page][releases]
+2. Make it executable, and move `steamguard` to `/usr/local/bin` or any other
+   directory in your `$PATH`.
+
+```bash
+chmod +x ./steamguard
+sudo mv ./steamguard /usr/local/bin
+```
+
+3. You should now be able to run `steamguard` by typing `steamguard --help` and
+   pressing enter.
+
+## Login to Steam account
+
+Set up a new account with steamguard-cli
+
+```bash
+steamguard setup # set up a new account with steamguard-cli
+```
+
+## Generate & importing QR codes
+
+steamguard-cli can then generate a QR code for your 2FA secret.
+
+```bash
+steamguard qr # print QR code for the first account in your maFiles
+steamguard -u <account name> qr # print QR code for a specific account
+```
+
+Open Ente Auth, press the '+' button, select `Scan a QR code`, and scan the qr
+code.
+
+You should now have your steam code inside Ente Auth

docs/docs/photos/faq/security-and-privacy.md

@@ -87,3 +87,13 @@ Yes, Ente Photos has undergone a thorough security audit conducted by Cure53, in
 collaboration with Symbolic Software. Cure53 is a prominent German cybersecurity
 firm, while Symbolic Software specializes in applied cryptography. Please find
 the full report here: https://ente.io/blog/cryptography-audit/
+
+## How can I delete my account?
+
+You can delete your account at any time by using the "Delete account" option in
+the settings. For security reasons, we request you to delete your account on
+your own instead of contacting support to ask them to delete your account.
+
+Note that both Ente photos and Ente auth data will be deleted when you delete
+your account (irrespective of which app you delete it from) since both photos
+and auth use the same underlying account.

docs/docs/self-hosting/faq/sharing.md

@@ -57,3 +57,48 @@ apps:
 (For more details, see
 [local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml)
 in the server's source code).
+
+## Dockerfile example
+
+Here is an example of a Dockerfile by @Dylanger on our community Discord. This
+runs a standalone self-hosted version of the public albums app in production
+mode.
+
+```Dockerfile
+FROM node:20-alpine as builder
+
+WORKDIR /app
+COPY . .
+
+ARG NEXT_PUBLIC_ENTE_ENDPOINT=https://your.ente.example.org
+ARG NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT=https://your.albums.example.org
+
+RUN yarn install && yarn build
+
+FROM node:20-alpine
+
+WORKDIR /app
+COPY --from=builder /app/apps/photos/out .
+
+RUN npm install -g serve
+
+ENV PORT=3000
+EXPOSE ${PORT}
+
+CMD serve -s . -l tcp://0.0.0.0:${PORT}
+```
+
+Note that this only runs the public albums app, but the same principle can be
+used to run both the normal Ente photos app and the public albums app. There is
+a slightly more involved example showing how to do this also provided by in a
+community contributed guide about
+[configuring external S3](/self-hosting/guides/external-s3).
+
+You will also want to tell museum about your custom shared albums endpoint so
+that it uses that instead of the default URL when creating share links. You can
+configure that in museum's `config.yaml`:
+
+```
+apps:
+    public-albums: https://your.albums.example.org
+```

docs/docs/self-hosting/guides/configuring-s3.md

@@ -78,3 +78,23 @@ To summarize:
 Set the S3 bucket `endpoint` in `credentials.yaml` to a `yourserverip:3200` or
 some such IP/hostname that accessible from both where you are running the Ente
 clients (e.g. the mobile app) and also from within the Docker compose cluster.
+
+### 403 Forbidden
+
+If museum (`2`) is able to make a network connection to your S3 bucket (`3`) but
+uploads are still failing, it could be a credentials or permissions issue. A
+telltale sign of this is that in the museum logs you can see `403 Forbidden`
+errors about it not able to find the size of a file even though the
+corresponding object exists in the S3 bucket.
+
+To fix these, you should ensure the following:
+
+1.  The bucket CORS rules do not allow museum to access these objects.
+
+    > For uploading files from the browser, you will need to currently set
+    > allowedOrigins to "\*", and allow the "X-Auth-Token", "X-Client-Package"
+    > headers configuration too.
+    > [Here is an example of a working configuration](https://github.com/ente-io/ente/discussions/1764#discussioncomment-9478204).
+
+2.  The credentials are not being picked up (you might be setting the correct
+    creds, but not in the place where museum picks them from).

docs/docs/self-hosting/guides/custom-server/index.md

@@ -37,7 +37,7 @@ endpoint:
 (Another
 [example](https://github.com/ente-io/ente/blob/main/cli/config.yaml.example))
 
-## Web appps and Photos desktop app
+## Web apps and Photos desktop app
 
 You will need to build the app from source and use the
 `NEXT_PUBLIC_ENTE_ENDPOINT` environment variable to tell it which server to

docs/docs/self-hosting/guides/external-s3.md

@@ -213,6 +213,8 @@ ENTE_INTERNAL_HARDCODED-OTT_LOCAL-DOMAIN-VALUE=123456
 # it can be changed later
 ENDPOINT=http://localhost:8080
 ALBUMS_ENDPOINT=http://localhost:8082
+# This is used to generate sharable URLs
+ENTE_APPS_PUBLIC-ALBUMS=http://localhost:8082
 ```
 
 ## 3. Run `docker-compose up`

docs/docs/self-hosting/index.md

@@ -41,7 +41,7 @@ NEXT_PUBLIC_ENTE_ENDPOINT=http://localhost:8080 yarn dev
 That's about it. If you open http://localhost:3000, you will be able to create
 an account on a Ente Photos web app running on your machine, and this web app
 will be connecting to the server running on your local machine at
-localhost:8080.
+`localhost:8080`.
 
 For the mobile apps, you don't even need to build, and can install normal Ente
 apps and configure them to use your

infra/staff/.env

@@ -0,0 +1,9 @@
+# This is a sample .env file. The env vars defined here can be used to configure
+# the app.
+#
+# For local development, create a new file named `.env.local` and add the
+# variables you need there instead of uncommenting them below.
+#
+# For documentation about the variables, see `src/vite-env.d.ts`.
+
+# VITE_ENTE_API_ORIGIN = http://localhost:8080

infra/staff/.eslintrc.cjs

@@ -3,20 +3,17 @@ module.exports = {
     root: true,
     extends: [
         "eslint:recommended",
-        "plugin:@typescript-eslint/eslint-recommended",
         "plugin:@typescript-eslint/strict-type-checked",
         "plugin:@typescript-eslint/stylistic-type-checked",
+        "plugin:react/recommended",
+        "plugin:react-hooks/recommended",
+        "plugin:react/jsx-runtime",
     ],
-    plugins: ["@typescript-eslint"],
+    plugins: ["@typescript-eslint", "react-refresh"],
+    parserOptions: { project: true },
     parser: "@typescript-eslint/parser",
-    parserOptions: {
-        project: true,
-    },
-    ignorePatterns: [".eslintrc.js", "app", "out", "dist"],
-    env: {
-        es2022: true,
-        node: true,
-    },
+    ignorePatterns: [".eslintrc.cjs", "vite.config.ts", "dist"],
+    settings: { react: { version: "18.2" } },
     rules: {
         /* Allow numbers to be used in template literals */
         "@typescript-eslint/restrict-template-expressions": [
@@ -32,5 +29,9 @@ module.exports = {
                 ignoreArrowShorthand: true,
             },
         ],
+        "react-refresh/only-export-components": [
+            "warn",
+            { allowConstantExport: true },
+        ],
     },
 };

infra/staff/.gitignore

@@ -0,0 +1,17 @@
+# Node
+node_modules/
+
+# macOS
+.DS_Store
+
+# Editors
+.vscode/
+
+# Local env files
+.env*.local
+
+# tsc
+*.tsbuildinfo
+
+# Vite
+dist

infra/staff/.prettierrc.json

@@ -0,0 +1,8 @@
+{
+    "tabWidth": 4,
+    "proseWrap": "always",
+    "plugins": [
+        "prettier-plugin-organize-imports",
+        "prettier-plugin-packagejson"
+    ]
+}

infra/staff/README.md

@@ -0,0 +1,19 @@
+## Staff dashboard
+
+Web app for staff members to help with support and other administration.
+
+### Development
+
+Use `yarn dev` to run a local dev server with hot reload.
+
+> [!TIP]
+>
+> See [web/docs/new.md](../../web/docs/new.md) for help in setting up your
+> editor to do the formatting and linting. You can also run the formatter and
+> linter manually using `yarn lint`, and `yarn lint-fix` to fix them. These
+> commands automatically run on every PR.
+
+### Deployment
+
+The app gets redeployed whenever a PR is merged into main. See
+[web/docs/deploy.md](../../web/docs/deploy.md) for more details.

infra/staff/package.json

@@ -0,0 +1,47 @@
+{
+    "name": "staff",
+    "version": "0.0.0",
+    "private": true,
+    "type": "module",
+    "scripts": {
+        "build": "tsc && vite build",
+        "dev": "vite",
+        "lint": "yarn prettier --check --log-level warn . && yarn eslint . && yarn tsc",
+        "lint-fix": "yarn prettier --write --log-level warn . && yarn eslint --fix . && yarn tsc",
+        "preview": "vite preview"
+    },
+    "dependencies": {
+        "@date-io/date-fns": "^3.0.0",
+        "@emotion/react": "^11.11.4",
+        "@emotion/styled": "^11.11.5",
+        "@mui/icons-material": "^5.16.0",
+        "@mui/lab": "^5.0.0-alpha.171",
+        "@mui/material": "^5.16.0",
+        "@mui/x-date-pickers": "^7.9.0",
+        "@types/react-datepicker": "^6.2.0",
+        "date-fns": "^3.6.0",
+        "react": "^18",
+        "react-datepicker": "^7.3.0",
+        "react-dom": "^18",
+        "react-toastify": "^10.0.5",
+        "zod": "^3"
+    },
+    "devDependencies": {
+        "@rollup/plugin-node-resolve": "^15.2.3",
+        "@types/react": "^18",
+        "@types/react-dom": "^18",
+        "@typescript-eslint/eslint-plugin": "^7",
+        "@typescript-eslint/parser": "^7",
+        "@vitejs/plugin-react": "^4.2",
+        "eslint": "^8",
+        "eslint-plugin-react": "^7.34",
+        "eslint-plugin-react-hooks": "^4.6",
+        "eslint-plugin-react-refresh": "^0.4.7",
+        "prettier": "^3",
+        "prettier-plugin-organize-imports": "^3.2",
+        "prettier-plugin-packagejson": "^2.5",
+        "typescript": "^5",
+        "vite": "^5.2"
+    },
+    "packageManager": "yarn@1.22.21"
+}

infra/staff/src/App.css

@@ -0,0 +1,306 @@
+.container {
+    position: relative; /* Ensure the parent is relatively positioned */
+    height: 100vh; /* Full viewport height */
+    width: 100vw; /* Full viewport width */
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.center-table {
+    display: table;
+}
+
+.input-form {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.horizontal-group {
+    position: absolute; /* Use absolute positioning */
+    top: 32px; /* 32px below the top of the page */
+    left: 32px; /* 32px from the leftmost edge of the page */
+    right: 32px;
+    display: flex;
+    align-items: center; /* Align items vertically centered */
+    gap: 20px; /* Adjust the gap between elements as needed */
+    background-color: #fafafa;
+    height: 104px;
+    width: 1375px;
+    border-radius: 10px;
+}
+
+.fetch-button-container button {
+    background-color: #00b33c;
+    color: white;
+    border: none;
+    width: 199px;
+    height: 56px;
+    margin-left: 20px;
+}
+
+.fetch-button-container button:hover {
+    background-color: #007c6c;
+}
+
+.link-text {
+    display: flex;
+    align-items: center;
+    padding: 0 16px; /* Add padding for better appearance */
+    text-decoration: none; /* Remove underline */
+    color: inherit; /* Inherit color from parent */
+    font-weight: bold; /* Make the text bold */
+    font-size: 40px;
+}
+
+.text-field-token {
+    margin-left: 70px !important; /* Adjust margin for Token field */
+}
+
+.text-field-email {
+    margin-left: 20px !important; /* Adjust margin for Email field */
+}
+.duckie-container {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+}
+.center-content {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100vh; /* Adjust as necessary */
+    position: relative;
+}
+
+.error-message {
+    color: red;
+    font-size: 1.5em;
+}
+
+.duckie-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.container {
+    position: relative; /* Ensure the parent is relatively positioned */
+    height: 100vh; /* Full viewport height */
+    width: 100vw; /* Full viewport width */
+    display: flex;
+    flex-direction: column; /* Add this */
+    justify-content: center; /* Center vertically */
+    align-items: center; /* Center horizontally */
+}
+
+.input-form {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    z-index: 1; /* Ensure form is on top */
+}
+
+.horizontal-group {
+    display: flex;
+    align-items: center;
+    gap: 20px; /* Adjust the gap between elements as needed */
+    background-color: #fafafa;
+    padding: 20px; /* Add padding around content */
+    border-radius: 10px;
+}
+
+.fetch-button-container button {
+    background-color: #00b33c;
+    color: white;
+    border: none;
+    width: 199px;
+    height: 56px;
+}
+
+.fetch-button-container button:hover {
+    background-color: #007c6c;
+}
+
+.link-text {
+    display: flex;
+    align-items: center;
+    padding: 0 16px; /* Add padding for better appearance */
+    text-decoration: none; /* Remove underline */
+    color: inherit; /* Inherit color from parent */
+    font-weight: bold; /* Make the text bold */
+    font-size: 40px;
+}
+
+.text-field-token {
+    margin-left: 70px !important; /* Adjust margin for Token field */
+}
+
+.text-field-email {
+    margin-left: 50px !important; /* Adjust margin for Email field */
+}
+
+.center-content {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+}
+
+.duckie-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+/* Example CSS to maintain tabs fixed position */
+.tabs-container {
+    position: sticky;
+    top: 20px; /* Adjust as needed */
+    z-index: 1000; /* Ensure tabs are above other content */
+}
+.container {
+    position: relative; /* Ensure the parent is relatively positioned */
+    height: 100vh; /* Full viewport height */
+    width: 100vw; /* Full viewport width */
+    display: flex;
+    flex-direction: column; /* Ensure children stack vertically */
+    justify-content: center; /* Center vertically */
+    align-items: center; /* Center horizontally */
+}
+
+.input-form {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    z-index: 1; /* Ensure form is on top */
+    margin-bottom: 20px; /* Add space between form and tabs */
+}
+
+.horizontal-group {
+    display: flex;
+    align-items: center;
+    gap: 20px; /* Adjust the gap between elements as needed */
+    background-color: #fafafa;
+    padding: 20px; /* Add padding around content */
+    border-radius: 10px;
+}
+
+.fetch-button-container button {
+    background-color: #00b33c;
+    color: white;
+    border: none;
+    width: 199px;
+    height: 56px;
+}
+
+.fetch-button-container button:hover {
+    background-color: #007c6c;
+}
+
+.link-text {
+    display: flex;
+    align-items: center;
+    padding: 0 16px; /* Add padding for better appearance */
+    text-decoration: none; /* Remove underline */
+    color: inherit; /* Inherit color from parent */
+    font-weight: bold; /* Make the text bold */
+    font-size: 40px;
+}
+
+.text-field-token {
+    margin-left: 70px !important; /* Adjust margin for Token field */
+}
+
+.text-field-email {
+    margin-left: 50px !important; /* Adjust margin for Email field */
+}
+
+.center-content {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+}
+
+.duckie-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.tabs-container {
+    position: sticky; /* Make the tabs sticky */
+    top: 0; /* Stick to the top of the viewport */
+    z-index: 1000; /* Ensure tabs are above other content */
+    background-color: #fafafa; /* Optional: Add background color to tabs */
+    padding: 10px 20px; /* Optional: Add padding for better appearance */
+    border-bottom: 1px solid #ccc; /* Optional: Add bottom border */
+}
+.dialog-popup-container {
+    /* Styles for the overlay/background */
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5); /* Semi-transparent black */
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.dialog-popup {
+    background-color: white;
+    padding: 20px;
+    border-radius: 5px;
+    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
+}
+
+.dialog-popup-header h2 {
+    margin-bottom: 20px; /* Add space between heading and fields */
+}
+
+.dialog-popup-field {
+    margin-bottom: 15px;
+}
+
+.dialog-popup-field label {
+    display: block;
+    margin-bottom: 5px;
+    font-weight: bold;
+}
+
+.dialog-popup-field input {
+    width: 100%;
+    padding: 8px;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+}
+
+.submit-button {
+    background-color: #4caf50; /* Green */
+    color: white;
+    padding: 10px 15px;
+    border: none;
+    border-radius: 3px;
+    cursor: pointer;
+}
+
+/* Specific styles for each field to match the image */
+.name-field input,
+.shortname-field input,
+.code-field input {
+    width: calc(100% - 100px); /* Adjust as needed */
+}
+
+.active-field input {
+    width: 50px;
+}

infra/staff/src/App.tsx

@@ -0,0 +1,323 @@
+import Box from "@mui/material/Box";
+import Button from "@mui/material/Button";
+import CircularProgress from "@mui/material/CircularProgress";
+import Tab from "@mui/material/Tab";
+import Tabs from "@mui/material/Tabs";
+import TextField from "@mui/material/TextField";
+import * as React from "react";
+import { useEffect, useState } from "react";
+import "./App.css";
+import type { UserData } from "./components/UserComponent";
+import UserComponent from "./components/UserComponent";
+import duckieimage from "./components/duckie.png";
+import { apiOrigin } from "./services/support";
+
+// Define and export email and token variables and their setter functions
+export let email = "";
+export let token = "";
+
+export const setEmail = (newEmail: string) => {
+    email = newEmail;
+};
+
+export const setToken = (newToken: string) => {
+    token = newToken;
+};
+
+export const getEmail = () => email;
+export const getToken = () => token;
+
+interface User {
+    ID: string;
+    email: string;
+    creationTime: number;
+}
+
+interface Subscription {
+    productID: string;
+    paymentProvider: string;
+    expiryTime: number;
+    storage: number;
+}
+
+interface Security {
+    isEmailMFAEnabled: boolean;
+    isTwoFactorEnabled: boolean;
+    passkeys: string; // Replace with actual passkey value if available
+}
+
+interface UserResponse {
+    user: User;
+    subscription: Subscription;
+    details?: {
+        usage?: number;
+        storageBonus?: number;
+        profileData: Security;
+    };
+}
+
+const App: React.FC = () => {
+    const [localEmail, setLocalEmail] = useState<string>(getEmail());
+    const [localToken, setLocalToken] = useState<string>(getToken());
+    const [loading, setLoading] = useState<boolean>(false);
+    const [error, setError] = useState<string>("");
+    const [fetchSuccess, setFetchSuccess] = useState<boolean>(false);
+    const [tabValue, setTabValue] = useState<number>(0);
+    const [userData, setUserData] = useState<UserData | null>(null);
+
+    useEffect(() => {
+        const storedToken = localStorage.getItem("token");
+        if (storedToken) {
+            setToken(storedToken);
+            setLocalToken(storedToken);
+        }
+    }, []);
+
+    useEffect(() => {
+        if (localToken) {
+            setToken(localToken);
+            localStorage.setItem("token", localToken);
+        } else {
+            localStorage.removeItem("token");
+        }
+    }, [localToken]);
+
+    useEffect(() => {
+        if (localEmail) {
+            setEmail(localEmail);
+            localStorage.setItem("email", localEmail);
+        } else {
+            localStorage.removeItem("email");
+        }
+    }, [localEmail]);
+
+    const fetchData = async () => {
+        setLoading(true);
+        setError("");
+        setFetchSuccess(false);
+        const startTime = Date.now();
+        try {
+            const encodedEmail = encodeURIComponent(localEmail);
+            const encodedToken = encodeURIComponent(localToken);
+            const url = `${apiOrigin}/admin/user?email=${encodedEmail}&token=${encodedToken}`;
+            console.log(`Fetching data from URL: ${url}`);
+            const response = await fetch(url);
+            if (!response.ok) {
+                throw new Error("Network response was not ok");
+            }
+            const userDataResponse: UserResponse =
+                (await response.json()) as UserResponse;
+            console.log("API Response:", userDataResponse);
+
+            const extractedUserData: UserData = {
+                User: {
+                    "User ID": userDataResponse.user.ID || "None",
+                    Email: userDataResponse.user.email || "None",
+                    "Creation time":
+                        new Date(
+                            userDataResponse.user.creationTime / 1000,
+                        ).toLocaleString() || "None",
+                },
+                Storage: {
+                    Total: userDataResponse.subscription.storage
+                        ? userDataResponse.subscription.storage >= 1024 ** 3
+                            ? `${(userDataResponse.subscription.storage / 1024 ** 3).toFixed(2)} GB`
+                            : `${(userDataResponse.subscription.storage / 1024 ** 2).toFixed(2)} MB`
+                        : "None",
+                    Consumed:
+                        userDataResponse.details?.usage !== undefined
+                            ? userDataResponse.details.usage >= 1024 ** 3
+                                ? `${(userDataResponse.details.usage / 1024 ** 3).toFixed(2)} GB`
+                                : `${(userDataResponse.details.usage / 1024 ** 2).toFixed(2)} MB`
+                            : "None",
+                    Bonus:
+                        userDataResponse.details?.storageBonus !== undefined
+                            ? userDataResponse.details.storageBonus >= 1024 ** 3
+                                ? `${(userDataResponse.details.storageBonus / 1024 ** 3).toFixed(2)} GB`
+                                : `${(userDataResponse.details.storageBonus / 1024 ** 2).toFixed(2)} MB`
+                            : "None",
+                },
+                Subscription: {
+                    "Product ID":
+                        userDataResponse.subscription.productID || "None",
+                    Provider:
+                        userDataResponse.subscription.paymentProvider || "None",
+                    "Expiry time":
+                        new Date(
+                            userDataResponse.subscription.expiryTime / 1000,
+                        ).toLocaleString() || "None",
+                },
+                Security: {
+                    "Email MFA": userDataResponse.details?.profileData
+                        .isEmailMFAEnabled
+                        ? "Enabled"
+                        : "Disabled",
+                    "Two factor 2FA": userDataResponse.details?.profileData
+                        .isTwoFactorEnabled
+                        ? "Enabled"
+                        : "Disabled",
+                    Passkeys: "None", // Replace with actual passkey value if available
+                },
+            };
+
+            const elapsedTime = Date.now() - startTime;
+            const delay = Math.max(3000 - elapsedTime, 0);
+            setTimeout(() => {
+                setLoading(false);
+                setFetchSuccess(true);
+                setUserData(extractedUserData);
+            }, delay);
+        } catch (error) {
+            console.error("Error fetching data:", error);
+            const elapsedTime = Date.now() - startTime;
+            const delay = Math.max(3000 - elapsedTime, 0);
+            setTimeout(() => {
+                setLoading(false);
+                setError("Invalid token or email id");
+            }, delay);
+        }
+    };
+
+    const handleKeyPress = (event: React.KeyboardEvent<HTMLFormElement>) => {
+        if (event.key === "Enter") {
+            event.preventDefault();
+            fetchData().catch((error: unknown) =>
+                console.error("Fetch data error:", error),
+            );
+        }
+    };
+
+    const handleTabChange = (
+        _event: React.SyntheticEvent,
+        newValue: number,
+    ) => {
+        setTabValue(newValue);
+    };
+
+    return (
+        <div className="container center-table">
+            <form className="input-form" onKeyPress={handleKeyPress}>
+                <div className="horizontal-group">
+                    <a
+                        href="https://staff.ente.sh"
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="link-text"
+                    >
+                        staff.ente.sh
+                    </a>
+
+                    <TextField
+                        label="Token"
+                        value={localToken}
+                        onChange={(e) => {
+                            setLocalToken(e.target.value);
+                            setToken(e.target.value);
+                        }}
+                        size="medium"
+                        className="text-field-token"
+                        style={{ width: "350px" }}
+                    />
+                    <TextField
+                        label="Email"
+                        value={localEmail}
+                        onChange={(e) => {
+                            setLocalEmail(e.target.value);
+                            setEmail(e.target.value);
+                        }}
+                        size="medium"
+                        className="text-field-email"
+                        style={{ width: "350px" }}
+                    />
+                    <div className="fetch-button-container">
+                        <Button
+                            variant="contained"
+                            onClick={() => {
+                                fetchData().catch((error: unknown) =>
+                                    console.error("Fetch data error:", error),
+                                );
+                            }}
+                            className="fetch-button"
+                            style={{
+                                padding: "0 16px",
+                            }}
+                        >
+                            FETCH
+                        </Button>
+                    </div>
+                </div>
+            </form>
+            <div className="content-container">
+                {loading ? (
+                    <CircularProgress sx={{ color: "black" }} />
+                ) : error ? (
+                    <div className="error-message">{error}</div>
+                ) : fetchSuccess ? (
+                    <>
+                        <Box
+                            sx={{
+                                width: "100%",
+                                maxWidth: "600px",
+                                bgcolor: "#FAFAFA",
+                                marginTop: "300px",
+                                borderRadius: "7px",
+                                position: "relative",
+                                zIndex: 1000,
+                            }}
+                        >
+                            <Tabs
+                                value={tabValue}
+                                onChange={handleTabChange}
+                                centered
+                                sx={{
+                                    "& .MuiTabs-indicator": {
+                                        backgroundColor: "#00B33C",
+                                        height: "5px",
+                                        borderRadius: "20px",
+                                    },
+                                    "& .MuiTab-root": {
+                                        textTransform: "none",
+                                    },
+                                    "& .Mui-selected": {
+                                        color: "black !important",
+                                    },
+                                    "& .MuiTab-root.Mui-selected": {
+                                        color: "black !important",
+                                    },
+                                }}
+                            >
+                                <Tab label="User" />
+                                <Tab label="Family" />
+                                <Tab label="Bonuses" />
+                            </Tabs>
+                        </Box>
+                        <Box
+                            sx={{
+                                width: "100%",
+                                maxWidth: "600px",
+                                mt: 4,
+                                minHeight: "400px",
+                            }}
+                        >
+                            {tabValue === 0 && (
+                                <UserComponent userData={userData} />
+                            )}
+                            {tabValue === 1 && <div>Family tab content</div>}
+                            {tabValue === 2 && <div>Bonuses tab content</div>}
+                        </Box>
+                    </>
+                ) : (
+                    <div className="duckie-container">
+                        <img
+                            src={duckieimage}
+                            alt="Duckie"
+                            className="duckie-image"
+                        />
+                    </div>
+                )}
+            </div>
+        </div>
+    );
+};
+
+export default App;

infra/staff/src/components/ChangeEmail.tsx

@@ -0,0 +1,192 @@
+import CloseIcon from "@mui/icons-material/Close";
+import {
+    Button,
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogTitle,
+    TextField,
+} from "@mui/material";
+import React, { useEffect, useState } from "react";
+import { getEmail, getToken } from "../App";
+import { apiOrigin } from "../services/support";
+interface ErrorResponse {
+    message: string;
+}
+
+interface ChangeEmailProps {
+    open: boolean;
+    onClose: () => void;
+}
+
+interface UserDataResponse {
+    subscription: {
+        userID: string;
+    } | null;
+}
+
+const ChangeEmail: React.FC<ChangeEmailProps> = ({ open, onClose }) => {
+    const [newEmail, setNewEmail] = useState<string>("");
+    const [userID, setUserID] = useState<string>("");
+
+    useEffect(() => {
+        const fetchUserID = async () => {
+            const token = getToken();
+            const email = getEmail();
+            setNewEmail(email); // Set initial email state
+
+            const encodedEmail = encodeURIComponent(email);
+            const encodedToken = encodeURIComponent(token);
+            const url = `${apiOrigin}/admin/user?email=${encodedEmail}&token=${encodedToken}`;
+
+            try {
+                const response = await fetch(url, {
+                    method: "GET",
+                    headers: {
+                        "Content-Type": "application/json",
+                        "X-AUTH-TOKEN": token,
+                    },
+                });
+
+                if (!response.ok) {
+                    throw new Error("Network response was not ok");
+                }
+
+                const data = (await response.json()) as UserDataResponse;
+                if (data.subscription) {
+                    setUserID(data.subscription.userID); // Update userID state
+                } else {
+                    throw new Error("Subscription data not found");
+                }
+            } catch (error) {
+                console.error("Error fetching user ID:", error);
+            }
+        };
+
+        if (open) {
+            fetchUserID().catch((error: unknown) =>
+                console.error("Error in fetchUserID:", error),
+            );
+        }
+    }, [open]);
+
+    const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        setNewEmail(event.target.value); // Update newEmail state on input change
+    };
+
+    const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
+        event.preventDefault();
+
+        const token = getToken();
+        const url = `${apiOrigin}/admin/user/change-email?token=${token}`;
+
+        const body = {
+            userID,
+            email: newEmail,
+        };
+
+        try {
+            const response = await fetch(url, {
+                method: "PUT",
+                headers: {
+                    "Content-Type": "application/json",
+                    "X-AUTH-TOKEN": token,
+                },
+                body: JSON.stringify(body),
+            });
+
+            if (!response.ok) {
+                let errorData;
+                try {
+                    errorData = (await response.json()) as ErrorResponse;
+                } catch (error) {
+                    console.error("Error parsing error response:", error);
+                }
+                throw new Error(
+                    errorData?.message ?? "Network response was not ok",
+                );
+            }
+
+            console.log("Email updated successfully");
+            onClose();
+        } catch (error) {
+            console.error("Error updating email:", error);
+        }
+    };
+    const handleSubmitSync: React.FormEventHandler<HTMLFormElement> = (
+        event,
+    ) => {
+        handleSubmit(event).catch((error: unknown) => {
+            console.error("Error in handleSubmit:", error);
+        });
+    };
+
+    return (
+        <Dialog
+            open={open}
+            onClose={onClose}
+            BackdropProps={{
+                style: {
+                    backdropFilter: "blur(5px)",
+                    backgroundColor: "rgba(255, 255, 255, 0.8)",
+                },
+            }}
+            PaperProps={{
+                style: {
+                    width: "444px",
+                    height: "300px",
+                },
+            }}
+        >
+            <DialogTitle style={{ marginBottom: "20px", marginTop: "20px" }}>
+                Change Email
+                <Button
+                    onClick={onClose}
+                    style={{ position: "absolute", right: 10, top: 10 }}
+                >
+                    <CloseIcon style={{ color: "black" }} />
+                </Button>
+            </DialogTitle>
+            <DialogContent>
+                <form onSubmit={handleSubmitSync}>
+                    <div style={{ marginBottom: "16px" }}>
+                        <label
+                            htmlFor="newEmail"
+                            style={{
+                                textAlign: "left",
+                                display: "block",
+                                marginBottom: "4px",
+                            }}
+                        >
+                            Email
+                        </label>
+                        <TextField
+                            id="newEmail"
+                            name="newEmail"
+                            value={newEmail}
+                            onChange={handleChange}
+                            fullWidth
+                        />
+                    </div>
+
+                    <DialogActions
+                        style={{ justifyContent: "center", marginTop: "40px" }}
+                    >
+                        <Button
+                            type="submit"
+                            variant="contained"
+                            style={{
+                                backgroundColor: "#00B33C",
+                                color: "white",
+                            }}
+                        >
+                            Change Email
+                        </Button>
+                    </DialogActions>
+                </form>
+            </DialogContent>
+        </Dialog>
+    );
+};
+
+export default ChangeEmail;

infra/staff/src/components/DeleteAccont.tsx

@@ -0,0 +1,100 @@
+import {
+    Button,
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogContentText,
+    DialogTitle,
+    Paper,
+} from "@mui/material";
+import React from "react";
+import { getEmail, getToken } from "../App"; // Import getEmail and getToken functions
+import { apiOrigin } from "../services/support";
+
+interface DeleteAccountProps {
+    open: boolean;
+    handleClose: () => void;
+}
+
+const DeleteAccount: React.FC<DeleteAccountProps> = ({ open, handleClose }) => {
+    const handleDelete = async () => {
+        try {
+            const encodedEmail = encodeURIComponent(getEmail());
+            console.log(encodedEmail);
+            const encodedToken = encodeURIComponent(getToken());
+            console.log(encodedToken);
+            const deleteUrl = `${apiOrigin}/admin/user/delete?email=${encodedEmail}&token=${encodedToken}`;
+            const response = await fetch(deleteUrl, { method: "DELETE" });
+            if (!response.ok) {
+                throw new Error("Failed to delete user account");
+            }
+            handleClose(); // Close dialog on successful delete
+            console.log("Account deleted successfully");
+        } catch (error) {
+            console.error("Error deleting user account:", error);
+        }
+    };
+
+    return (
+        <div>
+            <Dialog
+                open={open}
+                onClose={handleClose}
+                aria-labelledby="alert-dialog-title"
+                aria-describedby="alert-dialog-description"
+                PaperComponent={Paper}
+                sx={{
+                    width: "499px",
+                    height: "286px",
+                    margin: "auto",
+                    display: "flex",
+                    flexDirection: "column",
+                    alignItems: "center",
+                    justifyContent: "center",
+                }}
+                BackdropProps={{
+                    style: {
+                        backgroundColor: "rgba(255, 255, 255, 0.9)", // Semi-transparent backdrop
+                    },
+                }}
+            >
+                <DialogTitle id="alert-dialog-title">
+                    {"Delete Account?"}
+                </DialogTitle>
+                <DialogContent>
+                    <DialogContentText id="alert-dialog-description">
+                        Are you sure you want to delete the account?
+                    </DialogContentText>
+                </DialogContent>
+                <DialogActions sx={{ justifyContent: "center" }}>
+                    <Button
+                        onClick={handleClose}
+                        sx={{
+                            bgcolor: "white",
+                            color: "black",
+                            "&:hover": { bgcolor: "#FAFAFA" },
+                        }}
+                    >
+                        Cancel
+                    </Button>
+                    <Button
+                        onClick={() => {
+                            handleDelete().catch((error: unknown) =>
+                                console.error("Fetch data error:", error),
+                            );
+                        }}
+                        sx={{
+                            bgcolor: "#F4473D",
+                            color: "white",
+                            "&:hover": { bgcolor: "#E53935" },
+                        }}
+                    >
+                        Delete{" "}
+                    </Button>
+                </DialogActions>
+            </Dialog>
+        </div>
+    );
+};
+
+export default DeleteAccount;

infra/staff/src/components/Disable2FA.tsx

@@ -0,0 +1,156 @@
+import {
+    Button,
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogContentText,
+    DialogTitle,
+    Paper,
+} from "@mui/material";
+import React, { useState } from "react";
+import { getEmail, getToken } from "../App"; // Import getEmail and getToken functions
+import { apiOrigin } from "../services/support";
+
+interface UserData {
+    subscription?: {
+        userID: string;
+        // Add other properties as per your API response structure
+    };
+    // Add other properties as per your API response structure
+}
+
+interface Disable2FAProps {
+    open: boolean;
+    handleClose: () => void;
+    handleDisable2FA: () => void; // Callback to handle 2FA disablement
+}
+
+const Disable2FA: React.FC<Disable2FAProps> = ({
+    open,
+    handleClose,
+    handleDisable2FA,
+}) => {
+    const [loading, setLoading] = useState(false);
+
+    const handleDisable = async () => {
+        try {
+            setLoading(true);
+            const email = getEmail();
+            const token = getToken();
+
+            if (!email) {
+                throw new Error("Email not found");
+            }
+
+            if (!token) {
+                throw new Error("Token not found");
+            }
+
+            const encodedEmail = encodeURIComponent(email);
+            const encodedToken = encodeURIComponent(token);
+
+            // Fetch user data
+            const userUrl = `${apiOrigin}/admin/user?email=${encodedEmail}&token=${encodedToken}`;
+            const userResponse = await fetch(userUrl);
+            if (!userResponse.ok) {
+                throw new Error("Failed to fetch user data");
+            }
+            const userData = (await userResponse.json()) as UserData;
+            const userId = userData.subscription?.userID;
+
+            if (!userId) {
+                throw new Error("User ID not found");
+            }
+
+            // Disable 2FA
+            const disableUrl = `${apiOrigin}/admin/user/disable-2fa?token=${encodedToken}`;
+            const body = JSON.stringify({ userId });
+            const disableResponse = await fetch(disableUrl, {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: body,
+            });
+
+            if (!disableResponse.ok) {
+                const errorResponse = await disableResponse.text();
+                throw new Error(`Failed to disable 2FA: ${errorResponse}`);
+            }
+
+            handleDisable2FA(); // Notify parent component of successful disable
+            handleClose(); // Close dialog on successful disable
+            console.log("2FA disabled successfully");
+        } catch (error) {
+            console.error("Error disabling 2FA:", error);
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    const handleCancel = () => {
+        handleClose(); // Close dialog
+    };
+
+    return (
+        <div>
+            <Dialog
+                open={open}
+                onClose={handleClose}
+                aria-labelledby="alert-dialog-title"
+                aria-describedby="alert-dialog-description"
+                PaperComponent={Paper}
+                sx={{
+                    width: "499px",
+                    height: "286px",
+                    margin: "auto",
+                    display: "flex",
+                    flexDirection: "column",
+                    alignItems: "center",
+                    justifyContent: "center",
+                }}
+                BackdropProps={{
+                    style: {
+                        backgroundColor: "rgba(255, 255, 255, 0.9)", // Semi-transparent backdrop
+                    },
+                }}
+            >
+                <DialogTitle id="alert-dialog-title">
+                    {"Disable 2FA?"}
+                </DialogTitle>
+                <DialogContent>
+                    <DialogContentText id="alert-dialog-description">
+                        Are you sure you want to disable 2FA for this account?
+                    </DialogContentText>
+                </DialogContent>
+                <DialogActions sx={{ justifyContent: "center" }}>
+                    <Button
+                        onClick={handleCancel}
+                        sx={{
+                            bgcolor: "white",
+                            color: "black",
+                            "&:hover": { bgcolor: "#FAFAFA" },
+                        }}
+                    >
+                        Cancel
+                    </Button>
+                    <Button
+                        onClick={() => {
+                            handleDisable().catch((error: unknown) =>
+                                console.error(error),
+                            );
+                        }}
+                        sx={{
+                            bgcolor: "#F4473D",
+                            color: "white",
+                            "&:hover": { bgcolor: "#E53935" },
+                        }}
+                        disabled={loading}
+                    >
+                        {loading ? "Disabling..." : "Disable"}
+                    </Button>
+                </DialogActions>
+            </Dialog>
+        </div>
+    );
+};
+
+export default Disable2FA;

infra/staff/src/components/UpdateSubscription.tsx

@@ -0,0 +1,367 @@
+import CalendarTodayIcon from "@mui/icons-material/CalendarToday";
+import CloseIcon from "@mui/icons-material/Close";
+import Button from "@mui/material/Button";
+import Dialog from "@mui/material/Dialog";
+import DialogActions from "@mui/material/DialogActions";
+import DialogContent from "@mui/material/DialogContent";
+import DialogTitle from "@mui/material/DialogTitle";
+import Grid from "@mui/material/Grid";
+import InputAdornment from "@mui/material/InputAdornment";
+import MenuItem from "@mui/material/MenuItem";
+import Select, { type SelectChangeEvent } from "@mui/material/Select";
+import TextField from "@mui/material/TextField";
+import React, { useEffect, useState } from "react";
+import DatePicker from "react-datepicker";
+import "react-datepicker/dist/react-datepicker.css";
+import { getEmail, getToken } from "../App";
+import { apiOrigin } from "../services/support";
+interface Subscription {
+    productID: string;
+    paymentProvider: string;
+    storage: number;
+    originalTransactionID: string;
+    expiryTime: number;
+    userID: string;
+}
+
+interface UserDataResponse {
+    subscription: Subscription | null;
+}
+
+interface UpdateSubscriptionProps {
+    open: boolean;
+    onClose: () => void;
+}
+
+interface FormValues {
+    productId: string;
+    provider: string;
+    storage: number;
+    transactionId: string;
+    expiryTime: string | Date | null;
+    userId: string;
+}
+
+const UpdateSubscription: React.FC<UpdateSubscriptionProps> = ({
+    open,
+    onClose,
+}) => {
+    const [values, setValues] = useState<FormValues>({
+        productId: "",
+        provider: "",
+        storage: 0,
+        transactionId: "",
+        expiryTime: "",
+        userId: "",
+    });
+
+    const [isDatePickerOpen, setIsDatePickerOpen] = useState(false);
+
+    useEffect(() => {
+        const fetchData = async () => {
+            try {
+                const email = getEmail();
+                const token = getToken();
+                const encodedEmail = encodeURIComponent(email);
+                const encodedToken = encodeURIComponent(token);
+                const url = `${apiOrigin}/admin/user?email=${encodedEmail}&token=${encodedToken}`;
+
+                const response = await fetch(url);
+                if (!response.ok) {
+                    throw new Error("Network response was not ok");
+                }
+                const userDataResponse =
+                    (await response.json()) as UserDataResponse;
+
+                if (!userDataResponse.subscription) {
+                    throw new Error("Subscription data not found");
+                }
+
+                const expiryTime = new Date(
+                    userDataResponse.subscription.expiryTime / 1000,
+                );
+
+                setValues({
+                    productId: userDataResponse.subscription.productID || "",
+                    provider:
+                        userDataResponse.subscription.paymentProvider || "",
+                    storage:
+                        userDataResponse.subscription.storage /
+                            (1024 * 1024 * 1024) || 0,
+                    transactionId:
+                        userDataResponse.subscription.originalTransactionID ||
+                        "",
+                    expiryTime: expiryTime,
+                    userId: userDataResponse.subscription.userID || "",
+                });
+            } catch (error) {
+                console.error("Error fetching data:", error);
+            }
+        };
+
+        fetchData().catch((error: unknown) => {
+            console.error("Unhandled promise rejection:", error);
+        });
+    }, []);
+
+    const handleCalendarClick = () => {
+        setIsDatePickerOpen(true);
+    };
+
+    const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        const { name, value } = event.target;
+        setValues({
+            ...values,
+            [name]: name === "storage" ? parseInt(value, 10) : value,
+        });
+    };
+
+    const handleChangeProvider = (event: SelectChangeEvent) => {
+        const { name, value } = event.target;
+
+        if (name) {
+            setValues({
+                ...values,
+                [name]: value,
+            });
+        }
+    };
+
+    const handleDatePickerChange = (date: Date | null) => {
+        setValues({
+            ...values,
+            expiryTime: date,
+        });
+        setIsDatePickerOpen(false);
+    };
+
+    const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+        event.preventDefault();
+        (async () => {
+            const token = getToken();
+            const url = `${apiOrigin}/admin/user/subscription`;
+
+            let expiryTime = null;
+            if (values.expiryTime instanceof Date) {
+                const utcExpiryTime = new Date(values.expiryTime);
+                expiryTime = utcExpiryTime.getTime() * 1000;
+            }
+
+            const body = {
+                userId: values.userId,
+                storage: values.storage * (1024 * 1024 * 1024),
+                expiryTime: expiryTime,
+                productId: values.productId,
+                paymentProvider: values.provider,
+                transactionId: values.transactionId,
+            };
+
+            try {
+                const response = await fetch(url, {
+                    method: "PUT",
+                    headers: {
+                        "Content-Type": "application/json",
+                        "X-AUTH-TOKEN": token,
+                    },
+                    body: JSON.stringify(body),
+                });
+
+                if (!response.ok) {
+                    throw new Error("Network response was not ok");
+                }
+                console.log("Subscription updated successfully");
+                onClose();
+            } catch (error) {
+                console.error("Error updating subscription:", error);
+            }
+        })().catch((error: unknown) => {
+            console.error("Unhandled promise rejection:", error);
+        });
+    };
+
+    return (
+        <Dialog
+            open={open}
+            onClose={onClose}
+            BackdropProps={{
+                style: {
+                    backdropFilter: "blur(5px)",
+                    backgroundColor: "rgba(255, 255, 255, 0.8)",
+                },
+            }}
+        >
+            <DialogTitle style={{ marginBottom: "20px", marginTop: "20px" }}>
+                Update Subscription
+                <Button
+                    onClick={onClose}
+                    style={{ position: "absolute", right: 10, top: 10 }}
+                >
+                    <CloseIcon style={{ color: "black" }} />
+                </Button>
+            </DialogTitle>
+            <DialogContent>
+                <form onSubmit={handleSubmit}>
+                    <Grid container spacing={4}>
+                        <Grid item xs={6}>
+                            <div style={{ marginBottom: "8px" }}>
+                                <label
+                                    htmlFor="productId"
+                                    style={{
+                                        textAlign: "left",
+                                        display: "block",
+                                        marginBottom: "4px",
+                                    }}
+                                >
+                                    Product ID
+                                </label>
+                                <TextField
+                                    id="productId"
+                                    name="productId"
+                                    value={values.productId}
+                                    onChange={handleChange}
+                                    fullWidth
+                                />
+                            </div>
+                        </Grid>
+                        <Grid item xs={6}>
+                            <div style={{ marginBottom: "8px" }}>
+                                <label
+                                    htmlFor="provider"
+                                    style={{
+                                        textAlign: "left",
+                                        display: "block",
+                                        marginBottom: "4px",
+                                    }}
+                                >
+                                    Provider
+                                </label>
+                                <Select
+                                    id="provider"
+                                    name="provider"
+                                    value={values.provider}
+                                    onChange={handleChangeProvider}
+                                    fullWidth
+                                    style={{ textAlign: "left" }}
+                                >
+                                    <MenuItem value="stripe">Stripe</MenuItem>
+                                    <MenuItem value="paypal">PayPal</MenuItem>
+                                    <MenuItem value="bitpay">BitPay</MenuItem>
+                                </Select>
+                            </div>
+                        </Grid>
+                        <Grid item xs={6}>
+                            <div style={{ marginBottom: "8px" }}>
+                                <label
+                                    htmlFor="storage"
+                                    style={{
+                                        textAlign: "left",
+                                        display: "block",
+                                        marginBottom: "4px",
+                                    }}
+                                >
+                                    Storage (GB)
+                                </label>
+                                <TextField
+                                    id="storage"
+                                    name="storage"
+                                    type="number"
+                                    value={values.storage}
+                                    onChange={handleChange}
+                                    fullWidth
+                                />
+                            </div>
+                        </Grid>
+                        <Grid item xs={6}>
+                            <div style={{ marginBottom: "8px" }}>
+                                <label
+                                    htmlFor="transactionId"
+                                    style={{
+                                        textAlign: "left",
+                                        display: "block",
+                                        marginBottom: "4px",
+                                    }}
+                                >
+                                    Transaction ID
+                                </label>
+                                <TextField
+                                    id="transactionId"
+                                    name="transactionId"
+                                    value={values.transactionId}
+                                    onChange={handleChange}
+                                    fullWidth
+                                />
+                            </div>
+                        </Grid>
+                        <Grid item xs={6}>
+                            <div style={{ marginBottom: "8px" }}>
+                                <label
+                                    htmlFor="expiryTime"
+                                    style={{
+                                        textAlign: "left",
+                                        display: "block",
+                                        marginBottom: "4px",
+                                    }}
+                                >
+                                    Expiry Time
+                                </label>
+                                <TextField
+                                    id="expiryTime"
+                                    name="expiryTime"
+                                    value={
+                                        values.expiryTime instanceof Date
+                                            ? values.expiryTime.toLocaleDateString(
+                                                  "en-GB",
+                                              )
+                                            : ""
+                                    }
+                                    onClick={handleCalendarClick}
+                                    InputProps={{
+                                        endAdornment: (
+                                            <InputAdornment position="end">
+                                                <CalendarTodayIcon />
+                                            </InputAdornment>
+                                        ),
+                                        readOnly: true,
+                                    }}
+                                    fullWidth
+                                />
+                                {isDatePickerOpen && (
+                                    <DatePicker
+                                        showYearDropdown
+                                        scrollableYearDropdown
+                                        yearDropdownItemNumber={15}
+                                        selected={
+                                            values.expiryTime instanceof Date
+                                                ? values.expiryTime
+                                                : null
+                                        }
+                                        onChange={handleDatePickerChange}
+                                        onClickOutside={() =>
+                                            setIsDatePickerOpen(false)
+                                        }
+                                        withPortal
+                                        inline
+                                    />
+                                )}
+                            </div>
+                        </Grid>
+                    </Grid>
+                    <DialogActions style={{ justifyContent: "center" }}>
+                        <Button
+                            type="submit"
+                            variant="contained"
+                            style={{
+                                backgroundColor: "#00B33C",
+                                color: "white",
+                            }}
+                        >
+                            Update
+                        </Button>
+                    </DialogActions>
+                </form>
+            </DialogContent>
+        </Dialog>
+    );
+};
+
+export default UpdateSubscription;

infra/staff/src/components/UserComponent.tsx

@@ -0,0 +1,335 @@
+import DeleteIcon from "@mui/icons-material/Delete";
+import EditIcon from "@mui/icons-material/Edit";
+import Box from "@mui/material/Box";
+import Grid from "@mui/material/Grid";
+import IconButton from "@mui/material/IconButton";
+import Paper from "@mui/material/Paper";
+import Switch from "@mui/material/Switch";
+import Table from "@mui/material/Table";
+import TableBody from "@mui/material/TableBody";
+import TableCell from "@mui/material/TableCell";
+import TableContainer from "@mui/material/TableContainer";
+import TableRow from "@mui/material/TableRow";
+import Typography from "@mui/material/Typography";
+import * as React from "react";
+import ChangeEmail from "./ChangeEmail";
+import DeleteAccount from "./DeleteAccont";
+import Disable2FA from "./Disable2FA";
+import UpdateSubscription from "./UpdateSubscription";
+
+export interface UserData {
+    User: Record<string, string>;
+    Storage: Record<string, string>;
+    Subscription: Record<string, string>;
+    Security: Record<string, string>;
+}
+
+interface UserComponentProps {
+    userData: UserData | null;
+}
+
+const UserComponent: React.FC<UserComponentProps> = ({ userData }) => {
+    const [deleteAccountOpen, setDeleteAccountOpen] = React.useState(false);
+    const [disable2FAOpen, setDisable2FAOpen] = React.useState(false);
+    const [twoFactorEnabled, setTwoFactorEnabled] = React.useState(false);
+    const [is2FADisabled, setIs2FADisabled] = React.useState(false);
+    const [updateSubscriptionOpen, setUpdateSubscriptionOpen] =
+        React.useState(false);
+    const [changeEmailOpen, setChangeEmailOpen] = React.useState(false); // State for ChangeEmail dialog
+
+    React.useEffect(() => {
+        if (userData?.Security["Two factor 2FA"] === "Enabled") {
+            setTwoFactorEnabled(true);
+        } else {
+            setTwoFactorEnabled(false);
+        }
+    }, [userData]);
+
+    const handleEditEmail = () => {
+        console.log("Edit Email clicked");
+        setChangeEmailOpen(true);
+    };
+
+    const handleCloseChangeEmail = () => {
+        setChangeEmailOpen(false); // Close ChangeEmail dialog
+    };
+
+    const handleDeleteAccountClick = () => {
+        setDeleteAccountOpen(true);
+    };
+
+    const handleCloseDeleteAccount = () => {
+        setDeleteAccountOpen(false);
+    };
+
+    const handleOpenDisable2FA = () => {
+        setDisable2FAOpen(true);
+    };
+
+    const handleCloseDisable2FA = () => {
+        setDisable2FAOpen(false);
+    };
+
+    const handleDisable2FA = () => {
+        setIs2FADisabled(true);
+    };
+
+    const handleCancelDisable2FA = () => {
+        setTwoFactorEnabled(true);
+        handleCloseDisable2FA();
+    };
+
+    const handleEditSubscription = () => {
+        setUpdateSubscriptionOpen(true);
+    };
+
+    const handleCloseUpdateSubscription = () => {
+        setUpdateSubscriptionOpen(false);
+    };
+
+    if (!userData) {
+        return null;
+    }
+
+    return (
+        <Grid container spacing={6} justifyContent="center">
+            {Object.entries(userData).map(([title, data]) => (
+                <Grid item xs={12} sm={10} md={6} key={title}>
+                    <TableContainer
+                        component={Paper}
+                        variant="outlined"
+                        sx={{
+                            minHeight: 300,
+                            display: "flex",
+                            flexDirection: "column",
+                            marginBottom: "20px",
+                            height: "100%",
+                            width: "100%",
+                            padding: "13px",
+                            "&:not(:last-child)": {
+                                marginBottom: "40px",
+                            },
+                        }}
+                    >
+                        <Box
+                            sx={{
+                                display: "flex",
+                                justifyContent: "space-between",
+                                alignItems: "center",
+                                padding: "16px",
+                                width: "100%",
+                            }}
+                        >
+                            <Typography
+                                variant="h6"
+                                component="div"
+                                sx={{
+                                    fontWeight: "bold",
+                                    textAlign: "center",
+                                    width: "100%",
+                                }}
+                            >
+                                {title}
+                            </Typography>
+                            {title === "User" && (
+                                <IconButton
+                                    edge="start"
+                                    aria-label="delete"
+                                    onClick={handleDeleteAccountClick}
+                                >
+                                    <DeleteIcon style={{ color: "" }} />
+                                </IconButton>
+                            )}
+                            {title === "Subscription" && (
+                                <IconButton
+                                    edge="end"
+                                    aria-label="edit"
+                                    onClick={handleEditSubscription}
+                                >
+                                    <EditIcon style={{ color: "black" }} />
+                                </IconButton>
+                            )}
+                        </Box>
+
+                        <Table
+                            sx={{
+                                width: "100%",
+                                tableLayout: "fixed",
+                                height: "100%",
+                                borderBottom: "none",
+                            }}
+                            aria-label={title}
+                        >
+                            <TableBody>
+                                {Object.entries(
+                                    data as Record<string, string>,
+                                ).map(([label, value], index) => (
+                                    <TableRow key={label}>
+                                        <TableCell
+                                            component="th"
+                                            scope="row"
+                                            style={{
+                                                padding: "16px",
+                                                borderBottom:
+                                                    index === 1 || index === 0
+                                                        ? "1px solid rgba(224, 224, 224, 1)"
+                                                        : "none",
+                                            }}
+                                        >
+                                            {label}
+                                        </TableCell>
+                                        <TableCell
+                                            align="right"
+                                            style={{
+                                                padding: "10px",
+                                                borderBottom:
+                                                    index === 1 || index === 0
+                                                        ? "1px solid rgba(224, 224, 224, 1)"
+                                                        : "none",
+                                            }}
+                                        >
+                                            {label === "Email" ? (
+                                                <Box
+                                                    sx={{
+                                                        display: "flex",
+                                                        alignItems: "center",
+                                                        justifyContent:
+                                                            "flex-end",
+                                                    }}
+                                                >
+                                                    <Typography>
+                                                        {value}
+                                                    </Typography>
+                                                    <IconButton
+                                                        edge="end"
+                                                        aria-label="edit-email"
+                                                        onClick={
+                                                            handleEditEmail
+                                                        }
+                                                    >
+                                                        <EditIcon
+                                                            style={{
+                                                                color: "black",
+                                                            }}
+                                                        />
+                                                    </IconButton>
+                                                </Box>
+                                            ) : typeof value === "string" ? (
+                                                label === "Two factor 2FA" ? (
+                                                    is2FADisabled ||
+                                                    value === "Disabled" ? (
+                                                        <Typography
+                                                            sx={{
+                                                                textAlign:
+                                                                    "center",
+                                                                width: "100%",
+                                                                paddingLeft:
+                                                                    "30px",
+                                                            }}
+                                                        >
+                                                            {value}
+                                                        </Typography>
+                                                    ) : (
+                                                        <Box
+                                                            sx={{
+                                                                display: "flex",
+                                                                alignItems:
+                                                                    "center",
+                                                                justifyContent:
+                                                                    "center",
+                                                                width: "100%",
+                                                            }}
+                                                        >
+                                                            <Typography>
+                                                                {value}
+                                                            </Typography>
+                                                            {value ===
+                                                                "Enabled" && (
+                                                                <Switch
+                                                                    checked={
+                                                                        twoFactorEnabled
+                                                                    }
+                                                                    onChange={(
+                                                                        e,
+                                                                    ) => {
+                                                                        const isChecked =
+                                                                            e
+                                                                                .target
+                                                                                .checked;
+                                                                        setTwoFactorEnabled(
+                                                                            isChecked,
+                                                                        );
+                                                                        if (
+                                                                            !isChecked
+                                                                        ) {
+                                                                            handleOpenDisable2FA();
+                                                                        }
+                                                                    }}
+                                                                    sx={{
+                                                                        "& .MuiSwitch-switchBase.Mui-checked":
+                                                                            {
+                                                                                color: "#00B33C",
+                                                                                "&:hover":
+                                                                                    {
+                                                                                        backgroundColor:
+                                                                                            "rgba(0, 179, 60, 0.08)",
+                                                                                    },
+                                                                            },
+                                                                        "& .MuiSwitch-switchBase.Mui-checked + .MuiSwitch-track":
+                                                                            {
+                                                                                backgroundColor:
+                                                                                    "#00B33C",
+                                                                            },
+                                                                    }}
+                                                                />
+                                                            )}
+                                                        </Box>
+                                                    )
+                                                ) : (
+                                                    <Typography>
+                                                        {value}
+                                                    </Typography>
+                                                )
+                                            ) : (
+                                                <Typography>
+                                                    {String(value)}
+                                                </Typography>
+                                            )}
+                                        </TableCell>
+                                    </TableRow>
+                                ))}
+                            </TableBody>
+                        </Table>
+                    </TableContainer>
+                </Grid>
+            ))}
+
+            {/* Render DeleteAccount dialog */}
+            <DeleteAccount
+                open={deleteAccountOpen}
+                handleClose={handleCloseDeleteAccount}
+            />
+
+            {/* Render Disable2FA dialog */}
+            <Disable2FA
+                open={disable2FAOpen}
+                handleClose={handleCancelDisable2FA}
+                handleDisable2FA={handleDisable2FA}
+            />
+
+            {/* Render UpdateSubscription dialog */}
+            <UpdateSubscription
+                open={updateSubscriptionOpen}
+                onClose={handleCloseUpdateSubscription}
+            />
+
+            {/* Render ChangeEmail dialog */}
+            <ChangeEmail
+                open={changeEmailOpen}
+                onClose={handleCloseChangeEmail}
+            />
+        </Grid>
+    );
+};
+
+export default UserComponent;

infra/staff/src/main.tsx

@@ -1,10 +1,10 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
-import { App } from "./App";
+import App from "./App";
 import "./styles/globals.css";
 
 const root = document.getElementById("root");
-if (!root) throw new Error("Could not load root element to render onto");
+if (!root) throw new Error("Could not load root element to qrender onto");
 
 ReactDOM.createRoot(root).render(
     <React.StrictMode>

infra/staff/src/services/support.ts

@@ -1,10 +1,11 @@
-import { object, type InferType } from "yup";
+import { z } from "zod";
 
-const apiOrigin = import.meta.env.VITE_ENTE_ENDPOINT ?? "https://api.ente.io";
+export const apiOrigin =
+    import.meta.env.VITE_ENTE_API_ORIGIN ?? "https://api.ente.io";
 
-const userDetailsSchema = object({});
+const UserDetails = z.object({}).passthrough();
 
-export type UserDetails = InferType<typeof userDetailsSchema>;
+export type UserDetails = z.infer<typeof UserDetails>;
 
 /** Fetch details of the user associated with the given {@link authToken}. */
 export const getUserDetails = async (
@@ -17,5 +18,5 @@ export const getUserDetails = async (
         },
     });
     if (!res.ok) throw new Error(`Failed to fetch ${url}: HTTP ${res.status}`);
-    return await userDetailsSchema.validate(await res.json());
+    return UserDetails.parse(await res.json());
 };