Skip to content

Fixes in the enrollment process #687

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

Merged
cpprian merged 3 commits into from
Aug 4, 2024
Merged

Fixes in the enrollment process #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78f5465
update mail_enrollment with information about token
cpprian Jul 19, 2024
1518ec0
separate TokenExpired error from the other TokenError
cpprian Jul 24, 2024
ac9c771
Merge branch 'dev' into fixes-in-the-enrollment-process
cpprian Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/db/models/enrollment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ impl From<TokenError> for Status {
| TokenError::WelcomeEmailNotConfigured
| TokenError::TemplateError(_)
| TokenError::TemplateErrorInternal(_) => (Code::Internal, "unexpected error"),
TokenError::NotFound
| TokenError::TokenExpired
| TokenError::SessionExpired
| TokenError::TokenUsed => (Code::Unauthenticated, "invalid token"),
TokenError::NotFound | TokenError::SessionExpired | TokenError::TokenUsed => {
(Code::Unauthenticated, "invalid token")
}
TokenError::AlreadyActive => (Code::InvalidArgument, "already active"),
TokenError::TokenExpired => (Code::Unauthenticated, "token expired"),
};
Status::new(code, msg)
}
Expand Down
4 changes: 3 additions & 1 deletion templates/mail_enrollment_start.tera
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ macros::paragraph(content="<b>1. Enrollment by desktop client</b>"),
macros::paragraph(content="Download the official defguard desktop client for macOS or Linux from the release page: " ~ release_link),
macros::paragraph(content="After installation, please add a defguard instance by entering:"),
macros::paragraph(content="<ul><li>Instance URL: " ~ enrollment_link ~ "</li><li>Enrollment token: <b>" ~ token ~ "</b></li></ul>"),
macros::paragraph(content="<b>Please note that: the token is only valid for 24 hours after receiving this email. When the enrollment process starts user will have 10 minutes to complete the process.</b>"),
macros::paragraph(content="For more details go to the desktop client documentation: " ~ client_docs_link),
] %}
{{ macros::text_section(content_array=section_content)}}
Expand All @@ -35,7 +36,8 @@ macros::paragraph(content="If you choose this option, you will be able to change
Desktop client can still be activated later, by accessing your profile in defguard: " ~ defguard_link ~ "."),
macros::paragraph(content= "If you wish to do enrollment via Web, please copy & paste the following URL in your browser: "),
macros::link(content=link_url, href=link_url),
macros::paragraph(content="Or click the button below:"),
macros::paragraph(content="<b>Please note that: this option is only valid for 24 hours after receiving this email. When the enrollment process starts user will have 10 minutes to complete the process.</b>"),
macros::paragraph(content="You can also click the button below to start the enrollment:"),
] %}
{{ macros::text_section(content_array=section_content)}}
<p style="text-align: center;"><a href={{ link_url }} target="_blank" aria-label="Start enrollment" style="
Expand Down