amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 16:35:10 +00:00
Code Issues Projects Releases Wiki Activity

fix(password recovery): Add default from mail parameter

Browse Source
This commit is contained in:
smizrahi
2024-01-09 10:28:41 +01:00
parent 153f444c3f
commit 26b14671f5
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MainUI/SOGoRootPage.m
+10 -5
View File
@@ -869,11 +869,18 @@ static const NSString *kJwtKey = @"jwt";
if (!mode && jwtToken) {
response = [self _standardDefaultAction];
} else if ([mode isEqualToString: SOGoPasswordRecoverySecondaryEmail]) {
if (mailDomain && username) {
if (username) {
ownerUser = [SOGoUser userWithLogin: username];
dd = [ownerUser domainDefaults];
// Email recovery
// Create email from
fromEmail = [NSString stringWithFormat:@"noreply@%@", mailDomain];
if (mailDomain) {
fromEmail = [NSString stringWithFormat:@"noreply@%@", mailDomain];
} else {
fromEmail = [dd passwordRecoveryFrom];
}
// Get password recovery email
info = [um contactInfosForUserWithUIDorEmail: username];
@@ -887,8 +894,6 @@ static const NSString *kJwtKey = @"jwt";
jwtToken = [um generateAndSavePasswordRecoveryTokenWithUid: uid username: username domain: domain];
// Send mail
ownerUser = [SOGoUser userWithLogin: username];
dd = [ownerUser domainDefaults];
mailer = [SOGoMailer mailerWithDomainDefaults: dd];
url = [NSString stringWithFormat:@"%@%@?token=%@"
, [[request headers] objectForKey:@"origin"]
@@ -922,7 +927,7 @@ static const NSString *kJwtKey = @"jwt";
andString: @"Invalid configuration for email password recovery"];
}
} else {
[self logWithFormat: @"No user domain found for password recovery"];
[self logWithFormat: @"No user found for password recovery"];
response = [self responseWithStatus: 403
andString: @"Invalid configuration for email password recovery"];
}