diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a4a653b..123cc6ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ - Fixed logs bulk selection export error. -- Other Minor UI improvements (optimized logs and records list rendering, word breaking in labels, text contrast improvements, registered missing `oidc2` and `oidc3` option fields, etc.). +- Other minor improvements (optimized logs and records list rendering, word breaking in labels, text contrast improvements, registered missing `oidc2` and `oidc3` option fields, updated default email template texts for consistency, etc.). ## v0.38.2 diff --git a/core/collection_model_auth_options.go b/core/collection_model_auth_options.go index 231ab4cc..068af371 100644 --- a/core/collection_model_auth_options.go +++ b/core/collection_model_auth_options.go @@ -70,7 +70,7 @@ func (m *Collection) setDefaultAuthOptions() { }, AuthToken: TokenConfig{ Secret: security.RandomString(50), - Duration: 604800, // 7 days + Duration: 604800, // 7days }, PasswordResetToken: TokenConfig{ Secret: security.RandomString(50), @@ -82,7 +82,7 @@ func (m *Collection) setDefaultAuthOptions() { }, VerificationToken: TokenConfig{ Secret: security.RandomString(50), - Duration: 259200, // 3days + Duration: 86400, // 1day }, FileToken: TokenConfig{ Secret: security.RandomString(50), diff --git a/core/collection_model_auth_templates.go b/core/collection_model_auth_templates.go index a0734bfc..16c3daa6 100644 --- a/core/collection_model_auth_templates.go +++ b/core/collection_model_auth_templates.go @@ -18,6 +18,7 @@ var defaultVerificationTemplate = EmailTemplate{

Verify

+

If you didn't recently registered, please ignore this email.

