Commit 9ee46e76 authored by Michael Adams's avatar Michael Adams

Found some minor errors in the HTML & code styling

parent c1248b8a
......@@ -4,5 +4,11 @@
"csharpfixformat.style.spaces.afterParenthesis": false,
"csharpfixformat.style.spaces.beforeBracket": false,
"csharpfixformat.style.spaces.beforeParenthesis": false,
"html.format.enable": false
"html.format.enable": false,
"editor.formatOnSave": false,
"editor.formatOnPaste": false,
"htmlhint.options": {
"attr-lowercase": false,
"doctype-first": false
}
}
\ No newline at end of file
<div
fxLayout="column"
fxLayoutAlign="start"
>
<div fxLayout="column" fxLayoutAlign="start">
<h1 mat-dialog-title>{{data.Title}}</h1>
<div mat-dialog-content>
<h3>{{data.Message}}</h3>
</div>
<div
mat-dialog-actions
fxLayoutAlign="end"
>
<button
mat-button
mat-raised-button
color="primary"
(click)="close()"
tabindex="2"
>
<div mat-dialog-actions fxLayoutAlign="end">
<button mat-button mat-raised-button color="primary" (click)="close()" tabindex="2">
Ok
</button>
</div>
</div>
</div>
\ No newline at end of file
<footer
fxLayout="column"
fxLayoutAlign="center center"
fxLayoutGap="10px"
>
<div
fxLayout.xs="column"
fxLayout="row"
fxLayoutAlign="center"
fxLayoutGap="10px"
>
<div
fxLayout="column"
fxLayoutAlign.xs="center center"
fxLayoutAlign="center start"
class="footer-logo"
fxFlex="30"
>
<a
target="_blank"
tabindex="-1"
href="https://github.com/unosquare/passcore"
>
<img
src="assets/images/passcore-logo.png"
alt="PassCore logo"
>
<footer fxLayout="column" fxLayoutAlign="center center" fxLayoutGap="10px">
<div fxLayout.xs="column" fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
<div fxLayout="column" fxLayoutAlign.xs="center center" fxLayoutAlign="center start" class="footer-logo" fxFlex="30">
<a target="_blank" tabindex="-1" href="https://github.com/unosquare/passcore">
<img src="assets/images/passcore-logo.png" alt="PassCore logo">
</a>
</div>
<div
fxLayout="row"
fxLayoutAlign="end center"
fxLayoutAlign.xs="center center"
class="footer-img"
fxFlex="70"
fxLayoutGap="10px"
>
<a
target="_blank"
tabindex="-1"
href="https://opensource.org/"
>
<img
src="assets/images/osi.png"
alt="OSI"
>
<div fxLayout="row" fxLayoutAlign="end center" fxLayoutAlign.xs="center center" class="footer-img" fxFlex="70" fxLayoutGap="10px">
<a target="_blank" tabindex="-1" href="https://opensource.org/">
<img src="assets/images/osi.png" alt="OSI">
</a>
<a
target="_blank"
tabindex="-1"
href="https://opensource.org/licenses/MIT"
>
<img
src="assets/images/License_icon-mit.svg.png"
alt="MIT"
>
<a target="_blank" tabindex="-1" href="https://opensource.org/licenses/MIT">
<img src="assets/images/License_icon-mit.svg.png" alt="MIT">
</a>
<a
target="_blank"
tabindex="-1"
href="http://unosquare.com"
>
<img
src="assets/images/logo.png"
alt="Unosquare"
>
<a target="_blank" tabindex="-1" href="http://unosquare.com">
<img src="assets/images/logo.png" alt="Unosquare">
</a>
</div>
</div>
<div
fxLayout="column"
fxLayoutAlign="center"
>
<div fxLayout="column" fxLayoutAlign="center">
<div class="footer-text">
Powered by PassCore v3.1.0 - Open Source Initiative and MIT Licensed
<br>
Copyright © 2018 Unosquare
<br> Copyright © 2018 Unosquare
</div>
</div>
</footer>
</footer>
\ No newline at end of file
......@@ -9,5 +9,6 @@ export class ChangePasswordForm{
newPasswordVerifyHelpblock:string;
newPasswordVerifyLabel:string;
usernameHelpblock:string;
usernameDefaultDomainHelperBlock:string;
usernameLabel:string;
}
\ No newline at end of file
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ng="http://angularjs.org/"
lang="en"
>
<!DOCTYPE html>
<html lang="en">
<head>
<!--Change the following line to suit your redirection needs-->
<base href="/">
<meta charset="utf-8">
<meta
http-equiv="X-UA-Compatible"
content="IE=edge"
>
<meta
name="viewport"
content="width=device-width, initial-scale=1"
>
<meta
name="keywords"
content="unosquare, oss software, password change, active directory, mit license, password, account utilities, user account"
>
<meta
name="MobileOptimized"
content="320"
>
<meta
name="description"
content="PassCore is a self-service password change utility for Active Directory."
>
<meta
name="author"
content="Unosquare, LLC"
>
<meta
name="title"
content="PassCore"
>
<meta
name="theme-color"
content="#3f51b5"
>
<meta
name="msapplication-navbutton-color"
content="#3f51b5"
>
<meta
name="apple-mobile-web-app-status-bar-style"
content="#3f51b5"
>
<meta
property="og:image"
content="assets/images/passcore-logo.png"
>
<meta
property="og:title"
content="PassCore - Self-Service Password Change Utility"
>
<head>
<!-- Change the following line to suit your redirection needs -->
<base href="/">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="keywords" content="unosquare, oss software, password change, active directory, mit license, password, account utilities, user account">
<meta name="MobileOptimized" content="320">
<meta name="description" content="PassCore is a self-service password change utility for Active Directory.">
<meta name="author" content="Unosquare, LLC">
<meta name="title" content="PassCore">
<meta name="theme-color" content="#3f51b5">
<meta name="msapplication-navbutton-color" content="#3f51b5">
<meta name="apple-mobile-web-app-status-bar-style" content="#3f51b5">
<meta property="og:image" content="assets/images/passcore-logo.png">
<meta property="og:title" content="PassCore - Self-Service Password Change Utility">
<link href="manifest.json" rel="manifest">
<link href="manifest.json" rel="manifest">
<title>Loading . . .</title>
<style>
<title>Loading . . .</title>
<style>
@font-face {
font-family: 'Roboto';
font-style: normal;
......@@ -77,13 +38,13 @@
}
</style>
<link href="assets/styles/indigo-pink.css" rel="stylesheet" type="text/css">
<link href="assets/favicon.ico" rel="shortcut icon">
</head>
<link href="assets/styles/indigo-pink.css" rel="stylesheet" type="text/css">
<link href="assets/favicon.ico" rel="shortcut icon">
</head>
<body>
<app-root>
<style>
<body>
<app-root>
<style>
app-root {
font-family: 'Roboto', sans-serif;
display: flex;
......@@ -114,12 +75,12 @@
animation-delay: 1s;
}
</style>
Loading Pass
<strong class="core">core</strong>
<span class="d">.</span>
<span class="d d-2">.</span>
<span class="d d-3">.</span>
</app-root>
</body>
Loading Pass
<strong class="core">core</strong>
<span class="d">.</span>
<span class="d d-2">.</span>
<span class="d d-3">.</span>
</app-root>
</body>
</html>
</html>
\ No newline at end of file
......@@ -6,7 +6,12 @@
// Sonar-Codacy thought we needed a static method here; and suggested dual default nulls was pointless.
internal class DebugPasswordChangeProvider : IPasswordChangeProvider
{
static ApiErrorItem PerformPasswordChange(ChangePasswordModel model)
ApiErrorItem IPasswordChangeProvider.PerformPasswordChange(ChangePasswordModel model)
{
return DebugPasswordChangeProvider.PerformPasswordChange(model);
}
protected static ApiErrorItem PerformPasswordChange(ChangePasswordModel model)
{
var username = model.Username.Substring(0, model.Username.IndexOf("@"));
switch (username)
......@@ -19,9 +24,5 @@
return null;
}
}
ApiErrorItem IPasswordChangeProvider.PerformPasswordChange(ChangePasswordModel model)
{
return DebugPasswordChangeProvider.PerformPasswordChange(model);
}
}
}
}
\ No newline at end of file
......@@ -36,22 +36,22 @@ namespace Unosquare.PassCore.Web.Helpers
}
// Validate user credentials
if (principalContext.ValidateCredentials(model.Username, model.CurrentPassword) == false)
if (principalContext.ValidateCredentials(model.Username, model.CurrentPassword)== false)
{
// Your new authenticate code snippet
// Check for default domain: if none given, ensure EFLD can be used as an override.
var token = IntPtr.Zero;
var parts = userPrincipal.UserPrincipalName.Split(new[] { '@' }, StringSplitOptions.RemoveEmptyEntries);
string emailFormatLogonDomain = (parts.Length > 1 ? parts[1] : null);
string emailFormatLogonDomain = parts.Length > 1 ? parts[1] : null;
string defaultDomain = _options.ClientSettings.DefaultDomain;
string domain = "";
string domain = string.Empty;
// Domain-determinance
if (String.IsNullOrEmpty(emailFormatLogonDomain) && String.IsNullOrEmpty(defaultDomain))
if (String.IsNullOrEmpty(emailFormatLogonDomain)&& String.IsNullOrEmpty(defaultDomain))
{
return new ApiErrorItem { ErrorType = ApiErrorType.GeneralFailure, ErrorCode = ApiErrorCode.InvalidDomain, Message = _options.ClientSettings.Alerts.ErrorInvalidDomain };
}
else if(String.IsNullOrEmpty(defaultDomain))
else if (String.IsNullOrEmpty(defaultDomain))
{
domain = emailFormatLogonDomain;
}
......
......@@ -48,6 +48,7 @@ namespace Unosquare.PassCore.Web.Models
public string NewPasswordLabel { get; set; }
public string NewPasswordVerifyHelpblock { get; set; }
public string NewPasswordVerifyLabel { get; set; }
public string UsernameDefaultDomainHelperBlock { get; set; }
public string UsernameHelpblock { get; set; }
public string UsernameLabel { get; set; }
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment