diff --git a/dev-tools/kind/README.md b/dev-tools/kind/README.md index a354e677..bc73a1ed 100644 --- a/dev-tools/kind/README.md +++ b/dev-tools/kind/README.md @@ -249,7 +249,7 @@ Load a locally built Docker image into KinD cluster nodes. ./kind-cluster.sh load # Load specific image -./kind-cluster.sh load --image mindsignited/structures-server:3.5.4 +./kind-cluster.sh load --image mindsignited/structures-server:3.5.6 # Load into specific cluster ./kind-cluster.sh load --name test-cluster diff --git a/dev-tools/kind/config/structures-server/values.yaml b/dev-tools/kind/config/structures-server/values.yaml index a2cb9dbd..0bd136aa 100644 --- a/dev-tools/kind/config/structures-server/values.yaml +++ b/dev-tools/kind/config/structures-server/values.yaml @@ -33,7 +33,7 @@ image: # Repository matches bootBuildImage output repository: mindsignited/structures-server # Tag from gradle.properties version (structuresVersion=3.5.3-SNAPSHOT) - tag: 3.5.5 + tag: 3.5.6 # Never pull - use images loaded into KinD cluster pullPolicy: Never sha: "" @@ -46,7 +46,7 @@ migration: activeDeadlineSeconds: 300 image: repository: mindsignited/structures-migration - tag: 3.5.5 + tag: 3.5.6 # Never pull - use images loaded into KinD cluster pullPolicy: Never sha: "" diff --git a/dev-tools/kind/kind-cluster.sh b/dev-tools/kind/kind-cluster.sh index c88022e8..65e7084b 100755 --- a/dev-tools/kind/kind-cluster.sh +++ b/dev-tools/kind/kind-cluster.sh @@ -728,7 +728,7 @@ Examples: $(basename "$0") load # Load specific image - $(basename "$0") load --image mindsignited/structures-server:3.5.4 + $(basename "$0") load --image mindsignited/structures-server:3.5.6 # Load into specific cluster $(basename "$0") load --name test-cluster diff --git a/docker-compose/compose.yml b/docker-compose/compose.yml index 09d203e5..c6f48068 100644 --- a/docker-compose/compose.yml +++ b/docker-compose/compose.yml @@ -6,7 +6,7 @@ services: structures-migration: container_name: structures-migration pull_policy: always - image: mindsignited/structures-migration:${structuresVersion:-3.5.5} + image: mindsignited/structures-migration:${structuresVersion:-3.5.6} depends_on: structures-elasticsearch: condition: service_healthy @@ -17,7 +17,7 @@ services: structures-server: container_name: structures-server pull_policy: always - image: mindsignited/structures-server:${structuresVersion:-3.5.5} + image: mindsignited/structures-server:${structuresVersion:-3.5.6} depends_on: structures-elasticsearch: condition: service_healthy diff --git a/docs/kubernetes/KIND_TOOLING.md b/docs/kubernetes/KIND_TOOLING.md index 482316a8..fd22f0c2 100644 --- a/docs/kubernetes/KIND_TOOLING.md +++ b/docs/kubernetes/KIND_TOOLING.md @@ -300,7 +300,7 @@ Load a locally built Docker image into KinD cluster nodes. ./kind-cluster.sh load # Load specific image -./kind-cluster.sh load --image mindsignited/structures-server:3.5.4 +./kind-cluster.sh load --image mindsignited/structures-server:3.5.6 # Load into specific cluster ./kind-cluster.sh load --name test-cluster diff --git a/gradle.properties b/gradle.properties index 9334be34..f8206341 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -structuresVersion=3.5.5 +structuresVersion=3.5.6 allureVersion=2.32.0 antlrVersion=4.13.1 diff --git a/helm/structures/Chart.yaml b/helm/structures/Chart.yaml index de5efc8b..c83658c1 100644 --- a/helm/structures/Chart.yaml +++ b/helm/structures/Chart.yaml @@ -12,4 +12,4 @@ version: 1.0.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "3.5.4" +appVersion: "3.5.6" diff --git a/helm/structures/values.yaml b/helm/structures/values.yaml index 93c24426..920cc906 100644 --- a/helm/structures/values.yaml +++ b/helm/structures/values.yaml @@ -4,7 +4,7 @@ nameOverride: "" image: repository: mindsignited/structures-server pullPolicy: Always - tag: "3.5.5" + tag: "3.5.6" sha: "" # Migration configuration @@ -15,7 +15,7 @@ migration: activeDeadlineSeconds: 300 image: repository: mindsignited/structures-migration - tag: "3.5.5" + tag: "3.5.6" pullPolicy: Always sha: "" diff --git a/structures-auth/src/main/java/org/kinotic/structures/auth/internal/services/OidcSecurityService.java b/structures-auth/src/main/java/org/kinotic/structures/auth/internal/services/OidcSecurityService.java index 8f54a863..01586fa1 100644 --- a/structures-auth/src/main/java/org/kinotic/structures/auth/internal/services/OidcSecurityService.java +++ b/structures-auth/src/main/java/org/kinotic/structures/auth/internal/services/OidcSecurityService.java @@ -41,17 +41,23 @@ public class OidcSecurityService implements SecurityService { @Override public CompletableFuture authenticate(Map authenticationInfo) { - String authorizationHeader = getAuthorizationHeader(authenticationInfo); - if (authorizationHeader == null) { - return CompletableFuture.failedFuture(new RuntimeException("No authorization header found")); - } + String token; + + if(authenticationInfo.containsKey("passcode")){ + token = authenticationInfo.get("passcode").trim(); + }else{ + String authorizationHeader = getAuthorizationHeader(authenticationInfo); + if (authorizationHeader == null) { + return CompletableFuture.failedFuture(new RuntimeException("No authorization header found")); + } - String[] parts = authorizationHeader.split(" "); - if (parts.length != 2 || !"Bearer".equalsIgnoreCase(parts[0])) { - return CompletableFuture.failedFuture(new RuntimeException("Invalid authorization header format, expected 'Bearer '")); + String[] parts = authorizationHeader.split(" "); + if (parts.length != 2 || !"Bearer".equalsIgnoreCase(parts[0])) { + return CompletableFuture.failedFuture(new RuntimeException("Invalid authorization header format, expected 'Bearer '")); + } + token = parts[1]; } - String token = parts[1]; return verifyJwtToken(token); } diff --git a/structures-frontend/package.json b/structures-frontend/package.json index 2872e666..f84afe79 100644 --- a/structures-frontend/package.json +++ b/structures-frontend/package.json @@ -1,6 +1,6 @@ { "name": "structures-frontend-next", - "version": "3.5.4", + "version": "3.5.6", "type": "module", "scripts": { "dev": "vite", diff --git a/structures-test/src/test/resources/docker-compose/cluster-test-compose.yml b/structures-test/src/test/resources/docker-compose/cluster-test-compose.yml index ede30159..9ff6186d 100644 --- a/structures-test/src/test/resources/docker-compose/cluster-test-compose.yml +++ b/structures-test/src/test/resources/docker-compose/cluster-test-compose.yml @@ -1,7 +1,7 @@ services: structures-node1: - image: docker.io/mindsignited/structures-server:3.5.4 + image: docker.io/mindsignited/structures-server:3.5.6 healthcheck: test: ["CMD", "/workspace/health-check"] interval: 10s @@ -90,7 +90,7 @@ services: memory: 4G structures-node2: - image: docker.io/mindsignited/structures-server:3.5.4 + image: docker.io/mindsignited/structures-server:3.5.6 healthcheck: test: ["CMD", "/workspace/health-check"] interval: 10s @@ -178,7 +178,7 @@ services: memory: 4G structures-node3: - image: docker.io/mindsignited/structures-server:3.5.4 + image: docker.io/mindsignited/structures-server:3.5.6 healthcheck: test: ["CMD", "/workspace/health-check"] interval: 10s