Skip to content

Commit b96c0a3

Browse files
AB-xdevAB-xdev
authored
Merge pull request #3 from xdev-software/develop
Release
2 parents bc0cd3a + f694f15 commit b96c0a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2814
-43
lines changed

‎.run/Run Demo.run.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Demo" type="Application" factoryName="Application">
33
<option name="MAIN_CLASS_NAME" value="software.xdev.Application" />
4-
<module name="standard-maven-template-demo" />
4+
<module name="spring-security-advanced-authentication-ui-demo" />
55
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
66
<extension name="coverage">
77
<pattern>
@@ -13,4 +13,4 @@
1313
<option name="Make" enabled="true" />
1414
</method>
1515
</configuration>
16-
</component>
16+
</component>

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# 1.0.0
2+
<i>Initial release</i>
3+
* All methods and functionality are designed to be overwritable (at least protected)
4+
* The library consists of 2 main parts:
5+
* ``extendable`` → Includes the bare minimum to make the Spring components extendable
6+
* ``advanced`` → Contains components made on top of ``extendable`` with many customization options; Additionally:
7+
* Updated Bootstrap to version 5.3+
8+
* Improved SSO (OAuth2 / SAML2) UI

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ You should have the following things installed:
3333
* Ensure that the JDK/Java-Version is correct
3434

3535

36-
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/standard-maven-template/release.yml?branch=master)](https://github.com/xdev-software/standard-maven-template/actions/workflows/release.yml)
36+
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/spring-security-advanced-authentication-ui/release.yml?branch=master)](https://github.com/xdev-software/spring-security-advanced-authentication-ui/actions/workflows/release.yml)
3737

3838
Before releasing:
39-
* Consider doing a [test-deployment](https://github.com/xdev-software/standard-maven-template/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
39+
* Consider doing a [test-deployment](https://github.com/xdev-software/spring-security-advanced-authentication-ui/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
4040
* Check the [changelog](CHANGELOG.md)
4141

4242
If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes

‎README.md‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,39 @@
1-
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/standard-maven-template?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/standard-maven-template)
2-
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/standard-maven-template/checkBuild.yml?branch=develop)](https://github.com/xdev-software/standard-maven-template/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
3-
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_standard-maven-template&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_standard-maven-template)
1+
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/spring-security-advanced-authentication-ui?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/spring-security-advanced-authentication-ui)
2+
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/spring-security-advanced-authentication-ui/checkBuild.yml?branch=develop)](https://github.com/xdev-software/spring-security-advanced-authentication-ui/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
3+
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_spring-security-advanced-authentication-ui&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_spring-security-advanced-authentication-ui)
44

5-
# standard-maven-template
5+
# spring-security-advanced-authentication-ui
66

7+
Modernizes the default Spring Web Authentication UI and makes it easier customizable.
8+
9+
<details><summary>Show demo</summary>
10+
11+
<p align="center">
12+
<img src="./assets/demo.png" alt="Demo" />
13+
</p>
14+
15+
</details>
16+
17+
## Usage
18+
19+
The library provides an adapter that can be used like this:
20+
```java
21+
public SecurityFilterChain configure(final HttpSecurity http) throws Exception
22+
{
23+
// Changing the text "Login with" to "Sign in with"
24+
http.with(new AdvancedLoginPageAdapter<>(http), c -> c
25+
.customizeLoginPage(p -> p.ssoLoginHeaderText("Sign in with")))
26+
.oauth2Login(c ->
27+
// ...
28+
)
29+
// ...
30+
}
31+
```
32+
33+
A more detailed scenario is available in the [demo](./spring-security-advanced-authentication-ui-demo/).
734

835
## Installation
9-
[Installation guide for the latest release](https://github.com/xdev-software/standard-maven-template/releases/latest#Installation)
36+
[Installation guide for the latest release](https://github.com/xdev-software/spring-security-advanced-authentication-ui/releases/latest#Installation)
1037

1138

1239
## Support
@@ -16,4 +43,4 @@ If you need support as soon as possible and you can't wait for any pull request,
1643
See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
1744

1845
## Dependencies and Licenses
19-
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/standard-maven-template/dependencies)
46+
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/spring-security-advanced-authentication-ui/dependencies)

‎SECURITY.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
## Reporting a Vulnerability
44

5-
Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/standard-maven-template/security/advisories/new).
5+
Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/spring-security-advanced-authentication-ui/security/advisories/new).

