feat(password-recovery): Fix dictionary with nil value issue. Changed…

… parameter to SOGoPasswordRecoveryEnabled
Alinto · Oct 4, 2022 · c4dd695 · c4dd695
1 parent d5ad0dd
commit c4dd695
Show file tree

Hide file tree

Showing 27 changed files with 30 additions and 28 deletions.
diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc
@@ -786,7 +786,7 @@ Default value is `YES`, or enabled.
 authentication and global address books. Multiple sources can be
 specified as an array of dictionaries.
 
-|S |SOGoPasswordRecovery
+|S |SOGoPasswordRecoveryEnabled
 |Boolean enable password recovery with secret question or secondary e-mail. Only for database user source.
 
 |S |SOGoPasswordRecoveryDomains

diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -757,7 +757,7 @@ - (int) maximumPictureSize
 
 - (BOOL) isPasswordRecoveryEnabled
 {
-  return [self boolForKey: @"SOGoPasswordRecovery"];
+  return [self boolForKey: @"SOGoPasswordRecoveryEnabled"];
 }
 
 - (NSArray *) passwordRecoveryDomains

diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
@@ -984,8 +984,10 @@ - (WOResponse *) passwordRecoveryEnabledAction
           domainName = [[usernameComponents objectAtIndex: 1] lowercaseString];
         }
       }
-
-      result = [NSDictionary dictionaryWithObject: domainName forKey: @"domain"];
+
+      if (domainName) {
+        result = [NSDictionary dictionaryWithObject: domainName forKey: @"domain"];
+      }
   }
 
   passwordRecoveryDomains = [[SOGoSystemDefaults sharedSystemDefaults]

diff --git a/UI/WebServerResources/css/styles.css b/UI/WebServerResources/css/styles.css
diff --git a/UI/WebServerResources/css/styles.css.map b/UI/WebServerResources/css/styles.css.map
diff --git a/UI/WebServerResources/js/Administration.js.map b/UI/WebServerResources/js/Administration.js.map
diff --git a/UI/WebServerResources/js/Administration.services.js.map b/UI/WebServerResources/js/Administration.services.js.map
diff --git a/UI/WebServerResources/js/Common.js b/UI/WebServerResources/js/Common.js
diff --git a/UI/WebServerResources/js/Common.js.map b/UI/WebServerResources/js/Common.js.map
diff --git a/UI/WebServerResources/js/Contacts.js.map b/UI/WebServerResources/js/Contacts.js.map
diff --git a/UI/WebServerResources/js/Contacts.services.js b/UI/WebServerResources/js/Contacts.services.js
diff --git a/UI/WebServerResources/js/Contacts.services.js.map b/UI/WebServerResources/js/Contacts.services.js.map