keep with "UserName"/"Password"

zhengbw · zhengbw · commit 4d61da0fa02d · 2025-05-09T17:04:07.000+08:00
diff --git a/sample/Startup.cs b/sample/Startup.cs
@@ -46,7 +46,8 @@ public void ConfigureServices(IServiceCollection services)
                 authenticationOptions.AuthScheme = CookieAuthenticationDefaults.AuthenticationScheme;
                 authenticationOptions.SilkierQuartzClaim = "Silkier";
                 authenticationOptions.SilkierQuartzClaimValue = "Quartz";
-            
+                authenticationOptions.UserName = "root";
+                authenticationOptions.Password = "password";
                 authenticationOptions.AccessRequirement = SilkierQuartzAuthenticationOptions.SimpleAccessRequirement.AllowOnlyUsersWithClaim;
             }
 #else 
diff --git a/src/SilkierQuartz/Authorization/SilkierQuartzAuthenticationOptions.cs b/src/SilkierQuartz/Authorization/SilkierQuartzAuthenticationOptions.cs
@@ -21,14 +21,15 @@ public enum SimpleAccessRequirement
 
         public const string AuthorizationPolicyName = "SilkierQuartz";
 
-        public const string DefaultUserName = "admin";
-        public const string DefaultPassword = "password";
+        public string UserName { get; set; } = "admin";
+        public string Password { get; set; } = "password";
 
-        public Func<string, string, bool> Authenticate = (userName, password) =>
+        public Func<string, string, string, string, bool> Authenticate = (reqUserName, 
+            reqPassword, verifyUserName, verifyPassword) =>
         {
             return
-                string.Compare(userName, SilkierQuartzAuthenticationOptions.DefaultUserName, StringComparison.InvariantCulture) == 0 &&
-                string.Compare(password, SilkierQuartzAuthenticationOptions.DefaultPassword, StringComparison.InvariantCulture) == 0;
+                string.Compare(reqUserName, verifyUserName, StringComparison.InvariantCulture) == 0 &&
+                string.Compare(reqPassword, verifyPassword, StringComparison.InvariantCulture) == 0;
         };
 
         /// <summary>
diff --git a/src/SilkierQuartz/Controllers/AuthenticateController.cs b/src/SilkierQuartz/Controllers/AuthenticateController.cs
@@ -41,7 +41,7 @@ public async Task<IActionResult> Login([FromServices] IAuthenticationSchemeProvi
                     !HttpContext.User.HasClaim(authenticationOptions.SilkierQuartzClaim,
                         authenticationOptions.SilkierQuartzClaimValue))
                 {
-                    await SignIn(false, SilkierQuartzAuthenticationOptions.DefaultUserName, SilkierQuartzAuthenticationOptions.DefaultPassword);
+                    await SignIn(false, authenticationOptions.UserName, authenticationOptions.Password);
                     return RedirectToAction(nameof(SchedulerController.Index), nameof(Scheduler));
                 }
                 else
