Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update logo in emails #699

Merged
merged 21 commits into from
Aug 12, 2024
Merged

Update logo in emails #699

merged 21 commits into from
Aug 12, 2024

Conversation

cpprian
Copy link
Contributor

@cpprian cpprian commented Aug 4, 2024

📖 Description

  1. include a summary of the changes and the related issue, eg. Closes #XYZ
  2. Do not make a PR if you can't check all the boxes below

🛠️ Dev Branch Merge Checklist:

Documentation

  • If testing requires changes in the environment or deployment, please update the documentation (https://defguard.gitbook.io) first and attach the link to the documentation section in this pool request
  • I have commented on my code, particularly in hard-to-understand areas

Testing

  • I have prepared end-to-end tests for all new functionalities
  • I have performed end-to-end tests manually and they work
  • New and existing unit tests pass locally with my changes

Deployment

  • If deployment is affected I have made corresponding/required changes to deployment (Docker, Kubernetes, one-line install)

🏚️ Main Branch Merge Checklist:

Testing

  • I have merged my changes before to dev and the dev checklist is done
  • I have tested all functionalities on the dev instance and they work

Documentation

  • I have made corresponding changes to the user & admin documentation and added new features documentation with screenshots for users/admins

@cpprian cpprian linked an issue Aug 4, 2024 that may be closed by this pull request
Update logo in emails #669
Closed
@t-aleksander t-aleksander changed the base branch from main to dev August 5, 2024 11:42
@t-aleksander t-aleksander merged commit e6fda16 into dev Aug 12, 2024
3 checks passed
@t-aleksander t-aleksander deleted the update-logo-in-emails branch August 12, 2024 18:08
t-aleksander added a commit that referenced this pull request Oct 9, 2024
@t-aleksander @cpprian
@dependabot @teon @j-chmielewski @moubctez @hwiorn @wojcik91
merge dev -> main (#815)
e4039c4 
* #480 Docs for rest api (#667)

* add utoipa dependencies

* add tags

* add full description to /user endpoints 

* Apply suggestions from code review

Co-authored-by: Aleksander <[email protected]>

---------

Co-authored-by: cpprian <[email protected]>
Co-authored-by: Aleksander <[email protected]>

* Docs for rest api - /device endpoints (#672)

* add utoipa dependencies

* feat: init openapi to describe /api/v1/user

* nest /swagger-ui into /api/v1

* get json with api details

* add group section

* add api description for enrollment

* update description of start_enrollment, start_remote_desktop_configuration, username_available

* add description of update and delete user api

* add description of change_self_password, change_password and reset_password endpoints

* add description of wallet challenge, updatte wallet, delete wallet and set wallet endpoints

* add description of delete_authorized_app, delete_security_key, me endpoints

* fix typo in path to delete_security_key

* add status code 500 description to few endpoints

* return .env vars to default

* update comment for not misunderstanding

* fix rustfmt format errors

* add tags

* add full description to /user endpoints part 1

* add full description to /user endpoints part 2

* update .env and delete pnpm-lock.yaml

* fix rust fmt errors

* Apply suggestions from code review

Co-authored-by: Aleksander <[email protected]>

* add description of /device endpoints

* describe tag wireguard

* add description of /group endpoints

* add swagger-ui lib

* rename endpoint

* Apply suggestions from code review

Co-authored-by: Aleksander <[email protected]>

* change name of the wireguard tag to device

* Apply suggestions from code review #2

Co-authored-by: Aleksander <[email protected]>

* fix params, requests and imports

---------

Co-authored-by: cpprian <[email protected]>
Co-authored-by: Aleksander <[email protected]>

* update defguard logo in email template (#686)

* update defguard logo in email template

* rename path for logo image

* Defguard log level should be set for tower httptrace logs (#693)

* set tower_http::trace log level by DEFGUARD_LOG_LEVEL

* set all log events by DEFGUARD_LOG_LEVEL

* undo .env values

* chore(deps): bump braces from 3.0.2 to 3.0.3 in /web + readme update (#694)

* Update README.md

* chore(deps): bump braces from 3.0.2 to 3.0.3 in /web

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](micromatch/braces@3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Aleksander <[email protected]>
Co-authored-by: Robert Olejnik <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: updated actions to use the correct runner (#695)

* fix: fix pnpm lockfile (#696)

* Fixes in the enrollment process (#687)

* update mail_enrollment with information about token

* separate TokenExpired error from the other TokenError

* feat: Add external OpenID login (#676)

* wip: OIDC structures & migration

* wip: callback handler

* handler expects id_token as query parameter, should be after '#'
* extract user info

* wip: try and parse the claims

ISSUE: no jwks keys

* wip: Decoded the claims using openidconnect client

* proper nonce

* Simple OpenID settings tab

* Fetch openid providers from API

* wip: display providers

* rudimentary openid flow

* openid flow 2

* openid buttons and polishing

* cleanup

* cargo lock

* parse url

* format

* cleanup and comments

* sqlx prepare

* fixes

* cleanup, refactoring, tests

* cargo fix

* fix type

* fmt

* compress migrations

* cleanup

* fix frontend

* enable e2e and dev deployment

* license update

* fix test

* make changes according to the review

* flow rework and fixes

* cargo fix

* change action to amd64 and temporarily disable e2e tests

* x64

* assign correct runner to most workflows

* cargo fmt

* remove double slash

* dfg mfa support

* cargo fmt

* remove temporary code

---------

Co-authored-by: Jacek Chmielewski <[email protected]>

* impl gRPC health service (#700)

* Prepare the database for licenses (#710)

* Logs in critical places (#707)

* add info log that proxy has been disconnected from core

* move WireguardPeerStatus stats log to debug from info

* del .env config

* set SQLX_OFFLINE to false

* undo last commit

* update sqlx

* run cargo sqlx prepare

* add for test purpose sqlx::test

* sqlx prepare for all targets

* Update src/grpc/mod.rs

Co-authored-by: Aleksander <[email protected]>

---------

Co-authored-by: Aleksander <[email protected]>

* Add CI linting on dev branch (#713)

* add version

* print only version

* swap auth-secret-key to default

* Fix: e-mail MFA code verification (#714)

* Fix: e-mail MFA code verification

* Expand comments

* Fix doctests

---------

Co-authored-by: Robert Olejnik <[email protected]>

* Update logo in emails (#699)

* update defguard logo in email template

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* rename path for logo image

* Update README.md

* Update README.md

* Update README.md

* change dimensions of new-logo on emails

---------

Co-authored-by: Aleksander <[email protected]>
Co-authored-by: Robert Olejnik <[email protected]>

* add toaster Too many bad login attempts (#711)

* add toaster Too many bad login attempts

* sqlx prepare

* Update web/src/i18n/en/index.ts

Co-authored-by: Aleksander <[email protected]>

* Apply suggestions from code review

Co-authored-by: Aleksander <[email protected]>

* Add polish translation for tooManyBadLoginAttempts

---------

Co-authored-by: Robert Olejnik <[email protected]>
Co-authored-by: Aleksander <[email protected]>

* fix: fix a loop when logging in through external openid (#720)

* remove dependencies from array

* disable linting

* add debugs logs for enrollment process (#708)


* add debugs logs for enrollment process

* add more debug logs for desktop activation, enrollment and create device

* comment arm build

* cargo fmt

* add more debug logs v2

* uncomment arm build and change defguard version from 0.11.1 to 1.0.0

* Apply suggestions from code review

Co-authored-by: Aleksander <[email protected]>

* apply cargo fmt

---------

Co-authored-by: Aleksander <[email protected]>
Co-authored-by: Robert Olejnik <[email protected]>

* Fix: TOTP (#722)

Co-authored-by: Aleksander <[email protected]>

* feat: Enterprise license (#709)

* wip: OIDC structures & migration

* wip: callback handler

TODO:
* handler expects id_token as query parameter, should be after '#'
* extract user info

* wip: try and parse the claims

ISSUE: no jwks keys

* wip: Decoded the claims using openidconnect client

TODO:
* proper nonce

* Simple OpenID settings tab

* Fetch openid providers from API

* wip: display providers

* rudimentary openid flow

* openid flow 2

* openid buttons and polishing

* cleanup

* cargo lock

* parse url

* format

* cleanup and comments

* sqlx prepare

* fixes

* cleanup, refactoring, tests

* cargo fix

* fix type

* fmt

* compress migrations

* cleanup

* fix frontend

* enable e2e and dev deployment

* license update

* fix test

* make changes according to the review

* flow rework and fixes

* cargo fix

* change action to amd64 and temporarily disable e2e tests

* x64

* assign correct runner to most workflows

* cargo fmt

* remove double slash

* dfg mfa support

* cargo fmt

* rudimentary license handling

* further improvements, renewal service

* cleanup

* move license protobuf

* cleanup

* tweaks, env variables

* add better comment

* remove old migrations

* cleanup

* add temporary build

* sqlx prepare

* fixes, more logs

* fix log levels

* cleanup

* Apply suggestions from code review

Co-authored-by: Adam <[email protected]>

* sort dependencies

* organize imports

* remove redundant arguments

* fix redundant argument

* missing enterprise version view

* global state rework

* cargo fmt

* cleanup

* fix tests

* delete unused import

* fixes

* cleanup

* fix tests

* eslint fix

* add a test

* add comment

* fix css

* cleanup

* change logs

* ux changes

* linter fixes

---------

Co-authored-by: Jacek Chmielewski <[email protected]>
Co-authored-by: Robert Olejnik <[email protected]>
Co-authored-by: Adam <[email protected]>

* Implement new token for gateway in location (#721)

* provide toaster with too many bad login attempts by error code 429

* undo docker & .env changes

* auth token, from package, one line install

* getNetworkActions

* add button

* gateway location setup v1

* add polish translation

* fix lint issue

* apply suggestions

* render markdown instead of html tags from types

* run prettier

---------

Co-authored-by: Robert Olejnik <[email protected]>

* Build FreeBSD package

* Fix copy-paste typos

* Use newer rust and postgres for tests

* fix: fix e2e pnpm lockfile (#730)

* rebuild lockfile

* revert the lockfile

* cleanup

* Build multi-arch (#481)

* Unclog E2E and dev deployment

* CI: fix architecutre; do not build for armv7 anymore

* Add git commit SHA to version string

* fix: fix "current" workflow (#732)

* Manifest tag fix

* Manifest tag fix, take 2

* Manifest tag fix, take 3

* Manifest tag fix, take 4

* feat: enterprise behavior settings (#715)

* Prepare the license feature for the experimental version (#734)

* prepare the license feature for a pre-release version

* fixes

* Build multi-arch with --amend

* Rename tab "Behavior" -> "Enterprise features"

* Refetch enterprise settings on window focus

* fix: remove enterprise settings toast (#737)

* change username creation logic

* refactor

* Mfa code email reformat (#743)

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* video intro

* Update README.md

* Update README.md

* Update README.md

* center Date section & Copyright

* add name into email context

* change link to client download page

* cargo fmt

* fix bugs

* add span

* del <b> tag from EMAIL_CODE_REGEX in test auth.rs

* try b tag

* Update templates/mail_email_mfa_code.tera

Co-authored-by: Aleksander <[email protected]>

* Update src/templates.rs

Co-authored-by: Aleksander <[email protected]>

* Update src/templates.rs

Co-authored-by: Aleksander <[email protected]>

---------

Co-authored-by: Aleksander <[email protected]>
Co-authored-by: Robert Olejnik <[email protected]>

* Fix email footer (#748)

* fix footer

---------

Co-authored-by: Aleksander <[email protected]>
Co-authored-by: Robert Olejnik <[email protected]>

* update max overdue time

* display license info

* eslint fix

* add version

* fix constraints

* enterprise_enabled -> state.enterprise_status?.enabled

* fix: remove devices from network when deleting a user (#754)

* sync network state when deleting a user

* cleanup, optimization

* revert query

* add comment

---------

Co-authored-by: Robert Olejnik <[email protected]>

* add link to documentation (#757)

* add link to documentation

* Add link to documentation in use enrollment process (#760)

* clicking link opens a new page

* fix lint errors

* Unable to delete configuration for ldap and smtp when it is configured (#759)

* del ldap button

* add del button for smtp

* Update web/src/i18n/pl/index.ts

Co-authored-by: Adam <[email protected]>

* Update web/src/i18n/pl/index.ts

Co-authored-by: Adam <[email protected]>

---------

Co-authored-by: Adam <[email protected]>

* fix bugs in global settings page (#761)

* fix bugs in global settings page

* change values in restore button

* set default values in form

* fix: update license server url, set timeout (#762)

* feat: disable showing manual wireguard configuration (#763)

* manual wg config disabling

* cleanup

* cleanup

* update protobufs

* sqlx prepare

* sqlx prepare

---------

Co-authored-by: Robert Olejnik <[email protected]>

* fix e2e tests (#768)

* fix log message (#771)

* Change public key, extract signing keys (#773)

* extract subkeys from key

* fallback to primary key

* unwrap -> expect

* Code cleanup (#775)

* Display warning modal when trying to change the username or email (#777)

* display warning modal

* eslint fix

* Apply suggestions from code review

Co-authored-by: Cyprian <[email protected]>

* generate translation  types

---------

Co-authored-by: Cyprian <[email protected]>

* add more tests (#778)

* Add korean translation (#781)

* Add korean translation

* Fix korean translations

* chore: revert to default locale

---------

Co-authored-by: Aleksander <[email protected]>

* fix phrasing (#782)

* generate localization types (#784)

* feat: config polling (#758)

Enables desktop clients to get configuration updates without issuing new enrollment token.

* CI: fix re-creating manifests

* chore: more logs for enrollment process (#786)

* feat: Display license status (#787)

* display license status

* orange -> red

* inform about the status on tabs

* feat: add option to prevent routing all traffic through the vpn (#765)

* add option

* sqlx prepare

* prepare

* send the value via config polling

* cargo fix

* disable_route_all_traffic -> disable_all_traffic

* update protobufs

* cargo fmt

* Update src/grpc/utils.rs

Co-authored-by: Jacek Chmielewski <[email protected]>

---------

Co-authored-by: Jacek Chmielewski <[email protected]>

* match users logging in through openid by the sub claim (#788)

* match logging in users through sub claim

* sqlx prepare

* move the account creation check

* Rework instance config fetching (#791)

* instance settings fetching rework

* Log errors

* debug -> error

* update protobufs

* cargo fmt

---------

Co-authored-by: Jacek Chmielewski <[email protected]>

* Generate polling token on instance update (#793)

* issue a new token on instance update

* prepare

* Update src/grpc/utils.rs

Co-authored-by: Jacek Chmielewski <[email protected]>

---------

Co-authored-by: Jacek Chmielewski <[email protected]>

* Quick fixes (#795)

* change the behavior of the username change warning modal (#798)

* fix dns regex check (#799)

* fix: restore group fetching on the user edit page, update urls (#802)

* fix groups

* update url

* Database model with type states (#750)

* Add nix flake

* fix: Change enterprise setting phrasing and remove the ability to close a message box (#812)

* change phrasing

* add information about the desktop client

* feat(CI): enable armv7 docker builds (#813)

* build ARMv7 Docker images

* add quotes

---------

Co-authored-by: Maciej Wójcik <[email protected]>

* Enterprise license

* trigger build

* Enterprise license info in the AGPL license

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Cyprian <[email protected]>
Co-authored-by: cpprian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Robert Olejnik <[email protected]>
Co-authored-by: Jacek Chmielewski <[email protected]>
Co-authored-by: cpprian <[email protected]>
Co-authored-by: Adam <[email protected]>
Co-authored-by: Tim Lee <[email protected]>
Co-authored-by: Maciek <[email protected]>
Co-authored-by: Maciej Wójcik <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t-aleksander t-aleksander t-aleksander approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update logo in emails
3 participants
@cpprian @t-aleksander @teon