bug-fix - unable to start app if config file didnt exist

ttodua · Jun 17, 2022 · 8932f03 · 8932f03
1 parent 01918d7
commit 8932f03
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 29 deletions.
diff --git a/WinAuth/Resources/strings.Designer.cs b/WinAuth/Resources/strings.Designer.cs
diff --git a/WinAuth/Resources/strings.de.resx b/WinAuth/Resources/strings.de.resx
@@ -316,7 +316,7 @@ Your code may not be correct</value>
     <value>Auto Refresh</value>
   </data>
   <data name="CannotFindConfigurationFile" xml:space="preserve">
-    <value>Unable to find your configuration file</value>
+    <value>New configuration file was created locally, because an existing configuration file was not found</value>
   </data>
   <data name="CannotLoadAuthenticator" xml:space="preserve">
     <value>Unable to load authenticator from {0}</value>

diff --git a/WinAuth/Resources/strings.resx b/WinAuth/Resources/strings.resx
@@ -132,7 +132,7 @@ Your code may not be correct</value>
     <value>Auto refresh</value>
   </data>
   <data name="CannotFindConfigurationFile" xml:space="preserve">
-    <value>Unable to find your configuration file</value>
+    <value>New configuration file was created locally, because an existing configuration file was not found.</value>
   </data>
   <data name="CannotLoadAuthenticator" xml:space="preserve">
     <value>Unable to load authenticator from {0}</value>

diff --git a/WinAuth/Resources/strings.zh-CN.resx b/WinAuth/Resources/strings.zh-CN.resx
@@ -132,7 +132,7 @@ Your code may not be correct</value>
     <value>自动刷新</value>
   </data>
 	<data name="CannotFindConfigurationFile" xml:space="preserve">
-    <value>无法找到您的配置文件</value>
+    <value>New configuration file was created locally, because an existing configuration file was not found</value>
   </data>
 	<data name="CannotLoadAuthenticator" xml:space="preserve">
     <value>Unable to load authenticator from {0}</value>

diff --git a/WinAuth/WinAuthHelper.cs b/WinAuth/WinAuthHelper.cs
@@ -128,6 +128,15 @@ class WinAuthHelper
 			=dvwu
 			-----END PGP PUBLIC KEY BLOCK-----";
 
+		/// <summary>
+		/// Return location of config file
+		/// </summary>
+		/// <returns>new WinAuthConfig location</returns>
+		public static string portableConfigFile()
+		{
+			return Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), DEFAULT_AUTHENTICATOR_FILE_NAME);
+		}
+
 		/// <summary>
 		/// Return location of config file
 		/// </summary>
@@ -141,7 +150,7 @@ public static string configLocation (string configFile)
 			}
 			if (string.IsNullOrEmpty(configFile) == true) {
 				// check for file in exe directory
-				configFile = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath), DEFAULT_AUTHENTICATOR_FILE_NAME);
+				configFile = portableConfigFile();
 				configFile = File.Exists(configFile) ? configFile : null;
 			}
 			if (string.IsNullOrEmpty(configFile) == true) {
@@ -170,15 +179,17 @@ public static WinAuthConfig LoadConfig(Form form, string configFile, string pass
 			}
 
 			configFile = configLocation(configFile);
-
 			// if no config file when one was specified; report an error
 			if (File.Exists(configFile) == false)
 			{
-				//MessageBox.Show(form,
-				// strings.CannotFindConfigurationFile + ": " + configFile,
-				//  form.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
-				// return config;
-				throw new ApplicationException(strings.CannotFindConfigurationFile + ": " + configFile);
+				if (form.InvokeRequired)
+				{
+					form.Invoke(new Action( () => { WinAuthForm.ErrorDialog(form, strings.CannotFindConfigurationFile, null, MessageBoxButtons.OK); }) );
+				}
+				configFile = portableConfigFile();
+				config.Filename = configFile;
+				SaveConfig(config);
+				//throw new ApplicationException(strings.CannotFindConfigurationFile + ": " + configFile);
 			}
 
 			// check if readonly
@@ -211,7 +222,6 @@ public static WinAuthConfig LoadConfig(Form form, string configFile, string pass
 					changed = config.ReadXml(reader, password);
 				}
 
-				config.Filename = configFile;
 
 				if (config.Version < WinAuthConfig.CURRENTVERSION)
 				{