Skip to content

Commit 3264ca2

Browse files
authored
Merge pull request #14 from fireflyframework/chore/migrate-to-security-idp
refactor!: migrate idp tier into the security family (security-idp)
2 parents 5a200d5 + ecd8a95 commit 3264ca2

36 files changed

Lines changed: 79 additions & 79 deletions

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Firefly Framework - Identity Provider (IDP)
22

3-
[![CI](https://github.com/fireflyframework/fireflyframework-idp/actions/workflows/ci.yml/badge.svg)](https://github.com/fireflyframework/fireflyframework-idp/actions/workflows/ci.yml)
3+
[![CI](https://github.com/fireflyframework/fireflyframework-security-idp/actions/workflows/ci.yml/badge.svg)](https://github.com/fireflyframework/fireflyframework-security-idp/actions/workflows/ci.yml)
44
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
55
[![Java](https://img.shields.io/badge/Java-21%2B-orange.svg)](https://openjdk.org)
66
[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.x-green.svg)](https://spring.io/projects/spring-boot)
@@ -39,10 +39,10 @@ The concrete provider is selected at runtime with the `firefly.idp.provider` pro
3939

4040
| Provider value | Adapter module | Backend |
4141
| --- | --- | --- |
42-
| `keycloak` | [`fireflyframework-idp-keycloak`](https://github.com/fireflyframework/fireflyframework-idp-keycloak) | Keycloak Admin API + token endpoint |
43-
| `cognito` | [`fireflyframework-idp-aws-cognito`](https://github.com/fireflyframework/fireflyframework-idp-aws-cognito) | AWS Cognito User Pools |
44-
| `azure-ad` | [`fireflyframework-idp-azure-ad`](https://github.com/fireflyframework/fireflyframework-idp-azure-ad) | Microsoft Entra ID (Azure AD) |
45-
| `internal-db` | [`fireflyframework-idp-internal-db`](https://github.com/fireflyframework/fireflyframework-idp-internal-db) | Local database-backed identity store |
42+
| `keycloak` | [`fireflyframework-security-idp-keycloak`](https://github.com/fireflyframework/fireflyframework-security-idp-keycloak) | Keycloak Admin API + token endpoint |
43+
| `cognito` | [`fireflyframework-security-idp-aws-cognito`](https://github.com/fireflyframework/fireflyframework-security-idp-aws-cognito) | AWS Cognito User Pools |
44+
| `azure-ad` | [`fireflyframework-security-idp-azure-ad`](https://github.com/fireflyframework/fireflyframework-security-idp-azure-ad) | Microsoft Entra ID (Azure AD) |
45+
| `internal-db` | [`fireflyframework-security-idp-internal-db`](https://github.com/fireflyframework/fireflyframework-security-idp-internal-db) | Local database-backed identity store |
4646

4747
## Features
4848

@@ -74,13 +74,13 @@ Add the core abstraction together with exactly one provider adapter. The version
7474
<!-- Core IDP abstraction (this module) -->
7575
<dependency>
7676
<groupId>org.fireflyframework</groupId>
77-
<artifactId>fireflyframework-idp</artifactId>
77+
<artifactId>fireflyframework-security-idp</artifactId>
7878
</dependency>
7979

8080
<!-- Choose one provider adapter -->
8181
<dependency>
8282
<groupId>org.fireflyframework</groupId>
83-
<artifactId>fireflyframework-idp-keycloak</artifactId>
83+
<artifactId>fireflyframework-security-idp-keycloak</artifactId>
8484
</dependency>
8585
</dependencies>
8686
```
@@ -90,7 +90,7 @@ If you are not inheriting the Firefly parent, pin the version explicitly:
9090
```xml
9191
<dependency>
9292
<groupId>org.fireflyframework</groupId>
93-
<artifactId>fireflyframework-idp</artifactId>
93+
<artifactId>fireflyframework-security-idp</artifactId>
9494
<version>26.05.08</version>
9595
</dependency>
9696
```
@@ -110,8 +110,8 @@ With the chosen adapter on the classpath, its `IdpAdapter` bean is auto-configur
110110
**2. Or consume the `IdpAdapter` directly** from your own services:
111111

112112
```java
113-
import org.fireflyframework.idp.adapter.IdpAdapter;
114-
import org.fireflyframework.idp.dtos.*;
113+
import org.fireflyframework.security.idp.adapter.IdpAdapter;
114+
import org.fireflyframework.security.idp.dtos.*;
115115
import org.springframework.http.ResponseEntity;
116116
import org.springframework.stereotype.Service;
117117
import reactor.core.publisher.Mono;
@@ -207,7 +207,7 @@ Adapters wrap their authentication calls with `IdpMetrics.timedAuthentication(pr
207207
## Documentation
208208

209209
- Firefly Framework documentation hub and module catalog: [github.com/fireflyframework](https://github.com/fireflyframework)
210-
- Provider adapters: [Keycloak](https://github.com/fireflyframework/fireflyframework-idp-keycloak) · [AWS Cognito](https://github.com/fireflyframework/fireflyframework-idp-aws-cognito) · [Azure AD](https://github.com/fireflyframework/fireflyframework-idp-azure-ad) · [Internal DB](https://github.com/fireflyframework/fireflyframework-idp-internal-db)
210+
- Provider adapters: [Keycloak](https://github.com/fireflyframework/fireflyframework-security-idp-keycloak) · [AWS Cognito](https://github.com/fireflyframework/fireflyframework-security-idp-aws-cognito) · [Azure AD](https://github.com/fireflyframework/fireflyframework-security-idp-azure-ad) · [Internal DB](https://github.com/fireflyframework/fireflyframework-security-idp-internal-db)
211211

212212
## Contributing
213213

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<relativePath/>
1212
</parent>
1313

14-
<artifactId>fireflyframework-idp</artifactId>
14+
<artifactId>fireflyframework-security-idp</artifactId>
1515
<version>26.06.01</version>
1616
<packaging>jar</packaging>
1717

src/main/java/org/fireflyframework/idp/adapter/IdpAdapter.java renamed to src/main/java/org/fireflyframework/security/idp/adapter/IdpAdapter.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
*/
1616

1717

18-
package org.fireflyframework.idp.adapter;
18+
package org.fireflyframework.security.idp.adapter;
1919

20-
import org.fireflyframework.idp.dtos.CreateUserRequest;
21-
import org.fireflyframework.idp.dtos.CreateUserResponse;
22-
import org.fireflyframework.idp.dtos.RegisterUserRequest;
23-
import org.fireflyframework.idp.port.AuthenticationPort;
24-
import org.fireflyframework.idp.port.MfaPort;
25-
import org.fireflyframework.idp.port.RoleScopePort;
26-
import org.fireflyframework.idp.port.SessionPort;
27-
import org.fireflyframework.idp.port.TokenIntrospectionPort;
28-
import org.fireflyframework.idp.port.UserAdminPort;
20+
import org.fireflyframework.security.idp.dtos.CreateUserRequest;
21+
import org.fireflyframework.security.idp.dtos.CreateUserResponse;
22+
import org.fireflyframework.security.idp.dtos.RegisterUserRequest;
23+
import org.fireflyframework.security.idp.port.AuthenticationPort;
24+
import org.fireflyframework.security.idp.port.MfaPort;
25+
import org.fireflyframework.security.idp.port.RoleScopePort;
26+
import org.fireflyframework.security.idp.port.SessionPort;
27+
import org.fireflyframework.security.idp.port.TokenIntrospectionPort;
28+
import org.fireflyframework.security.idp.port.UserAdminPort;
2929
import org.springframework.http.ResponseEntity;
3030
import reactor.core.publisher.Mono;
3131

src/main/java/org/fireflyframework/idp/config/IdpProperties.java renamed to src/main/java/org/fireflyframework/security/idp/config/IdpProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Copyright (c) 2024 Firefly Software Foundation.
33
*/
4-
package org.fireflyframework.idp.config;
4+
package org.fireflyframework.security.idp.config;
55

66
import lombok.Data;
77
import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/org/fireflyframework/idp/config/IdpWebAutoConfiguration.java renamed to src/main/java/org/fireflyframework/security/idp/config/IdpWebAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
22
* Copyright (c) 2024 Firefly Software Foundation.
33
*/
4-
package org.fireflyframework.idp.config;
4+
package org.fireflyframework.security.idp.config;
55

66
import lombok.extern.slf4j.Slf4j;
7-
import org.fireflyframework.idp.adapter.IdpAdapter;
8-
import org.fireflyframework.idp.web.IdpController;
7+
import org.fireflyframework.security.idp.adapter.IdpAdapter;
8+
import org.fireflyframework.security.idp.web.IdpController;
99
import org.springframework.boot.autoconfigure.AutoConfiguration;
1010
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1111
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

src/main/java/org/fireflyframework/idp/dtos/AssignRolesRequest.java renamed to src/main/java/org/fireflyframework/security/idp/dtos/AssignRolesRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717

18-
package org.fireflyframework.idp.dtos;
18+
package org.fireflyframework.security.idp.dtos;
1919

2020
import lombok.AllArgsConstructor;
2121
import lombok.Builder;

src/main/java/org/fireflyframework/idp/dtos/ChangePasswordRequest.java renamed to src/main/java/org/fireflyframework/security/idp/dtos/ChangePasswordRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717

18-
package org.fireflyframework.idp.dtos;
18+
package org.fireflyframework.security.idp.dtos;
1919

2020
import lombok.AllArgsConstructor;
2121
import lombok.Builder;

src/main/java/org/fireflyframework/idp/dtos/CreateRolesRequest.java renamed to src/main/java/org/fireflyframework/security/idp/dtos/CreateRolesRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717

18-
package org.fireflyframework.idp.dtos;
18+
package org.fireflyframework.security.idp.dtos;
1919

2020
import lombok.AllArgsConstructor;
2121
import lombok.Builder;

src/main/java/org/fireflyframework/idp/dtos/CreateRolesResponse.java renamed to src/main/java/org/fireflyframework/security/idp/dtos/CreateRolesResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717

18-
package org.fireflyframework.idp.dtos;
18+
package org.fireflyframework.security.idp.dtos;
1919

2020
import lombok.AllArgsConstructor;
2121
import lombok.Builder;

src/main/java/org/fireflyframework/idp/dtos/CreateScopeRequest.java renamed to src/main/java/org/fireflyframework/security/idp/dtos/CreateScopeRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717

18-
package org.fireflyframework.idp.dtos;
18+
package org.fireflyframework.security.idp.dtos;
1919

2020
import lombok.AllArgsConstructor;
2121
import lombok.Builder;

0 commit comments

Comments
 (0)