emailengine-app 2.68.1 → 2.70.0

package/translations/messages.pot

@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=ascii\n"
-"POT-Creation-Date: 2026-06-01 09:16+0000\n"
+"POT-Creation-Date: 2026-06-11 10:37+0000\n"
 
 #: views/error.hbs:4
-#: workers/api.js:7192
+#: workers/api.js:2940
 msgid "Something went wrong"
 msgstr ""
 
@@ -21,7 +21,7 @@ msgid "Dashboard"
 msgstr ""
 
 #: views/config/license.hbs:45
-#: lib/routes-ui.js:2509
+#: lib/ui-routes/oauth-config-routes.js:217
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
@@ -31,30 +31,6 @@ msgstr[1] ""
 msgid "Click <a href=\"%s\">here</a> to continue&mldr;"
 msgstr ""
 
-#: views/oauth-scope-error.hbs:2
-msgid "Insufficient Permissions"
-msgstr ""
-
-#: views/oauth-scope-error.hbs:8
-msgid ""
-"All requested permissions are required for this service to function "
-"properly. Some required permissions were not granted during sign-in."
-msgstr ""
-
-#: views/oauth-scope-error.hbs:12
-msgid "The following permissions were not granted:"
-msgstr ""
-
-#: views/oauth-scope-error.hbs:21
-msgid ""
-"Please try again and make sure all permission checkboxes are selected on "
-"the Google consent screen."
-msgstr ""
-
-#: views/oauth-scope-error.hbs:27
-msgid "Try Again"
-msgstr ""
-
 #: views/unsubscribe.hbs:3
 #: views/unsubscribe.hbs:62
 #: views/unsubscribe.hbs:85
@@ -126,12 +102,28 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: views/accounts/register/index.hbs:2
-msgid "Choose your email account provider"
+#: views/oauth-scope-error.hbs:2
+msgid "Insufficient Permissions"
 msgstr ""
 
-#: views/accounts/register/index.hbs:15
-msgid "Standard IMAP"
+#: views/oauth-scope-error.hbs:8
+msgid ""
+"All requested permissions are required for this service to function "
+"properly. Some required permissions were not granted during sign-in."
+msgstr ""
+
+#: views/oauth-scope-error.hbs:12
+msgid "The following permissions were not granted:"
+msgstr ""
+
+#: views/oauth-scope-error.hbs:21
+msgid ""
+"Please try again and make sure all permission checkboxes are selected on "
+"the Google consent screen."
+msgstr ""
+
+#: views/oauth-scope-error.hbs:27
+msgid "Try Again"
 msgstr ""
 
 #: views/accounts/register/imap-server.hbs:19
@@ -249,169 +241,157 @@ msgstr ""
 msgid "Request failed."
 msgstr ""
 
-#: lib/routes-ui.js:385
-#: lib/ui-routes/account-routes.js:60
-msgid "Delegated"
-msgstr ""
-
-#: lib/routes-ui.js:386
-#: lib/ui-routes/account-routes.js:61
-msgid "Using credentials from \"%s\""
-msgstr ""
-
-#: lib/routes-ui.js:436
-#: lib/ui-routes/account-routes.js:111
-msgid ""
-"Connection timed out. This usually occurs if you are behind a firewall or "
-"connecting to the wrong port."
-msgstr ""
-
-#: lib/routes-ui.js:439
-#: lib/ui-routes/account-routes.js:114
-msgid "The server unexpectedly closed the connection."
+#: views/accounts/register/index.hbs:2
+msgid "Choose your email account provider"
 msgstr ""
 
-#: lib/routes-ui.js:442
-#: lib/ui-routes/account-routes.js:117
-msgid ""
-"The server unexpectedly closed the connection. This usually happens when "
-"attempting to connect to a TLS port without TLS enabled."
+#: views/accounts/register/index.hbs:15
+msgid "Standard IMAP"
 msgstr ""
 
-#: lib/routes-ui.js:447
-#: lib/ui-routes/account-routes.js:122
+#: lib/autodetect-imap-settings.js:80
 msgid ""
