stages/email: Only attach logo to email if used#14835
Merged
BeryJu merged 4 commits intogoauthentik:mainfrom Jun 9, 2025
Merged
stages/email: Only attach logo to email if used#14835BeryJu merged 4 commits intogoauthentik:mainfrom
BeryJu merged 4 commits intogoauthentik:mainfrom
Conversation
✅ Deploy Preview for authentik-docs ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
✅ Deploy Preview for authentik-storybook ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Member
|
/cherry-pick version-2025.6 |
BeryJu
approved these changes
Jun 9, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #14835 +/- ##
==========================================
+ Coverage 92.75% 92.79% +0.03%
==========================================
Files 817 818 +1
Lines 42197 42199 +2
==========================================
+ Hits 39141 39158 +17
+ Misses 3056 3041 -15
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Jun 9, 2025
* Only attach logo to email if used * Fix MIME logo attachment to adhere to standard * format, fix web Signed-off-by: Jens Langhammer <jens@goauthentik.io> * not tuple Signed-off-by: Jens Langhammer <jens@goauthentik.io> --------- Signed-off-by: Jens Langhammer <jens@goauthentik.io> Co-authored-by: Jens Langhammer <jens@goauthentik.io>
BeryJu
added a commit
that referenced
this pull request
Jun 9, 2025
…14969) stages/email: Only attach logo to email if used (#14835) * Only attach logo to email if used * Fix MIME logo attachment to adhere to standard * format, fix web * not tuple --------- Signed-off-by: Jens Langhammer <jens@goauthentik.io> Co-authored-by: Christian Elsen <chriselsen@users.noreply.github.com> Co-authored-by: Jens Langhammer <jens@goauthentik.io>
kensternberg-authentik
added a commit
that referenced
this pull request
Jun 9, 2025
* main: (38 commits) website/docs: added a link in our Upgrade docs to the Outpost upgrade docs, slight reformatting (#14931) website: fix search across multiple subdomains (#14976) core: bump goauthentik.io/api/v3 from 3.2025060.1 to 3.2025061.1 (#14972) web: bump API Client version (#14971) root: backport 2025.6.1 bump (#14970) stages/email: Only attach logo to email if used (#14835) web: bump @codemirror/lang-python from 6.1.6 to 6.2.1 in /web (#14713) website: bump prettier-plugin-packagejson from 2.5.14 to 2.5.15 in /website (#14829) core: bump selenium/standalone-chrome from 136.0 to 137.0 in /tests/e2e (#14963) core: bump axllent/mailpit from v1.25.1 to v1.26.0 in /tests/e2e (#14964) core: bump astral-sh/uv from 0.7.11 to 0.7.12 (#14965) core: bump github.com/redis/go-redis/v9 from 9.9.0 to 9.10.0 (#14966) web: bump @types/mocha from 10.0.8 to 10.0.10 in /web (#14684) web: bump ts-pattern from 5.4.0 to 5.7.1 in /web (#14686) website: bump @types/node from 22.15.29 to 22.15.30 in /website (#14968) web: bump mermaid from 11.4.1 to 11.6.0 in /web (#14688) web: bump @fortawesome/fontawesome-free from 6.6.0 to 6.7.2 in /web (#14716) web: bump the eslint group across 2 directories with 3 updates (#14833) website: bump the eslint group in /website with 4 updates (#14967) website: bump @typescript-eslint/parser from 8.32.1 to 8.33.1 in /website (#14828) ...
cavefire
pushed a commit
to cavefire/authentik
that referenced
this pull request
Jun 24, 2025
* Only attach logo to email if used * Fix MIME logo attachment to adhere to standard * format, fix web Signed-off-by: Jens Langhammer <jens@goauthentik.io> * not tuple Signed-off-by: Jens Langhammer <jens@goauthentik.io> --------- Signed-off-by: Jens Langhammer <jens@goauthentik.io> Co-authored-by: Jens Langhammer <jens@goauthentik.io>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Details
Address #8397 by only attaching the logo file to an email only when that logo is used in the mailed template via MIME embedded files.
If user modify the template and do not use the logo (e.g. remove it or reference logos via https://...) the logo is not attached.
Makes sure that if the logo is used, the MIME attachment conforms to standards:
Checklist
ak test authentik/)make lint-fix)