Thanks,
` + EmailPlaceholderAppName + ` team @@ -31,7 +32,7 @@ var defaultResetPasswordTemplate = EmailTemplate{

Reset password

-

If you didn't ask to reset your password, you can ignore this email.

+

If you didn't ask to reset your password, please ignore this email.

Thanks,
` + EmailPlaceholderAppName + ` team @@ -45,7 +46,7 @@ var defaultConfirmEmailChangeTemplate = EmailTemplate{

Confirm new email

-

If you didn't ask to change your email address, you can ignore this email.

+

If you didn't ask to change your email address, please ignore this email.

Thanks,
` + EmailPlaceholderAppName + ` team diff --git a/plugins/migratecmd/migratecmd_test.go b/plugins/migratecmd/migratecmd_test.go index e19846e1..f2705aad 100644 --- a/plugins/migratecmd/migratecmd_test.go +++ b/plugins/migratecmd/migratecmd_test.go @@ -39,7 +39,7 @@ migrate((app) => { "duration": 604800 }, "confirmEmailChangeTemplate": { - "body": "

Hello,

\n

Click on the button below to confirm your new email address.

\n

\n Confirm new email\n

\n

If you didn't ask to change your email address, you can ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Click on the button below to confirm your new email address.

\n

\n Confirm new email\n

\n

If you didn't ask to change your email address, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Confirm your {APP_NAME} new email address" }, "createRule": null, @@ -170,14 +170,14 @@ migrate((app) => { "duration": 1800 }, "resetPasswordTemplate": { - "body": "

Hello,

\n

Click on the button below to reset your password.

\n

\n Reset password\n

\n

If you didn't ask to reset your password, you can ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Click on the button below to reset your password.

\n

\n Reset password\n

\n

If you didn't ask to reset your password, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Reset your {APP_NAME} password" }, "system": true, "type": "auth", "updateRule": null, "verificationTemplate": { - "body": "

Hello,

\n

Thank you for joining us at {APP_NAME}.

\n

Click on the button below to verify your email address.

\n

\n Verify\n

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Thank you for joining us at {APP_NAME}.

\n

Click on the button below to verify your email address.

\n

\n Verify\n

\n

If you didn't recently registered, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Verify your {APP_NAME} email" }, "verificationToken": { @@ -221,7 +221,7 @@ func init() { "duration": 604800 }, "confirmEmailChangeTemplate": { - "body": "

Hello,

\n

Click on the button below to confirm your new email address.

\n

\n Confirm new email\n

\n

If you didn't ask to change your email address, you can ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Click on the button below to confirm your new email address.

\n

\n Confirm new email\n

\n

If you didn't ask to change your email address, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Confirm your {APP_NAME} new email address" }, "createRule": null, @@ -352,14 +352,14 @@ func init() { "duration": 1800 }, "resetPasswordTemplate": { - "body": "

Hello,

\n

Click on the button below to reset your password.

\n

\n Reset password\n

\n

If you didn't ask to reset your password, you can ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Click on the button below to reset your password.

\n

\n Reset password\n

\n

If you didn't ask to reset your password, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Reset your {APP_NAME} password" }, "system": true, "type": "auth", "updateRule": null, "verificationTemplate": { - "body": "

Hello,

\n

Thank you for joining us at {APP_NAME}.

\n

Click on the button below to verify your email address.

\n

\n Verify\n

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Thank you for joining us at {APP_NAME}.

\n

Click on the button below to verify your email address.

\n

\n Verify\n

\n

If you didn't recently registered, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Verify your {APP_NAME} email" }, "verificationToken": { @@ -492,7 +492,7 @@ migrate((app) => { "duration": 604800 }, "confirmEmailChangeTemplate": { - "body": "

Hello,

\n

Click on the button below to confirm your new email address.

\n

\n Confirm new email\n

\n

If you didn't ask to change your email address, you can ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Click on the button below to confirm your new email address.

\n

\n Confirm new email\n

\n

If you didn't ask to change your email address, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Confirm your {APP_NAME} new email address" }, "createRule": null, @@ -623,14 +623,14 @@ migrate((app) => { "duration": 1800 }, "resetPasswordTemplate": { - "body": "

Hello,

\n

Click on the button below to reset your password.

\n

\n Reset password\n

\n

If you didn't ask to reset your password, you can ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Click on the button below to reset your password.

\n

\n Reset password\n

\n

If you didn't ask to reset your password, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Reset your {APP_NAME} password" }, "system": false, "type": "auth", "updateRule": null, "verificationTemplate": { - "body": "

Hello,

\n

Thank you for joining us at {APP_NAME}.

\n

Click on the button below to verify your email address.

\n

\n Verify\n

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Thank you for joining us at {APP_NAME}.

\n

Click on the button below to verify your email address.

\n

\n Verify\n

\n

If you didn't recently registered, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Verify your {APP_NAME} email" }, "verificationToken": { @@ -677,7 +677,7 @@ func init() { "duration": 604800 }, "confirmEmailChangeTemplate": { - "body": "

Hello,

\n

Click on the button below to confirm your new email address.

\n

\n Confirm new email\n

\n

If you didn't ask to change your email address, you can ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Click on the button below to confirm your new email address.

\n

\n Confirm new email\n

\n

If you didn't ask to change your email address, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Confirm your {APP_NAME} new email address" }, "createRule": null, @@ -808,14 +808,14 @@ func init() { "duration": 1800 }, "resetPasswordTemplate": { - "body": "

Hello,

\n

Click on the button below to reset your password.

\n

\n Reset password\n

\n

If you didn't ask to reset your password, you can ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Click on the button below to reset your password.

\n

\n Reset password\n

\n

If you didn't ask to reset your password, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Reset your {APP_NAME} password" }, "system": false, "type": "auth", "updateRule": null, "verificationTemplate": { - "body": "

Hello,

\n

Thank you for joining us at {APP_NAME}.

\n

Click on the button below to verify your email address.

\n

\n Verify\n

\n

\n Thanks,
\n {APP_NAME} team\n

", + "body": "

Hello,

\n

Thank you for joining us at {APP_NAME}.

\n

Click on the button below to verify your email address.

\n

\n Verify\n

\n

If you didn't recently registered, please ignore this email.

\n

\n Thanks,
\n {APP_NAME} team\n

", "subject": "Verify your {APP_NAME} email" }, "verificationToken": {