-"The server refused the connection. This typically occurs if the server is "
-"not running, is overloaded, or you are connecting to the wrong host or port."
+"Microsoft has disabled password-based sign-ins (including app passwords) "
+"for Outlook.com, Hotmail.com, and Microsoft 365 email accounts. To "
+"continue, please use the \"Sign in with Microsoft\" button to securely "
+"connect your account."
 msgstr ""
 
-#: lib/routes-ui.js:574
-msgid "Invalid API key for OpenAI"
+#: lib/tools.js:956
+#: lib/ui-routes/unsubscribe-routes.js:28
+msgid "Invalid input"
 msgstr ""
 
-#: lib/routes-ui.js:2502
-msgid "Unknown"
+#: lib/tools.js:1723
+msgid "Signature validation failed"
 msgstr ""
 
-#: lib/routes-ui.js:2511
-msgid "Indefinite"
+#: lib/tools.js:1732
+#: lib/tools.js:1737
+msgid "Invalid or expired account setup URL"
 msgstr ""
 
-#: lib/routes-ui.js:5285
-#: lib/routes-ui.js:5320
-#: lib/routes-ui.js:5435
-#: lib/routes-ui.js:5482
-#: lib/routes-ui.js:5729
-#: lib/routes-ui.js:5765
-#: workers/api.js:2280
-#: workers/api.js:2608
-#: lib/ui-routes/account-routes.js:554
-#: lib/ui-routes/account-routes.js:590
-#: lib/ui-routes/account-routes.js:707
-#: lib/ui-routes/account-routes.js:754
-#: lib/ui-routes/account-routes.js:1003
-#: lib/ui-routes/account-routes.js:1039
+#: lib/ui-routes/account-routes.js:402
+#: lib/ui-routes/account-routes.js:437
+#: lib/ui-routes/account-routes.js:552
+#: lib/ui-routes/account-routes.js:599
+#: lib/ui-routes/account-routes.js:846
+#: lib/ui-routes/account-routes.js:882
+#: workers/api.js:2158
+#: workers/api.js:2486
 msgid "Email Account Setup"
 msgstr ""
 
-#: lib/routes-ui.js:5345
-#: lib/routes-ui.js:5378
-#: lib/routes-ui.js:8338
-#: lib/ui-routes/account-routes.js:615
-#: lib/ui-routes/account-routes.js:649
+#: lib/ui-routes/account-routes.js:462
+#: lib/ui-routes/account-routes.js:495
+#: lib/ui-routes/unsubscribe-routes.js:65
 msgid "Invalid request. Check your input and try again."
 msgstr ""
 
-#: lib/routes-ui.js:5538
-#: lib/routes-ui.js:5549
-#: lib/ui-routes/account-routes.js:811
-#: lib/ui-routes/account-routes.js:822
+#: lib/ui-routes/account-routes.js:592
+#: lib/ui-routes/account-routes.js:875
+msgid "Couldn't set up account. Try again."
+msgstr ""
+
+#: lib/ui-routes/account-routes.js:655
+#: lib/ui-routes/account-routes.js:666
 #: lib/ui-routes/admin-entities-routes.js:2020
 msgid "Server hostname was not found"
 msgstr ""
 
-#: lib/routes-ui.js:5541
-#: lib/routes-ui.js:5552
-#: lib/ui-routes/account-routes.js:814
-#: lib/ui-routes/account-routes.js:825
+#: lib/ui-routes/account-routes.js:658
+#: lib/ui-routes/account-routes.js:669
 #: lib/ui-routes/admin-entities-routes.js:2023
 msgid "Invalid username or password"
 msgstr ""
 
-#: lib/routes-ui.js:5555
-#: lib/ui-routes/account-routes.js:828
+#: lib/ui-routes/account-routes.js:672
 #: lib/ui-routes/admin-entities-routes.js:2026
 msgid "Authentication credentials were not provided"
 msgstr ""
 
-#: lib/routes-ui.js:5558
-#: lib/ui-routes/account-routes.js:831
+#: lib/ui-routes/account-routes.js:675
 #: lib/ui-routes/admin-entities-routes.js:2029
 msgid "OAuth2 authentication failed"
 msgstr ""
 
