Merge pull request #14 from ahwm/develop

ahwm · web-flow · commit a67d35a6953e · 2020-03-05T17:15:39.000-07:00
Fixed a few references, fixed SVN calls
diff --git a/src/SvnManager.WebUI/Bootstrapper.cs b/src/SvnManager.WebUI/Bootstrapper.cs
@@ -19,6 +19,11 @@ public class Bootstrapper: DefaultNancyBootstrapper
         protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
         {
             base.ApplicationStartup(container, pipelines);
+            pipelines.OnError += (ctx, ex) =>
+            {
+                Notification.SendError(ex);
+                return null;
+            };
             //CookieBasedSessions.Enable(pipelines);
 
             //var cryptographyConfiguration = new CryptographyConfiguration(new RijndaelEncryptionProvider(new PassphraseKeyGenerator("k60S3wal**7I2IVD$n1V", new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 })), new DefaultHmacProvider(new PassphraseKeyGenerator("51t!1w2DH^Ge$iR8G^4w", new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 })));
@@ -53,7 +58,7 @@ void OnConfigurationBuilder(NancyInternalConfiguration x)
         protected override void ConfigureApplicationContainer(TinyIoCContainer container)
         {
             base.ConfigureApplicationContainer(container);
-            ResourceViewLocationProvider.RootNamespaces.Add(Assembly.GetAssembly(typeof(RepositoriesModule)), "SvnManager.Api.Views");
+            ResourceViewLocationProvider.RootNamespaces.Add(Assembly.GetAssembly(typeof(RepositoriesModule)), "SvnManager.WebUI.Views");
         }
     }
 }
diff --git a/src/SvnManager.WebUI/Code/SvnBaseModule.cs b/src/SvnManager.WebUI/Code/SvnBaseModule.cs
@@ -0,0 +1,25 @@
+﻿using Nancy;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SvnManager.WebUI.Code
+{
+    /// <summary>
+    /// Base module class that inherits from NancyModule but includes basic common properties
+    /// </summary>
+    public class SvnBaseModule : NancyModule
+    {
+        protected static string RepoPath => ConfigurationManager.AppSettings["Manager.RepoPath"];
+        protected static string SvnLocation => ConfigurationManager.AppSettings["SvnLocation"];
+
+        public SvnBaseModule(string modulePath) : base(modulePath)
+        { }
+
+        public SvnBaseModule() : base()
+        { }
+    }
+}
diff --git a/src/SvnManager.WebUI/MainModule.cs b/src/SvnManager.WebUI/MainModule.cs
@@ -1,7 +1,7 @@
 ﻿using Nancy;