‎assets/demo.png‎

36.9 KB
Loading

‎dev_infra/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oidc-user-config.json

‎dev_infra/README.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
## Development Infrastructure
2+
3+
The infrastructure contains the following:
4+
* [Open ID Connect Mock Server](https://github.com/Soluto/oidc-server-mock) - for login in
5+
* Available at http://localhost:4011
6+
7+
### Setup
8+
* Requires Docker
9+
10+
#### OIDC
11+
* Create ``oidc-user-config.json`` from [``oidc-user-config.json.template``](./oidc-user-config.json.template)
12+
* File should not be tracked in Git
13+
* Fill in your login details like mail, name, password
14+
15+
16+
### Usage
17+
Note: Commands are all executed inside a shell/CMD in the current folder. ([Tip for windows users](https://stackoverflow.com/a/40146208))
18+
19+
| Use case | What to do? |
20+
| --- | --- |
21+
| Starting the infrastructure | ``docker compose up`` |
22+
| Stopping (and removing) the infrastructure | ``docker compose down`` |
23+
| (Re)Building the infrastructure<br/>e.g. after changes to the Dockerfiles | ``docker compose build --pull`` |
24+
25+
See also ``docker compose --help``
26+
27+
### Additional notes
28+
⚠ The containers don't automatically restart after a PC restart!
29+
30+
⚠ After a PC restart the infrastructure is still present but it's stopped.<br/>
31+
In this case you have 2 options:
32+
* start the existing infrastructure again (``docker compose up``) or
33+
* do a clean start by first removing (``docker compose down``) and then starting the infrastructure

‎dev_infra/docker-compose.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
version: "3"
2+
3+
services:
4+
# Docs: https://docs.duendesoftware.com
5+
oidc-server-mock:
6+
container_name: oidc-server-mock
7+
image: ghcr.io/soluto/oidc-server-mock:0.9.0
8+
environment:
9+
ASPNETCORE_ENVIRONMENT: Development
10+
SERVER_OPTIONS_INLINE: |
11+
{
12+
"AccessTokenJwtType": "JWT",
13+
"Discovery": {
14+
"ShowKeySet": true
15+
},
16+
"Authentication": {
17+
"CookieSameSiteMode": "Lax",
18+
"CheckSessionCookieSameSiteMode": "Lax"
19+
}
20+
}
21+
LOGIN_OPTIONS_INLINE: |
22+
{
23+
"AllowRememberLogin": false
24+
}
25+
LOGOUT_OPTIONS_INLINE: |
26+
{
27+
"AutomaticRedirectAfterSignOut": true
28+
}
29+
USERS_CONFIGURATION_PATH: /tmp/config/oidc-user-config.json
30+
CLIENTS_CONFIGURATION_INLINE: |
31+
[
32+
{
33+
"ClientId": "client-id",
34+
"ClientSecrets": [
35+
"client-secret"
36+
],
37+
"Description": "TestClient",
38+
"AllowedGrantTypes": [
39+
"authorization_code",
40+
"refresh_token"
41+
],
42+
"RedirectUris": [
43+
"*"
44+
],
45+
"AllowedScopes": [
46+
"openid",
47+
"profile",
48+
"email",
49+
"offline_access"
50+
],
51+
"AlwaysIncludeUserClaimsInIdToken": true,
52+
"AllowOfflineAccess": true,
53+
"RequirePkce": false
54+
}
55+
]
56+
ASPNET_SERVICES_OPTIONS_INLINE: |
57+
{
58+
"ForwardedHeadersOptions": {
59+
"ForwardedHeaders" : "All"
60+
}
61+
}
62+
volumes:
63+
- ./oidc-user-config.json:/tmp/config/oidc-user-config.json:ro
64+
ports:
65+
- '4011:8080'
66+
deploy:
67+
resources:
68+
limits:
69+
memory: 512m

‎dev_infra/oidc-user-config.json.template‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[
2+
{
3+
"SubjectId":"1",
4+
"Username":"[email protected]",
5+
"Password":"pwd",
6+
"Claims": [
7+
{
8+
"Type": "name",
9+
"Value": "Your name",
10+
"ValueType": "string"
11+
},
12+
{
13+
"Type": "email",
14+
"Value": "[email protected]",
15+
"ValueType": "string"
16+
}
17+
]
18+
}
19+
]

0 commit comments

Comments
 (0)