-#: lib/routes-ui.js:5561
-#: lib/routes-ui.js:5565
-#: lib/ui-routes/account-routes.js:834
-#: lib/ui-routes/account-routes.js:838
+#: lib/ui-routes/account-routes.js:678
+#: lib/ui-routes/account-routes.js:682
 #: lib/ui-routes/admin-entities-routes.js:2032
 #: lib/ui-routes/admin-entities-routes.js:2036
 msgid "TLS protocol error"
 msgstr ""
 
-#: lib/routes-ui.js:5569
-#: lib/ui-routes/account-routes.js:842
+#: lib/ui-routes/account-routes.js:686
 #: lib/ui-routes/admin-entities-routes.js:2040
 msgid "Connection timed out"
 msgstr ""
 
-#: lib/routes-ui.js:5572
-#: lib/ui-routes/account-routes.js:845
+#: lib/ui-routes/account-routes.js:689
 #: lib/ui-routes/admin-entities-routes.js:2043
 msgid "Could not connect to server"
 msgstr ""
 
-#: lib/routes-ui.js:5575
-#: lib/ui-routes/account-routes.js:848
+#: lib/ui-routes/account-routes.js:692
 #: lib/ui-routes/admin-entities-routes.js:2046
 msgid "Unexpected server response"
 msgstr ""
 
-#: lib/routes-ui.js:8301
-#: lib/tools.js:950
-msgid "Invalid input"
+#: lib/ui-routes/admin-config-routes.js:144
+msgid "Invalid API key for OpenAI"
 msgstr ""
 
-#: lib/routes-ui.js:8311
-#: lib/routes-ui.js:8429
-#: lib/routes-ui.js:8446
-#: lib/routes-ui.js:8482
-msgid "Subscription Management"
+#: lib/ui-routes/oauth-config-routes.js:210
+msgid "Unknown"
 msgstr ""
 
-#: workers/api.js:7191
-#: workers/api.js:7308
-msgid "Requested page not found"
+#: lib/ui-routes/oauth-config-routes.js:219
+msgid "Indefinite"
 msgstr ""
 
-#: lib/tools.js:1653
-msgid "Signature validation failed"
+#: lib/ui-routes/route-helpers.js:81
+msgid "Delegated"
 msgstr ""
 
-#: lib/tools.js:1662
-#: lib/tools.js:1667
-msgid "Invalid or expired account setup URL"
+#: lib/ui-routes/route-helpers.js:82
+msgid "Using credentials from \"%s\""
 msgstr ""
 
-#: lib/autodetect-imap-settings.js:80
+#: lib/ui-routes/route-helpers.js:132
 msgid ""
-"Microsoft has disabled password-based sign-ins (including app passwords) "
-"for Outlook.com, Hotmail.com, and Microsoft 365 email accounts. To "
-"continue, please use the \"Sign in with Microsoft\" button to securely "
-"connect your account."
+"Connection timed out. This usually occurs if you are behind a firewall or "
+"connecting to the wrong port."
 msgstr ""
 
-#: lib/ui-routes/account-routes.js:747
-#: lib/ui-routes/account-routes.js:1032
-msgid "Couldn't set up account. Try again."
-msgstr ""
+#: lib/ui-routes/route-helpers.js:135
+msgid "The server unexpectedly closed the connection."
+msgstr ""
+
+#: lib/ui-routes/route-helpers.js:138
+msgid ""
+"The server unexpectedly closed the connection. This usually happens when "
+"attempting to connect to a TLS port without TLS enabled."
+msgstr ""
+
+#: lib/ui-routes/route-helpers.js:143
+msgid ""
+"The server refused the connection. This typically occurs if the server is "
+"not running, is overloaded, or you are connecting to the wrong host or port."
+msgstr ""
+
+#: lib/ui-routes/unsubscribe-routes.js:38
+#: lib/ui-routes/unsubscribe-routes.js:156
+#: lib/ui-routes/unsubscribe-routes.js:173
+#: lib/ui-routes/unsubscribe-routes.js:209
+msgid "Subscription Management"
+msgstr ""
+
+#: lib/ui-routes/unsubscribe-routes.js:167
+#: lib/ui-routes/unsubscribe-routes.js:202
+msgid "Couldn't process request. Try again."
+msgstr ""
+
+#: workers/api.js:2939
+#: workers/api.js:3054
+msgid "Requested page not found"
+msgstr ""