@@ -68,7 +68,9 @@ public async Task<IActionResult> Login([FromServices] IAuthenticationSchemeProvi
         public async Task<IActionResult> Login([FromForm] AuthenticateViewModel request)
         {
             var form = HttpContext.Request.Form;
-            if (!authenticationOptions.Authenticate(request.UserName, request.Password))
+            if (!authenticationOptions.Authenticate(request.UserName, 
+                request.Password, authenticationOptions.UserName, 
+                authenticationOptions.Password))
             {
                 request.IsLoginError = true;
                 return View(request);
@@ -94,11 +96,11 @@ private async Task SignIn(bool isPersistentSignIn, string userName, string passw
             {
                 new Claim(ClaimTypes.NameIdentifier, string.IsNullOrEmpty(userName)
                     ? "SilkierQuartzAdmin"
-                    : SilkierQuartzAuthenticationOptions.DefaultUserName),
+                    : authenticationOptions.UserName),
 
                 new Claim(ClaimTypes.Name, string.IsNullOrEmpty(password)
                     ? "SilkierQuartzPassword"
-                    : SilkierQuartzAuthenticationOptions.DefaultPassword),
+                    : authenticationOptions.Password),
 
                 new Claim(authenticationOptions.SilkierQuartzClaim, authenticationOptions.SilkierQuartzClaimValue)
             };
diff --git a/src/SilkierQuartz/Helpers/HandlebarsHelpers.cs b/src/SilkierQuartz/Helpers/HandlebarsHelpers.cs
@@ -281,6 +281,7 @@ void footer(EncodedTextWriter writer, BlockHelperOptions options, Context contex
                 options.Template(writer, (object)context);
             }
         }
+
         void SilkierQuartzVersion(EncodedTextWriter  output, Context context, Arguments arguments)
         {
             var v = GetType().Assembly.GetCustomAttributes<AssemblyInformationalVersionAttribute>().FirstOrDefault();
@@ -295,11 +296,13 @@ void ProductName(EncodedTextWriter output, Context context, Arguments arguments)
         {
             output.Write(_services.Options.ProductName);
         }
-        void CustomStyleSheet(TextWriter output, dynamic context, params object[] arguments)
+
+        void CustomStyleSheet(EncodedTextWriter output, Context context, Arguments arguments)
         {
             output.Write(_services.Options.CustomStyleSheet);
         }
-        void CustomFavicon(TextWriter output, dynamic context, params object[] arguments)
+
+        void CustomFavicon(EncodedTextWriter output, Context context, Arguments arguments)
         {
             output.Write(_services.Options.CustomFavicon);
         }
diff --git a/src/SilkierQuartz/SilkierQuartzAttribute.cs b/src/SilkierQuartz/SilkierQuartzAttribute.cs
@@ -22,6 +22,7 @@ public SilkierQuartzAttribute(double hours, double minutes, double seconds, stri
         public SilkierQuartzAttribute(double minutes, double seconds, string _identity, string? _group, string _desciption) : this(0, 0, minutes, seconds, 0, 0, _identity, _group, _desciption)
         {
         }
+		
         public SilkierQuartzAttribute(double seconds, string _identity, string? _group, string _desciption) : this(0, 0, 0, seconds, 0, 0, _identity, _group, _desciption)
         {
         }
@@ -37,6 +38,7 @@ public SilkierQuartzAttribute(double hours, double minutes, double seconds) : th
         public SilkierQuartzAttribute(double minutes, double seconds) : this(0, 0, minutes, seconds, 0, 0, null, null, null)
         {
         }
+		
         public SilkierQuartzAttribute(double seconds) : this(0, 0, 0, seconds, 0, 0, null, null, null)
         {
         }
@@ -55,6 +57,7 @@ public SilkierQuartzAttribute(double days, double hours, double minutes, double
                                              + seconds * TimeSpan.TicksPerSecond
                                              + milliseconds + TimeSpan.TicksPerMillisecond));
         }
+		
         public string Desciption { get; set; } = null;
         public string Identity { get; set; } = null;
         public string Group { get; set; } = null;
diff --git a/src/SilkierQuartz/Views/Calendars/Index.hbs b/src/SilkierQuartz/Views/Calendars/Index.hbs
@@ -6,7 +6,7 @@
     <input type="text" placeholder="Search Calendar..." id="search-calendar">
     <i class="search icon"></i>
 </div>
-{{#if ViewBag.EnableEdit }}
+{{#if ViewBag.EnableEdit}}
 <a class="ui right floated primary button" href="{{ActionUrl 'New'}}">
     <i class="plus icon"></i>New
 </a>
diff --git a/src/SilkierQuartz/Views/Jobs/Index.hbs b/src/SilkierQuartz/Views/Jobs/Index.hbs
@@ -21,7 +21,7 @@
         {{/each}}
     </div>
 </div>
-{{#if ViewBag.EnableEdit }}
+{{#if ViewBag.EnableEdit}}
 <a class="ui right floated primary button" href="{{ActionUrl 'New'}}">
     <i class="plus icon"></i>New
 </a>
@@ -65,12 +65,12 @@
 
 <div style="display:none">
     <div class="ui small vertical menu borderless" id="job-context-menu">
-        {{#if ViewBag.EnableEdit }}
+        {{#if ViewBag.EnableEdit}}
         <a class="item menu-edit"><i class="left large blue pencil alternate icon"></i>Edit</a>
         <a class="item menu-copy"><i class="left large clone outline icon"></i>Copy</a>
         {{/if}}
         <a class="item menu-trigger"><i class="left large green play icon"></i>Trigger</a>
-        {{#if ViewBag.EnableEdit }}
+        {{#if ViewBag.EnableEdit}}
         <a class="item menu-delete"><i class="left large red trash alternate outline icon"></i>Delete</a>
         {{/if}}
     </div>
diff --git a/src/SilkierQuartz/Views/Triggers/Index.hbs b/src/SilkierQuartz/Views/Triggers/Index.hbs
@@ -21,7 +21,7 @@
         {{/each}}
     </div>
 </div>
-{{#if ViewBag.EnableEdit }}
+{{#if ViewBag.EnableEdit}}
 <a class="ui right floated primary button" href="{{ActionUrl 'New'}}">
     <i class="plus icon"></i>New
 </a>
@@ -51,8 +51,10 @@
             </td>
             <td class="job-group">{{JobGroup}}</td>
             <td colspan="6" style="text-align: right">
+                {{#if EnableEdit}}
                 <a href="{{ActionUrl 'PauseJob' 'Triggers'}}" class="ui super tiny button btn-pause-all"><i class="pause icon"></i>Pause All</a>
                 <a href="{{ActionUrl 'ResumeJob' 'Triggers'}}" class="ui super tiny button btn-resume-all"><i class="play icon"></i>Resume All</a>
+                {{/if}}
             </td>
         </tr>
         {{/if}}

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,7 @@ void footer(EncodedTextWriter writer, BlockHelperOptions options, Context contex`
`281`	`281`	`options.Template(writer, (object)context);`
`282`	`282`	`}`
`283`	`283`	`}`
	`284`	`+`
`284`	`285`	`void SilkierQuartzVersion(EncodedTextWriter output, Context context, Arguments arguments)`
`285`	`286`	`{`
`286`	`287`	`var v = GetType().Assembly.GetCustomAttributes<AssemblyInformationalVersionAttribute>().FirstOrDefault();`
`@@ -295,11 +296,13 @@ void ProductName(EncodedTextWriter output, Context context, Arguments arguments)`
`295`	`296`	`{`
`296`	`297`	`output.Write(_services.Options.ProductName);`
`297`	`298`	`}`
`298`		`- void CustomStyleSheet(TextWriter output, dynamic context, params object[] arguments)`
	`299`	`+`
	`300`	`+ void CustomStyleSheet(EncodedTextWriter output, Context context, Arguments arguments)`
`299`	`301`	`{`
`300`	`302`	`output.Write(_services.Options.CustomStyleSheet);`
`301`	`303`	`}`
`302`		`- void CustomFavicon(TextWriter output, dynamic context, params object[] arguments)`
	`304`	`+`
	`305`	`+ void CustomFavicon(EncodedTextWriter output, Context context, Arguments arguments)`
`303`	`306`	`{`
`304`	`307`	`output.Write(_services.Options.CustomFavicon);`
`305`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public SilkierQuartzAttribute(double hours, double minutes, double seconds, stri`
`22`	`22`	`public SilkierQuartzAttribute(double minutes, double seconds, string _identity, string? _group, string _desciption) : this(0, 0, minutes, seconds, 0, 0, _identity, _group, _desciption)`
`23`	`23`	`{`
`24`	`24`	`}`
	`25`	`+`
`25`	`26`	`public SilkierQuartzAttribute(double seconds, string _identity, string? _group, string _desciption) : this(0, 0, 0, seconds, 0, 0, _identity, _group, _desciption)`
`26`	`27`	`{`
`27`	`28`	`}`
`@@ -37,6 +38,7 @@ public SilkierQuartzAttribute(double hours, double minutes, double seconds) : th`
`37`	`38`	`public SilkierQuartzAttribute(double minutes, double seconds) : this(0, 0, minutes, seconds, 0, 0, null, null, null)`
`38`	`39`	`{`
`39`	`40`	`}`
	`41`	`+`
`40`	`42`	`public SilkierQuartzAttribute(double seconds) : this(0, 0, 0, seconds, 0, 0, null, null, null)`
`41`	`43`	`{`
`42`	`44`	`}`
`@@ -55,6 +57,7 @@ public SilkierQuartzAttribute(double days, double hours, double minutes, double`
`55`	`57`	`+ seconds * TimeSpan.TicksPerSecond`
`56`	`58`	`+ milliseconds + TimeSpan.TicksPerMillisecond));`
`57`	`59`	`}`
	`60`	`+`
`58`	`61`	`public string Desciption { get; set; } = null;`
`59`	`62`	`public string Identity { get; set; } = null;`
`60`	`63`	`public string Group { get; set; } = null;`