fix(account-form): Added support for 'path' in the authentication form

postalsys · Apr 11, 2024 · 198ba41 · 198ba41
1 parent 037091b
commit 198ba41
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/lib/routes-ui.js b/lib/routes-ui.js
@@ -6215,7 +6215,6 @@ ${Buffer.from(data.content, 'base64url').toString('base64')}
 
     async function accountFormHandler(request, h) {
         const data = await parseSignedFormData(redis, request.payload, gt);
-
         const oauth2App = await oauth2Apps.get(request.payload.type);
 
         if (oauth2App && oauth2App.enabled) {
@@ -6225,7 +6224,7 @@ ${Buffer.from(data.content, 'base64url').toString('base64')}
                 account: data.account
             };
 
-            for (let key of ['name', 'email', 'syncFrom']) {
+            for (let key of ['name', 'email', 'syncFrom', 'path']) {
                 if (data[key]) {
                     accountData[key] = data[key];
                 }
@@ -6637,6 +6636,7 @@ ${Buffer.from(data.content, 'base64url').toString('base64')}
                 notifyFrom: data.notifyFrom ? new Date(data.notifyFrom) : new Date(),
 
                 syncFrom: data.syncFrom || null,
+                path: data.path || null,
 
                 imap: {
                     host: request.payload.imap_host,

diff --git a/lib/tools.js b/lib/tools.js
@@ -1374,6 +1374,7 @@ MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEV3QUiYsp13nD9suD1/ZkEXnuMoSg
                           subconnections: opts.subconnections && opts.subconnections.length ? opts.subconnections : null,
                           redirectUrl: opts.redirectUrl,
                           delegated: opts.delegated,
+                          path: opts.path,
                           n: opts.n,
                           t: opts.t
                       })

diff --git a/workers/api.js b/workers/api.js
@@ -2183,6 +2183,7 @@ When making API calls remember that requests against the same account are queued
                     subconnections: request.payload.subconnections,
                     redirectUrl: request.payload.redirectUrl,
                     delegated: request.payload.delegated,
+                    path: request.payload.path && !request.payload.path.includes('*') ? request.payload.path : null,
                     // identify request
                     n: crypto.randomBytes(NONCE_BYTES).toString('base64'),
                     t: Date.now()
@@ -2286,6 +2287,8 @@ When making API calls remember that requests against the same account are queued
 
                     subconnections: accountSchemas.subconnections,
 
+                    path: accountPathSchema.example(['*']).label('AccountFormPath'),
+
                     redirectUrl: Joi.string()
                         .empty('')
                         .uri({ scheme: ['http', 'https'], allowRelative: false })