package/update-info.sh

@@ -1,6 +1,24 @@
 #!/bin/sh
 
-COMMIT_HASH=$(cat .git/refs/heads/master)
+# Resolve the commit hash for version-info.json:
+#  1. EE_COMMIT_HASH is the explicit override, set by the deploy workflow and
+#     by release builds that run from a git export without a .git directory
+#  2. git rev-parse works in any normal checkout, also when refs are packed;
+#     the toplevel check makes sure the hash comes from this repository and
+#     not from an unrelated parent repository when this directory is not a
+#     git repository itself
+#  3. the plain ref file is the fallback for the Docker image build, which
+#     only copies .git/refs/heads/master into the build context
+if [ -n "$EE_COMMIT_HASH" ]; then
+    COMMIT_HASH="$EE_COMMIT_HASH"
+elif [ "$(git rev-parse --show-toplevel 2>/dev/null)" = "$(pwd -P)" ] && git rev-parse HEAD >/dev/null 2>&1; then
+    COMMIT_HASH=$(git rev-parse HEAD)
+elif [ -f .git/refs/heads/master ]; then
+    COMMIT_HASH=$(cat .git/refs/heads/master)
+else
+    COMMIT_HASH=""
+fi
+
 TIMESTAMP=$(node -e 'console.log(Date.now())')
 cat >version-info.json <<EOL
 {

package/views/config/logging.hbs

@@ -49,6 +49,54 @@
         </div>
     </div>
 
+    <div class="card mb-4">
+        <div class="card-header py-3">
+            <h6 class="m-0 font-weight-bold text-primary">Error Reporting</h6>
+        </div>
+        <div class="card-body">
+
+            {{#if sentryEnvManaged}}
+            <div class="alert alert-info">Error reporting is currently managed by the <code>SENTRY_DSN</code>
+                environment variable. The settings below are ignored until that variable is removed.</div>
+            {{/if}}
+
+            <div class="form-group form-check">
+
+                <div class="text-muted float-right code-link">[<a href="/admin/swagger#/Settings/postV1Settings"
+                        target="_blank" rel="noopener noreferrer">sentryEnabled</a>]</div>
+
+                <input type="checkbox" class="form-check-input {{#if errors.sentryEnabled}}is-invalid{{/if}}"
+                    id="settingsSentryEnabled" name="sentryEnabled" {{#if values.sentryEnabled}}checked{{/if}}
+                    {{#if sentryEnvManaged}}disabled{{/if}} />
+                <label class="form-check-label" for="settingsSentryEnabled">Report Unhandled Errors to Sentry</label>
+                {{#if errors.sentryEnabled}}
+                <span class="invalid-feedback">{{errors.sentryEnabled}}</span>
+                {{/if}}
+                <small class="form-text text-muted">Send unhandled errors to a Sentry server. Reports include stack
+                    traces, account IDs, and error details, but never credentials or message content. Changes apply
+                    within a minute - no restart needed.</small>
+            </div>
+
+            <div class="form-group">
+
+                <div class="text-muted float-right code-link">[<a href="/admin/swagger#/Settings/postV1Settings"
+                        target="_blank" rel="noopener noreferrer">sentryDsn</a>]</div>
+
+                <label for="settingsSentryDsn">Sentry DSN</label>
+                <input type="text" class="form-control {{#if errors.sentryDsn}}is-invalid{{/if}}"
+                    id="settingsSentryDsn" name="sentryDsn" placeholder="https://public-key@sentry.example.com/1"
+                    value="{{values.sentryDsn}}" {{#if sentryEnvManaged}}disabled{{/if}} />
+                {{#if errors.sentryDsn}}
+                <span class="invalid-feedback">{{errors.sentryDsn}}</span>
+                {{/if}}
+                <small class="form-text text-muted">Leave empty to send reports to the Sentry instance run by the
+                    EmailEngine developers (sentry.emailengine.dev). Enabling this temporarily during a support case
+                    helps to debug problems with your installation. Set your own DSN to keep reports
+                    in-house.</small>
+            </div>
+        </div>
+    </div>
+
     <div class="mb-4">
         <button type="submit" class="btn btn-primary btn-icon-split">
             <span class="icon text-white-50">

package/views/dashboard.hbs

@@ -5,16 +5,16 @@
     </div>
 
 
-    {{#if isElastiCache}}
-    <div class="card border-left-danger mt-4">
+    {{#each redisWarnings}}
+    <div class="card border-left-{{color}} mt-4">
         <div class="card-body">
             <div class="row no-gutters align-items-center">
                 <div class="col mr-2">
-                    <div class="text-xs font-weight-bold text-danger text-uppercase mb-1">Compatibility warning
+                    <div class="text-xs font-weight-bold text-{{color}} text-uppercase mb-1">{{title}}
                     </div>
-                    <p>EmailEngine is incompatible with Amazon ElastiCache as the database backend.</p>
-                    <p>Please switch to a standard Redis instance. Using ElastiCache with EmailEngine can result in data
-                        loss and some features may not work correctly.</p>
+                    {{#each details}}
+                    <p>{{this}}</p>
+                    {{/each}}
                 </div>
                 <div class="col-auto">
                     <i class="fas fa-exclamation-circle fa-2x text-gray-300"></i>
@@ -22,26 +22,7 @@
             </div>
         </div>
     </div>
-    {{/if}}
-
-
-    {{#if isRedisCluster}}
-    <div class="card border-left-danger mt-4">
-        <div class="card-body">
-            <div class="row no-gutters align-items-center">
-                <div class="col mr-2">
-                    <div class="text-xs font-weight-bold text-danger text-uppercase mb-1">Compatibility warning
-                    </div>
-                    <p>EmailEngine is incompatible with Redis Cluster setup.</p>
-                    <p>Please switch to a standard Redis primary instance.</p>
-                </div>
-                <div class="col-auto">
-                    <i class="fas fa-exclamation-circle fa-2x text-gray-300"></i>
-                </div>
-            </div>
-        </div>
-    </div>
-    {{/if}}
+    {{/each}}
 
 
     {{#unless hasAccounts}}

package/views/internals/index.hbs

@@ -5,6 +5,21 @@
     </h1>
 </div>
 
+{{#if apiWorkerWarning}}
+<div class="alert alert-warning mt-4" role="alert">
+    <i class="fas fa-exclamation-triangle"></i>
+    <strong>Multiple API workers are not active.</strong>
+    {{#equals apiWorkerWarning.reason "port"}}
+    <code>EENGINE_WORKERS_API</code> is set to {{apiWorkerWarning.requested}}, but EmailEngine could not verify
+    <code>SO_REUSEPORT</code> support because the API port was unavailable while probing at startup, so only a single
+    API worker was started. This is usually a transient conflict and may clear on the next restart.
+    {{else}}
+    <code>EENGINE_WORKERS_API</code> is set to {{apiWorkerWarning.requested}}, but this platform does not support
+    <code>SO_REUSEPORT</code> (requires Linux with Node.js 23.1 or newer), so only a single API worker was started.
+    {{/equals}}
+</div>
+{{/if}}
+
 <div class="card mb-4 mt-4">
 
     <div class="table-responsive">

package/views/tokens/index.hbs

@@ -34,6 +34,9 @@
                     <th class="p-0">
                         <div class="p-2">Scopes</div>
                     </th>
+                    <th class="p-0">
+                        <div class="p-2">Token ID</div>
+                    </th>
                     <th class="p-0">
                         <div class="p-2">Last used</div>
                     </th>
@@ -56,6 +59,12 @@
                         {{/if}}
                     </td>
 
+                    <td class="p-2">
+                        {{#if idShort}}
+                        <code data-toggle="tooltip" data-placement="top" title="{{id}}" style="cursor: help;">{{idShort}}</code>
+                        {{/if}}
+                    </td>
+
                     <td class="p-2">
                         {{#if access.timeStr}}
                         <span class="relative-time" data-time="{{access.timeStr}}"></span>