+using SvnManager.WebUI.Code;
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -10,10 +10,8 @@
 
 namespace SvnManager.WebUI
 {
-    public class MainModule : NancyModule
+    public class MainModule : SvnBaseModule
     {
-        private static string RepoPath => ConfigurationManager.AppSettings["Manager.RepoPath"];
-        private static string SvnLocation => ConfigurationManager.AppSettings["SvnLocation"];
         public MainModule()
         {
             Get["/"] = x =>
@@ -59,33 +57,34 @@ private void CreateRepo(string name)
         {
             using (Process p = new Process())
             {
-                p.StartInfo = new ProcessStartInfo($@"{SvnLocation}\svnadmin", $@"create {name}")
+                p.StartInfo = new ProcessStartInfo($@"{SvnLocation}\svnadmin", $@"create {Path.Combine(RepoPath, name)}")
                 {
-                    WorkingDirectory = RepoPath,
+                    UseShellExecute = false,
+                    WorkingDirectory = SvnLocation,
                     RedirectStandardError = true
                 };
                 p.Start();
                 p.WaitForExit();
             }
 
             // This gives all users read/write access
-            string svnAuthz = File.ReadAllText($@"C:\Repositories\{name}\conf\SvnAuthz.ini");
+            string svnAuthz = File.ReadAllText($@"{RepoPath}\{name}\conf\authz");
             svnAuthz += "\r\n\r\n[/]\r\n*=rw";
-            File.WriteAllText($@"C:\Repositories\{name}\conf\SvnAuthz.ini", svnAuthz);
+            File.WriteAllText($@"{RepoPath}\{name}\conf\authz", svnAuthz);
 
             // pre-commit hook to require commit messages
-            using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.Api.SvnHooks.pre-commit.cmd"))
+            using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.WebUI.SvnHooks.pre-commit.cmd"))
             {
-                using (var file = new FileStream($@"C:\Repositories\{name}\hooks\pre-commit.cmd", FileMode.Create, FileAccess.Write))
+                using (var file = new FileStream($@"{RepoPath}\{name}\hooks\pre-commit.cmd", FileMode.Create, FileAccess.Write))
                 {
                     resource.CopyTo(file);
                 }
             }
 
             // pre-revprop-change hook to allow for using svnsync
-            using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.Api.SvnHooks.pre-revprop-change.cmd"))
+            using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.WebUI.SvnHooks.pre-revprop-change.cmd"))
             {
-                using (var file = new FileStream($@"C:\Repositories\{name}\hooks\pre-revprop-change.cmd", FileMode.Create, FileAccess.Write))
+                using (var file = new FileStream($@"{RepoPath}\{name}\hooks\pre-revprop-change.cmd", FileMode.Create, FileAccess.Write))
                 {
                     resource.CopyTo(file);
                 }
diff --git a/src/SvnManager.WebUI/RepositoriesModule.cs b/src/SvnManager.WebUI/RepositoriesModule.cs
@@ -1,18 +1,15 @@
 ﻿using Nancy;
+using SvnManager.WebUI.Code;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 
 namespace SvnManager.WebUI
 {
-    public class RepositoriesModule : NancyModule
+    public class RepositoriesModule : SvnBaseModule
     {
-        private static string RepoPath => ConfigurationManager.AppSettings["Manager.RepoPath"];
-        private static string SvnLocation => ConfigurationManager.AppSettings["SvnLocation"];
-
         public RepositoriesModule() : base("/api/repositories")
         {
             Get["/"] = x =>
@@ -25,33 +22,34 @@ public RepositoriesModule() : base("/api/repositories")
             {
                 using (Process p = new Process())
                 {
-                    p.StartInfo = new ProcessStartInfo($@"{SvnLocation}\svnadmin", $@"create {x.name}")
+                    p.StartInfo = new ProcessStartInfo($@"{SvnLocation}\svnadmin", $@"create {Path.Combine(RepoPath, x.name)}")
                     {
-                        WorkingDirectory = RepoPath,
+                        UseShellExecute = false,
+                        WorkingDirectory = SvnLocation,
                         RedirectStandardError = true
                     };
                     p.Start();
                     p.WaitForExit();
                 }
 
                 // This gives all users read/write access
-                string svnAuthz = File.ReadAllText($@"C:\Repositories\{x.name}\conf\SvnAuthz.ini");
+                string svnAuthz = File.ReadAllText($@"{RepoPath}\{x.name}\conf\authz");
                 svnAuthz += "\r\n\r\n[/]\r\n*=rw";
-                File.WriteAllText($@"C:\Repositories\{x.name}\conf\SvnAuthz.ini", svnAuthz);
+                File.WriteAllText($@"{RepoPath}\{x.name}\conf\authz", svnAuthz);
 
                 // pre-commit hook to require commit messages
-                using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.Api.SvnHooks.pre-commit.cmd"))
+                using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.WebUI.SvnHooks.pre-commit.cmd"))
                 {
-                    using (var file = new FileStream($@"C:\Repositories\{x.name}\hooks\pre-commit.cmd", FileMode.Create, FileAccess.Write))
+                    using (var file = new FileStream($@"{RepoPath}\{x.name}\hooks\pre-commit.cmd", FileMode.Create, FileAccess.Write))
                     {
                         resource.CopyTo(file);
                     }
                 }
 
                 // pre-revprop-change hook to allow for using svnsync
-                using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.Api.SvnHooks.pre-revprop-change.cmd"))
+                using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.WebUI.SvnHooks.pre-revprop-change.cmd"))
                 {
-                    using (var file = new FileStream($@"C:\Repositories\{x.name}\hooks\pre-revprop-change.cmd", FileMode.Create, FileAccess.Write))
+                    using (var file = new FileStream($@"{RepoPath}\{x.name}\hooks\pre-revprop-change.cmd", FileMode.Create, FileAccess.Write))
                     {
                         resource.CopyTo(file);
                     }
diff --git a/src/SvnManager.WebUI/SvnManager.WebUI.csproj b/src/SvnManager.WebUI/SvnManager.WebUI.csproj
@@ -58,6 +58,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bootstrapper.cs" />
+    <Compile Include="Code\SvnBaseModule.cs" />
     <Compile Include="ExcDetails.cs" />
     <Compile Include="MainModule.cs" />
     <Compile Include="NancyHostControl.cs" />
diff --git a/src/SvnManager.WebUI/UserApiModule.cs b/src/SvnManager.WebUI/UserApiModule.cs
@@ -1,5 +1,6 @@
 ﻿using CryptSharp;
 using Nancy;
+using SvnManager.WebUI.Code;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,7 +10,7 @@
 
 namespace SvnManager.WebUI
 {
-    public class UserApiModule : NancyModule
+    public class UserApiModule : SvnBaseModule
     {
         public UserApiModule() : base("/api/user")
         {
diff --git a/src/SvnManager.WebUI/UserModule.cs b/src/SvnManager.WebUI/UserModule.cs
@@ -1,13 +1,13 @@
 ﻿using CryptSharp;
 using Nancy;
+using SvnManager.WebUI.Code;
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.IO;
 
 namespace SvnManager.WebUI
 {
-    public class UserModule : NancyModule
+    public class UserModule : SvnBaseModule
     {
         public UserModule() : base("/user")
         {
@@ -29,9 +29,9 @@ public UserModule() : base("/user")
                     string strPassword = password;
                     string userPasswordHash = Crypter.MD5.Crypt(strPassword, new CrypterOptions { { CrypterOption.Variant, MD5CrypterVariant.Apache } });
 
-                    var pwds = File.ReadAllText($@"{ConfigurationManager.AppSettings["Manger.RepoPath"].TrimEnd('\\')}\htpasswd");
+                    var pwds = File.ReadAllText($@"{RepoPath.TrimEnd('\\')}\htpasswd");
                     pwds += $"{name}:{userPasswordHash}{Environment.NewLine}";
-                    File.WriteAllText($@"{ConfigurationManager.AppSettings["Manger.RepoPath"].TrimEnd('\\')}\htpasswd", pwds);
+                    File.WriteAllText($@"{RepoPath.TrimEnd('\\')}\htpasswd", pwds);
                 }
                 catch (Exception ex)
                 {
@@ -48,8 +48,14 @@ private List<dynamic> GetUsers()
         {
             var users = new List<dynamic>();
 
+            if (!File.Exists($@"{RepoPath.TrimEnd('\\')}\htpasswd"))
+            {
+                File.CreateText($@"{RepoPath.TrimEnd('\\')}\htpasswd");
+                return users;
+            }
+
             string line;
-            using (StreamReader fs = new StreamReader($@"{ConfigurationManager.AppSettings["Manger.RepoPath"].TrimEnd('\\')}\htpasswd"))
+            using (StreamReader fs = new StreamReader($@"{RepoPath.TrimEnd('\\')}\htpasswd"))
             {
                 while ((line = fs.ReadLine()) != null)
                 {
diff --git a/src/SvnManager/SvnManagerService.cs b/src/SvnManager/SvnManagerService.cs
@@ -10,16 +10,16 @@ namespace SvnManager
 {
     public partial class SvnManagerService : ServiceBase
     {
-        private static string Source => ConfigurationManager.AppSettings["Manger.EventSourceName"];
+        private static string Source => ConfigurationManager.AppSettings["Manager.EventSourceName"];
 
         Timer _backupTimer = new Timer(900_000); // check every 15 minutes (reduce time creep)
         BackgroundWorker _worker = new BackgroundWorker();
         NancyHostControl host;
         static ConfigMonitor monitor;
 
-        private string InterfaceUrlHost => ConfigurationManager.AppSettings["Manger.InterfaceUrlHost"];
-        private int InterfaceUrlPort => Convert.ToInt32(ConfigurationManager.AppSettings["Manger.InterfaceUrlPort"]);
-        private bool InterfaceUrlHttps => Convert.ToBoolean(ConfigurationManager.AppSettings["Manger.InterfaceUrlHttps"]);
+        private string InterfaceUrlHost => ConfigurationManager.AppSettings["Manager.InterfaceUrlHost"];
+        private int InterfaceUrlPort => Convert.ToInt32(ConfigurationManager.AppSettings["Manager.InterfaceUrlPort"]);
+        private bool InterfaceUrlHttps => Convert.ToBoolean(ConfigurationManager.AppSettings["Manager.InterfaceUrlHttps"]);
 
         public SvnManagerService()
         {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,11 @@ public class Bootstrapper: DefaultNancyBootstrapper`
`19`	`19`	`protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)`
`20`	`20`	`{`
`21`	`21`	`base.ApplicationStartup(container, pipelines);`
	`22`	`+ pipelines.OnError += (ctx, ex) =>`
	`23`	`+ {`
	`24`	`+ Notification.SendError(ex);`
	`25`	`+ return null;`
	`26`	`+ };`
`22`	`27`	`//CookieBasedSessions.Enable(pipelines);`
`23`	`28`
`24`	`29`	`//var cryptographyConfiguration = new CryptographyConfiguration(new RijndaelEncryptionProvider(new PassphraseKeyGenerator("k60S3wal**7I2IVD$n1V", new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 })), new DefaultHmacProvider(new PassphraseKeyGenerator("51t!1w2DH^Ge$iR8G^4w", new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 })));`
`@@ -53,7 +58,7 @@ void OnConfigurationBuilder(NancyInternalConfiguration x)`
`53`	`58`	`protected override void ConfigureApplicationContainer(TinyIoCContainer container)`
`54`	`59`	`{`
`55`	`60`	`base.ConfigureApplicationContainer(container);`
`56`		`- ResourceViewLocationProvider.RootNamespaces.Add(Assembly.GetAssembly(typeof(RepositoriesModule)), "SvnManager.Api.Views");`
	`61`	`+ ResourceViewLocationProvider.RootNamespaces.Add(Assembly.GetAssembly(typeof(RepositoriesModule)), "SvnManager.WebUI.Views");`
`57`	`62`	`}`
`58`	`63`	`}`
`59`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using Nancy;`
	`2`	`+using SvnManager.WebUI.Code;`
`2`	`3`	`using System;`
`3`	`4`	`using System.Collections.Generic;`
`4`		`-using System.Configuration;`
`5`	`5`	`using System.Diagnostics;`
`6`	`6`	`using System.IO;`
`7`	`7`	`using System.Linq;`
`@@ -10,10 +10,8 @@`
`10`	`10`
`11`	`11`	`namespace SvnManager.WebUI`
`12`	`12`	`{`
`13`		`- public class MainModule : NancyModule`
	`13`	`+ public class MainModule : SvnBaseModule`
`14`	`14`	`{`
`15`		`- private static string RepoPath => ConfigurationManager.AppSettings["Manager.RepoPath"];`
`16`		`- private static string SvnLocation => ConfigurationManager.AppSettings["SvnLocation"];`
`17`	`15`	`public MainModule()`
`18`	`16`	`{`
`19`	`17`	`Get["/"] = x =>`
`@@ -59,33 +57,34 @@ private void CreateRepo(string name)`
`59`	`57`	`{`
`60`	`58`	`using (Process p = new Process())`
`61`	`59`	`{`
`62`		`- p.StartInfo = new ProcessStartInfo($@"{SvnLocation}\svnadmin", $@"create {name}")`
	`60`	`+ p.StartInfo = new ProcessStartInfo($@"{SvnLocation}\svnadmin", $@"create {Path.Combine(RepoPath, name)}")`
`63`	`61`	`{`
`64`		`- WorkingDirectory = RepoPath,`
	`62`	`+ UseShellExecute = false,`
	`63`	`+ WorkingDirectory = SvnLocation,`
`65`	`64`	`RedirectStandardError = true`
`66`	`65`	`};`
`67`	`66`	`p.Start();`
`68`	`67`	`p.WaitForExit();`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`// This gives all users read/write access`
`72`		`- string svnAuthz = File.ReadAllText($@"C:\Repositories\{name}\conf\SvnAuthz.ini");`
	`71`	`+ string svnAuthz = File.ReadAllText($@"{RepoPath}\{name}\conf\authz");`
`73`	`72`	`svnAuthz += "\r\n\r\n[/]\r\n*=rw";`
`74`		`- File.WriteAllText($@"C:\Repositories\{name}\conf\SvnAuthz.ini", svnAuthz);`
	`73`	`+ File.WriteAllText($@"{RepoPath}\{name}\conf\authz", svnAuthz);`
`75`	`74`
`76`	`75`	`// pre-commit hook to require commit messages`
`77`		`- using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.Api.SvnHooks.pre-commit.cmd"))`
	`76`	`+ using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.WebUI.SvnHooks.pre-commit.cmd"))`
`78`	`77`	`{`
`79`		`- using (var file = new FileStream($@"C:\Repositories\{name}\hooks\pre-commit.cmd", FileMode.Create, FileAccess.Write))`
	`78`	`+ using (var file = new FileStream($@"{RepoPath}\{name}\hooks\pre-commit.cmd", FileMode.Create, FileAccess.Write))`
`80`	`79`	`{`
`81`	`80`	`resource.CopyTo(file);`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`// pre-revprop-change hook to allow for using svnsync`
`86`		`- using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.Api.SvnHooks.pre-revprop-change.cmd"))`
	`85`	`+ using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.WebUI.SvnHooks.pre-revprop-change.cmd"))`
`87`	`86`	`{`
`88`		`- using (var file = new FileStream($@"C:\Repositories\{name}\hooks\pre-revprop-change.cmd", FileMode.Create, FileAccess.Write))`
	`87`	`+ using (var file = new FileStream($@"{RepoPath}\{name}\hooks\pre-revprop-change.cmd", FileMode.Create, FileAccess.Write))`
`89`	`88`	`{`
`90`	`89`	`resource.CopyTo(file);`
`91`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,15 @@`
`1`	`1`	`using Nancy;`
	`2`	`+using SvnManager.WebUI.Code;`
`2`	`3`	`using System.Collections.Generic;`
`3`		`-using System.Configuration;`
`4`	`4`	`using System.Diagnostics;`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using System.Reflection;`
`8`	`8`
`9`	`9`	`namespace SvnManager.WebUI`
`10`	`10`	`{`
`11`		`- public class RepositoriesModule : NancyModule`
	`11`	`+ public class RepositoriesModule : SvnBaseModule`
`12`	`12`	`{`
`13`		`- private static string RepoPath => ConfigurationManager.AppSettings["Manager.RepoPath"];`
`14`		`- private static string SvnLocation => ConfigurationManager.AppSettings["SvnLocation"];`
`15`		`-`
`16`	`13`	`public RepositoriesModule() : base("/api/repositories")`
`17`	`14`	`{`
`18`	`15`	`Get["/"] = x =>`
`@@ -25,33 +22,34 @@ public RepositoriesModule() : base("/api/repositories")`
`25`	`22`	`{`
`26`	`23`	`using (Process p = new Process())`
`27`	`24`	`{`
`28`		`- p.StartInfo = new ProcessStartInfo($@"{SvnLocation}\svnadmin", $@"create {x.name}")`
	`25`	`+ p.StartInfo = new ProcessStartInfo($@"{SvnLocation}\svnadmin", $@"create {Path.Combine(RepoPath, x.name)}")`
`29`	`26`	`{`
`30`		`- WorkingDirectory = RepoPath,`
	`27`	`+ UseShellExecute = false,`
	`28`	`+ WorkingDirectory = SvnLocation,`
`31`	`29`	`RedirectStandardError = true`
`32`	`30`	`};`
`33`	`31`	`p.Start();`
`34`	`32`	`p.WaitForExit();`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`// This gives all users read/write access`
`38`		`- string svnAuthz = File.ReadAllText($@"C:\Repositories\{x.name}\conf\SvnAuthz.ini");`
	`36`	`+ string svnAuthz = File.ReadAllText($@"{RepoPath}\{x.name}\conf\authz");`
`39`	`37`	`svnAuthz += "\r\n\r\n[/]\r\n*=rw";`
`40`		`- File.WriteAllText($@"C:\Repositories\{x.name}\conf\SvnAuthz.ini", svnAuthz);`
	`38`	`+ File.WriteAllText($@"{RepoPath}\{x.name}\conf\authz", svnAuthz);`
`41`	`39`
`42`	`40`	`// pre-commit hook to require commit messages`
`43`		`- using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.Api.SvnHooks.pre-commit.cmd"))`
	`41`	`+ using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.WebUI.SvnHooks.pre-commit.cmd"))`
`44`	`42`	`{`
`45`		`- using (var file = new FileStream($@"C:\Repositories\{x.name}\hooks\pre-commit.cmd", FileMode.Create, FileAccess.Write))`
	`43`	`+ using (var file = new FileStream($@"{RepoPath}\{x.name}\hooks\pre-commit.cmd", FileMode.Create, FileAccess.Write))`
`46`	`44`	`{`
`47`	`45`	`resource.CopyTo(file);`
`48`	`46`	`}`
`49`	`47`	`}`
`50`	`48`
`51`	`49`	`// pre-revprop-change hook to allow for using svnsync`
`52`		`- using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.Api.SvnHooks.pre-revprop-change.cmd"))`
	`50`	`+ using (var resource = Assembly.GetExecutingAssembly().GetManifestResourceStream("SvnManager.WebUI.SvnHooks.pre-revprop-change.cmd"))`
`53`	`51`	`{`
`54`		`- using (var file = new FileStream($@"C:\Repositories\{x.name}\hooks\pre-revprop-change.cmd", FileMode.Create, FileAccess.Write))`
	`52`	`+ using (var file = new FileStream($@"{RepoPath}\{x.name}\hooks\pre-revprop-change.cmd", FileMode.Create, FileAccess.Write))`
`55`	`53`	`{`
`56`	`54`	`resource.CopyTo(file);`
`57`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using CryptSharp;`
`2`	`2`	`using Nancy;`
	`3`	`+using SvnManager.WebUI.Code;`
`3`	`4`	`using System;`
`4`	`5`	`using System.Collections.Generic;`
`5`	`6`	`using System.IO;`
`@@ -9,7 +10,7 @@`
`9`	`10`
`10`	`11`	`namespace SvnManager.WebUI`
`11`	`12`	`{`
`12`		`- public class UserApiModule : NancyModule`
	`13`	`+ public class UserApiModule : SvnBaseModule`
`13`	`14`	`{`
`14`	`15`	`public UserApiModule() : base("/api/user")`
`15`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`using CryptSharp;`
`2`	`2`	`using Nancy;`
	`3`	`+using SvnManager.WebUI.Code;`
`3`	`4`	`using System;`
`4`	`5`	`using System.Collections.Generic;`
`5`		`-using System.Configuration;`
`6`	`6`	`using System.IO;`
`7`	`7`
`8`	`8`	`namespace SvnManager.WebUI`
`9`	`9`	`{`
`10`		`- public class UserModule : NancyModule`
	`10`	`+ public class UserModule : SvnBaseModule`
`11`	`11`	`{`
`12`	`12`	`public UserModule() : base("/user")`
`13`	`13`	`{`
`@@ -29,9 +29,9 @@ public UserModule() : base("/user")`
`29`	`29`	`string strPassword = password;`
`30`	`30`	`string userPasswordHash = Crypter.MD5.Crypt(strPassword, new CrypterOptions { { CrypterOption.Variant, MD5CrypterVariant.Apache } });`
`31`	`31`
`32`		`- var pwds = File.ReadAllText($@"{ConfigurationManager.AppSettings["Manger.RepoPath"].TrimEnd('\\')}\htpasswd");`
	`32`	`+ var pwds = File.ReadAllText($@"{RepoPath.TrimEnd('\\')}\htpasswd");`
`33`	`33`	`pwds += $"{name}:{userPasswordHash}{Environment.NewLine}";`
`34`		`- File.WriteAllText($@"{ConfigurationManager.AppSettings["Manger.RepoPath"].TrimEnd('\\')}\htpasswd", pwds);`
	`34`	`+ File.WriteAllText($@"{RepoPath.TrimEnd('\\')}\htpasswd", pwds);`
`35`	`35`	`}`
`36`	`36`	`catch (Exception ex)`
`37`	`37`	`{`
`@@ -48,8 +48,14 @@ private List<dynamic> GetUsers()`
`48`	`48`	`{`
`49`	`49`	`var users = new List<dynamic>();`
`50`	`50`
	`51`	`+ if (!File.Exists($@"{RepoPath.TrimEnd('\\')}\htpasswd"))`
	`52`	`+ {`
	`53`	`+ File.CreateText($@"{RepoPath.TrimEnd('\\')}\htpasswd");`
	`54`	`+ return users;`
	`55`	`+ }`
	`56`	`+`
`51`	`57`	`string line;`
`52`		`- using (StreamReader fs = new StreamReader($@"{ConfigurationManager.AppSettings["Manger.RepoPath"].TrimEnd('\\')}\htpasswd"))`
	`58`	`+ using (StreamReader fs = new StreamReader($@"{RepoPath.TrimEnd('\\')}\htpasswd"))`
`53`	`59`	`{`
`54`	`60`	`while ((line = fs.ReadLine()) != null)`
`55`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,16 +10,16 @@ namespace SvnManager`
`10`	`10`	`{`
`11`	`11`	`public partial class SvnManagerService : ServiceBase`
`12`	`12`	`{`
`13`		`- private static string Source => ConfigurationManager.AppSettings["Manger.EventSourceName"];`
	`13`	`+ private static string Source => ConfigurationManager.AppSettings["Manager.EventSourceName"];`
`14`	`14`
`15`	`15`	`Timer _backupTimer = new Timer(900_000); // check every 15 minutes (reduce time creep)`
`16`	`16`	`BackgroundWorker _worker = new BackgroundWorker();`
`17`	`17`	`NancyHostControl host;`
`18`	`18`	`static ConfigMonitor monitor;`
`19`	`19`
`20`		`- private string InterfaceUrlHost => ConfigurationManager.AppSettings["Manger.InterfaceUrlHost"];`
`21`		`- private int InterfaceUrlPort => Convert.ToInt32(ConfigurationManager.AppSettings["Manger.InterfaceUrlPort"]);`
`22`		`- private bool InterfaceUrlHttps => Convert.ToBoolean(ConfigurationManager.AppSettings["Manger.InterfaceUrlHttps"]);`
	`20`	`+ private string InterfaceUrlHost => ConfigurationManager.AppSettings["Manager.InterfaceUrlHost"];`
	`21`	`+ private int InterfaceUrlPort => Convert.ToInt32(ConfigurationManager.AppSettings["Manager.InterfaceUrlPort"]);`
	`22`	`+ private bool InterfaceUrlHttps => Convert.ToBoolean(ConfigurationManager.AppSettings["Manager.InterfaceUrlHttps"]);`
`23`	`23`
`24`	`24`	`public SvnManagerService()`
`25`	`25`	`{`