+ h1 Sign in
block content
- You are already logged in as #{ username }.
+ img(class="header-img" src="/img/success.png" alt="success")
+ p You are already logged in as #{ username }.
| If you are not redirected in few seconds, click here.
- | Otherwise, click here to log off.
+ | Otherwise, click here to log off. diff --git a/server/src/views/errors/401.pug b/server/src/views/errors/401.pug index b0dfae0e9..052b4dc57 100644 --- a/server/src/views/errors/401.pug +++ b/server/src/views/errors/401.pug @@ -4,8 +4,8 @@ block variables - page_classname = "error-401"; block form-header -
+ h1 Error 401
block content
- Please log in to access this resource.
+ img(class="header-img" src="/img/warning.png" alt="warning") + p Please log in to access this resource. diff --git a/server/src/views/errors/403.pug b/server/src/views/errors/403.pug index 605f6f389..b0b77b606 100644 --- a/server/src/views/errors/403.pug +++ b/server/src/views/errors/403.pug @@ -4,8 +4,8 @@ block variables - page_classname = "error-403"; block form-header -
+ h1 Error 403
block content
- You are not authorized to access this resource.
+ img(class="header-img" src="/img/warning.png" alt="warning") + p You are not authorized to access this resource. diff --git a/server/src/views/errors/404.pug b/server/src/views/errors/404.pug index 3228f71a3..06d6375fc 100644 --- a/server/src/views/errors/404.pug +++ b/server/src/views/errors/404.pug @@ -5,7 +5,7 @@ block variables block form-header
block content
- Page not found.
+ img(class="header-img" src="/img/warning.png" alt="warning") + p Page not found. diff --git a/server/src/views/firstfactor.pug b/server/src/views/firstfactor.pug index c7571fb86..373d2f454 100644 --- a/server/src/views/firstfactor.pug +++ b/server/src/views/firstfactor.pug @@ -1,17 +1,20 @@ extends layout/layout.pug +block variables + - page_classname = "firstfactor"; + block form-header -
+ h1 Sign in
block content
-
-
\ No newline at end of file
+ img(class="header-img" src="/img/user.png" alt="user profile")
+ p Enter your credentials to sign in
+ div(class="notification")
+ form(class="form-signin")
+ div(class="form-inputs")
+ input(type="text" class="form-control" id="username" placeholder="Username" required autofocus)
+ input(type="password" class="form-control" id="password" placeholder="Password" required)
+ button(class="btn btn-lg btn-primary btn-block" type="submit") Sign in
+ div(class="bottom-right-links pull-right")
+ a(href=reset_password_request_endpoint, class="link forgot-password") Forgot password?
+ span(class="clearfix")
diff --git a/server/src/views/layout/layout.pug b/server/src/views/layout/layout.pug
index 613f6f052..eaf315aee 100644
--- a/server/src/views/layout/layout.pug
+++ b/server/src/views/layout/layout.pug
@@ -9,24 +9,19 @@ html
link(rel="icon", href="/img/icon.png" type="image/png" sizes="32x32")/
link(rel="stylesheet", type="text/css", href="/css/authelia.css")/
if redirection_url
-
+ meta(http-equiv="refresh" content="4;url=" + redirection_url)
body
- 
+ h1 Registration
block content
- A confirmation email has been sent to your mailbox. Please open it and click on the link within 15 minutes to confirm the registration.
+ img(class="header-img" src="/img/mail.png" alt="mail") + p A confirmation email has been sent to your mailbox. + | Please open it and click on the link within 15 minutes to confirm the registration. diff --git a/server/src/views/password-reset-form.pug b/server/src/views/password-reset-form.pug index a6fd69349..5f14cdbb9 100644 --- a/server/src/views/password-reset-form.pug +++ b/server/src/views/password-reset-form.pug @@ -4,17 +4,15 @@ block variables - page_classname = "password-reset-form"; block form-header -
- Set your new password and confirm it.
+ h1 Reset password block content - - \ No newline at end of file + img(class="header-img" src="/img/password.png" alt="password") + p Set your new password and confirm it. + div(class="notification") + form(class="form-signin") + div(class="form-inputs") + input(class="form-control" type="password" name="password1" id="password1" placeholder="New password" required="required") + input(class="form-control" type="password" name="password2" id="password2" placeholder="Password confirmation" required="required") + button(id="reset-password-button" class="btn btn-lg btn-primary btn-block" type="submit") Reset Password + span(class="clearfix") \ No newline at end of file diff --git a/server/src/views/password-reset-request.pug b/server/src/views/password-reset-request.pug index b72f2e2d3..8236508f1 100644 --- a/server/src/views/password-reset-request.pug +++ b/server/src/views/password-reset-request.pug @@ -4,16 +4,15 @@ block variables - page_classname = "password-reset-request"; block form-header -
- After giving your username, you will receive an email to change your password.
+ h1 Reset password block content - - \ No newline at end of file + div + img(class="header-img" src="/img/password.png" alt="password") + p After giving your username, you will receive an email to change your password. + div(class="notification") + form(class="form-signin") + div(class="form-inputs") + input(type="text" class="form-control" name="username" id="username" placeholder="Your username" required="required") + button(id="reset-password-button" class="btn btn-lg btn-primary btn-block" type="submit") Reset Password + span(class="clearfix") \ No newline at end of file diff --git a/server/src/views/secondfactor.pug b/server/src/views/secondfactor.pug index 03f1817b9..aaabeccb5 100644 --- a/server/src/views/secondfactor.pug +++ b/server/src/views/secondfactor.pug @@ -1,24 +1,30 @@ extends layout/layout.pug +block variables + - page_classname = "secondfactor"; + block form-header -
+ h1 Sign in
block content
- p Hi #{username}, please complete second factor or logout.
-
-
- Open Google Authenticator and add this entry
+ h1 One-time passwords block content + p Open Google Authenticator and add this entry p(id="secret") #{ base32_secret } - p Or scan this barcode + p or scan this barcode div(id="qrcode") #{ otpauth_url } p a(href=login_endpoint, id="login-button") Login @@ -22,4 +22,4 @@ block content img(alt='Get it on Apple Store' src='/img/stores/applestore-badge.svg' class="store-badge") block entrypoint - + script(src="/js/qrcode.min.js") diff --git a/server/src/views/u2f-register.pug b/server/src/views/u2f-register.pug index caca0620c..5e24bc707 100644 --- a/server/src/views/u2f-register.pug +++ b/server/src/views/u2f-register.pug @@ -4,8 +4,8 @@ block variables - page_classname = "u2f-register"; block form-header -Touch the token to register your U2F device.
+ h1 Register your security key block content -
\ No newline at end of file
+ p Touch the token to register your security key.
+ img(src="/img/pendrive.png" alt="pendrive")
\ No newline at end of file
diff --git a/test/features/access-control.feature b/test/features/access-control.feature
index ea484ce99..0051c0ae6 100644
--- a/test/features/access-control.feature
+++ b/test/features/access-control.feature
@@ -5,7 +5,7 @@ Feature: User has access restricted access to domains
When I visit "https://auth.test.local:8080?redirect=https%3A%2F%2Fhome.test.local%3A8080%2F"
And I login with user "john" and password "password"
And I use "REGISTERED" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
And I'm redirected to "https://home.test.local:8080/"
Then I have access to:
| url |
@@ -27,7 +27,7 @@ Feature: User has access restricted access to domains
When I visit "https://auth.test.local:8080?redirect=https%3A%2F%2Fhome.test.local%3A8080%2F"
And I login with user "bob" and password "password"
And I use "REGISTERED" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
And I'm redirected to "https://home.test.local:8080/"
Then I have access to:
| url |
@@ -49,7 +49,7 @@ Feature: User has access restricted access to domains
When I visit "https://auth.test.local:8080?redirect=https%3A%2F%2Fhome.test.local%3A8080%2F"
And I login with user "harry" and password "password"
And I use "REGISTERED" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
And I'm redirected to "https://home.test.local:8080/"
Then I have access to:
| url |
diff --git a/test/features/auth-portal-redirection.feature b/test/features/auth-portal-redirection.feature
index eb7eed132..988c1d09f 100644
--- a/test/features/auth-portal-redirection.feature
+++ b/test/features/auth-portal-redirection.feature
@@ -15,7 +15,7 @@ Feature: User is redirected when factors are already validated
And I'm redirected to "https://auth.test.local:8080/?redirect=https%3A%2F%2Fpublic.test.local%3A8080%2Fsecret.html"
And I login with user "john" and password "password"
And I use "REGISTERED" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
And I'm redirected to "https://public.test.local:8080/secret.html"
And I visit "https://auth.test.local:8080"
Then I'm redirected to "https://auth.test.local:8080/loggedin"
@@ -28,7 +28,7 @@ Feature: User is redirected when factors are already validated
And I'm redirected to "https://auth.test.local:8080/?redirect=https%3A%2F%2Fpublic.test.local%3A8080%2Fsecret.html"
And I login with user "john" and password "password"
And I use "REGISTERED" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
And I'm redirected to "https://public.test.local:8080/secret.html"
And I visit "https://auth.test.local:8080?redirect=https://public.test.local:8080/secret.html"
Then I'm redirected to "https://public.test.local:8080/secret.html"
diff --git a/test/features/authentication.feature b/test/features/authentication.feature
index 11a600fcb..f71794006 100644
--- a/test/features/authentication.feature
+++ b/test/features/authentication.feature
@@ -22,7 +22,7 @@ Feature: Authentication scenarii
And I'm redirected to "https://auth.test.local:8080/?redirect=https%3A%2F%2Fadmin.test.local%3A8080%2Fsecret.html"
And I login with user "john" and password "password"
And I use "Sec0" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
Then I'm redirected to "https://admin.test.local:8080/secret.html"
Scenario: User fails TOTP second factor
@@ -30,7 +30,7 @@ Feature: Authentication scenarii
And I'm redirected to "https://auth.test.local:8080/?redirect=https%3A%2F%2Fadmin.test.local%3A8080%2Fsecret.html"
And I login with user "john" and password "password"
And I use "BADTOKEN" as TOTP token
- And I click on "TOTP"
+ And I click on "Sign in"
Then I get a notification of type "error" with message "Authentication failed. Have you already registered your secret?"
Scenario: Logout redirects user to redirect URL given in parameter
diff --git a/test/features/redirection.feature b/test/features/redirection.feature
index b7d6584fe..19890a464 100644
--- a/test/features/redirection.feature
+++ b/test/features/redirection.feature
@@ -12,7 +12,7 @@ Feature: User is correctly redirected
And I clear field "username"
And I login with user "john" and password "password"
And I use "REGISTERED" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
Then I'm redirected to "https://public.test.local:8080/secret.html"
Scenario: User Harry does not have access to admin domain and thus he must get an error 403
@@ -39,7 +39,7 @@ Feature: User is correctly redirected
When I visit "https://public.test.local:8080/secret.html"
And I login with user "john" and password "password"
And I use "Sec0" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
Then I'm redirected to "https://public.test.local:8080/secret.html"
@need-registered-user-john
@@ -47,5 +47,5 @@ Feature: User is correctly redirected
When I visit "https://auth.test.local:8080"
And I login with user "john" and password "password"
And I use "REGISTERED" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
Then I'm redirected to "https://home.test.local:8080/"
\ No newline at end of file
diff --git a/test/features/regulation.feature b/test/features/regulation.feature
index baac96a2b..fb8b99580 100644
--- a/test/features/regulation.feature
+++ b/test/features/regulation.feature
@@ -35,5 +35,5 @@ Feature: Authelia regulates authentication to avoid brute force
And I set field "password" to "password"
And I click on "Sign in"
And I use "REGISTERED" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
Then I'm redirected to "https://public.test.local:8080/secret.html"
\ No newline at end of file
diff --git a/test/features/resilience.feature b/test/features/resilience.feature
index 0b444c75e..8debd46c1 100644
--- a/test/features/resilience.feature
+++ b/test/features/resilience.feature
@@ -13,5 +13,5 @@ Feature: Authelia keeps user sessions despite the application restart
And I visit "https://admin.test.local:8080/secret.html" and get redirected "https://auth.test.local:8080/?redirect=https%3A%2F%2Fadmin.test.local%3A8080%2Fsecret.html"
And I login with user "john" and password "password"
And I use "REGISTERED" as TOTP token handle
- And I click on "TOTP"
+ And I click on "Sign in"
Then I'm redirected to "https://admin.test.local:8080/secret.html"
\ No newline at end of file
diff --git a/test/features/step_definitions/hooks.ts b/test/features/step_definitions/hooks.ts
index b2ff9f75a..b90192ce2 100644
--- a/test/features/step_definitions/hooks.ts
+++ b/test/features/step_definitions/hooks.ts
@@ -97,7 +97,7 @@ Cucumber.defineSupportCode(function ({ After, Before }) {
return context.useTotpTokenHandle("REGISTERED");
})
.then(function () {
- return context.clickOnButton("TOTP");
+ return context.clickOnButton("Sign in");
});
}
diff --git a/test/features/support/world.ts b/test/features/support/world.ts
index 275135b5f..e75e71f9d 100644
--- a/test/features/support/world.ts
+++ b/test/features/support/world.ts
@@ -164,7 +164,7 @@ function CustomWorld() {
return that.useTotpTokenHandle(totpHandle);
})
.then(function () {
- return that.clickOnButton("TOTP");
+ return that.clickOnButton("Sign in");
});
};
}