> unauthorized(String message) {
+ return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(Map.of(
+ "success", false,
+ "message", message
+ ));
+ }
+
public record LoginRequest(String username, String password) {
}
+
+ public record RefreshRequest(String refreshToken) {
+ }
}
\ No newline at end of file
diff --git a/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/controller/DashboardController.java b/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/controller/DashboardController.java
index 14d1ae8..33b6eb9 100644
--- a/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/controller/DashboardController.java
+++ b/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/controller/DashboardController.java
@@ -1,7 +1,7 @@
package mx.gob.slp.baseadminweb.web.controller;
-import mx.gob.slp.baseadminweb.domain.model.AppUser;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import mx.gob.slp.baseadminweb.web.support.WebUserView;
+import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -15,8 +15,8 @@ public class DashboardController {
}
@GetMapping("/dashboard")
- public String dashboard(@AuthenticationPrincipal AppUser user, Model model) {
- model.addAttribute("user", user);
+ public String dashboard(Authentication authentication, Model model) {
+ model.addAttribute("user", WebUserView.from(authentication));
return "dashboard";
}
@@ -24,4 +24,4 @@ public class DashboardController {
public String adminHome() {
return "redirect:/dashboard";
}
-}
+}
\ No newline at end of file
diff --git a/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/controller/PassCodeController.java b/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/controller/PassCodeController.java
index b277e98..48f3106 100644
--- a/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/controller/PassCodeController.java
+++ b/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/controller/PassCodeController.java
@@ -1,9 +1,9 @@
package mx.gob.slp.baseadminweb.web.controller;
import mx.gob.slp.baseadminweb.application.service.PassCodeService;
-import mx.gob.slp.baseadminweb.domain.model.AppUser;
import mx.gob.slp.baseadminweb.web.dto.PassCodeListItem;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import mx.gob.slp.baseadminweb.web.support.WebUserView;
+import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,8 +26,8 @@ public class PassCodeController {
}
@GetMapping
- public String list(@AuthenticationPrincipal AppUser user, Model model) {
- model.addAttribute("user", user);
+ public String list(Authentication authentication, Model model) {
+ model.addAttribute("user", WebUserView.from(authentication));
model.addAttribute("passCodes", passCodeService.findAll());
return "pass-codes";
}
diff --git a/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/support/WebUserView.java b/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/support/WebUserView.java
new file mode 100644
index 0000000..9fc8ac2
--- /dev/null
+++ b/base-admin-web-web/src/main/java/mx/gob/slp/baseadminweb/web/support/WebUserView.java
@@ -0,0 +1,25 @@
+package mx.gob.slp.baseadminweb.web.support;
+
+import mx.gob.slp.baseadminweb.configuration.security.AuthenticatedWebUser;
+import mx.gob.slp.baseadminweb.domain.model.AppUser;
+import org.springframework.security.core.Authentication;
+
+public record WebUserView(String username, String displayName) {
+
+ public static WebUserView from(Authentication authentication) {
+ if (authentication == null) {
+ return new WebUserView("usuario", "Usuario");
+ }
+
+ Object principal = authentication.getPrincipal();
+ if (principal instanceof AppUser appUser) {
+ return new WebUserView(appUser.getUsername(), appUser.getDisplayName());
+ }
+ if (principal instanceof AuthenticatedWebUser webUser) {
+ return new WebUserView(webUser.username(), webUser.displayName());
+ }
+
+ String name = authentication.getName();
+ return new WebUserView(name, name);
+ }
+}
\ No newline at end of file
diff --git a/base-admin-web-web/src/main/resources/templates/login.html b/base-admin-web-web/src/main/resources/templates/login.html
index e28d85a..23a2e8b 100644
--- a/base-admin-web-web/src/main/resources/templates/login.html
+++ b/base-admin-web-web/src/main/resources/templates/login.html
@@ -45,9 +45,12 @@
- Usuario demo: admin
+ Usuario: admin
Password: Admin123*
+
+ Autenticacion via Cognito local (grupo admins)
+
diff --git a/docker-compose-postgres.local.yml b/docker-compose-postgres.local.yml
index 0649662..7436ce2 100644
--- a/docker-compose-postgres.local.yml
+++ b/docker-compose-postgres.local.yml
@@ -1,15 +1,3 @@
-services:
- postgres:
- image: postgres:16
- container_name: base-admin-web-postgres
- environment:
- POSTGRES_DB: base_admin_web
- POSTGRES_USER: postgres
- POSTGRES_PASSWORD: postgres
- ports:
- - "5432:5432"
- volumes:
- - base_admin_web_postgres_data:/var/lib/postgresql/data
-
-volumes:
- base_admin_web_postgres_data:
+# Alias de compatibilidad. Usa docker-compose.local.yml como archivo principal.
+include:
+ - path: docker-compose.local.yml
\ No newline at end of file
diff --git a/docker-compose.local.yml b/docker-compose.local.yml
new file mode 100644
index 0000000..fcecfba
--- /dev/null
+++ b/docker-compose.local.yml
@@ -0,0 +1,45 @@
+services:
+ postgres:
+ image: postgres:16
+ container_name: base-admin-web-postgres
+ environment:
+ POSTGRES_DB: base_admin_web
+ POSTGRES_USER: postgres
+ POSTGRES_PASSWORD: postgres
+ ports:
+ - "5432:5432"
+ volumes:
+ - base_admin_web_postgres_data:/var/lib/postgresql/data
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -U postgres -d base_admin_web"]
+ interval: 5s
+ timeout: 5s
+ retries: 10
+
+ floci:
+ image: floci/floci:latest-compat
+ container_name: base-admin-web-floci
+ ports:
+ - "4566:4566"
+ volumes:
+ - base_admin_web_floci_data:/app/data
+ - ./docker/floci/init/ready.d:/etc/floci/init/ready.d:ro
+ - ./docker/floci/generated:/generated
+ environment:
+ FLOCI_HOSTNAME: floci
+ FLOCI_STORAGE_MODE: persistent
+ FLOCI_STORAGE_PERSISTENT_PATH: /app/data
+ FLOCI_DEFAULT_REGION: us-east-1
+ FLOCI_DEFAULT_ACCOUNT_ID: "000000000000"
+ FLOCI_INIT_HOOKS_TIMEOUT_SECONDS: "120"
+ COGNITO_USER_POOL_ID: us-east-1_BaseAdminWeb
+ COGNITO_ADMIN_USERNAME: admin
+ COGNITO_ADMIN_PASSWORD: Admin123*
+ COGNITO_SCANNER_USERNAME: scanner
+ COGNITO_SCANNER_PASSWORD: Scanner123*
+ COGNITO_ENV_OUTPUT_DIR: /generated
+ restart: unless-stopped
+
+volumes:
+ base_admin_web_postgres_data:
+ base_admin_web_floci_data:
\ No newline at end of file
diff --git a/docker/floci/cognito.local.env.example b/docker/floci/cognito.local.env.example
new file mode 100644
index 0000000..c692cc8
--- /dev/null
+++ b/docker/floci/cognito.local.env.example
@@ -0,0 +1,15 @@
+# Copia generada automaticamente en ./docker/floci/generated/cognito.local.env
+# despues del primer arranque de Floci.
+
+COGNITO_USER_POOL_ID=us-east-1_BaseAdminWeb
+COGNITO_REGION=us-east-1
+COGNITO_ISSUER_URI=http://localhost:4566/us-east-1_BaseAdminWeb
+COGNITO_JWK_SET_URI=http://localhost:4566/us-east-1_BaseAdminWeb/.well-known/jwks.json
+COGNITO_ADMIN_CLIENT_ID=REEMPLAZAR_CON_VALOR_GENERADO
+COGNITO_SCANNER_CLIENT_ID=REEMPLAZAR_CON_VALOR_GENERADO
+COGNITO_ADMIN_GROUP=admins
+COGNITO_SCANNER_GROUP=scanners
+AWS_ENDPOINT_URL=http://localhost:4566
+AWS_DEFAULT_REGION=us-east-1
+AWS_ACCESS_KEY_ID=test
+AWS_SECRET_ACCESS_KEY=test
\ No newline at end of file
diff --git a/docker/floci/generated/.gitkeep b/docker/floci/generated/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/docker/floci/init/ready.d/10-cognito-bootstrap.sh b/docker/floci/init/ready.d/10-cognito-bootstrap.sh
new file mode 100755
index 0000000..b78374c
--- /dev/null
+++ b/docker/floci/init/ready.d/10-cognito-bootstrap.sh
@@ -0,0 +1,172 @@
+#!/bin/sh
+set -eu
+
+POOL_ID="${COGNITO_USER_POOL_ID:-us-east-1_BaseAdminWeb}"
+POOL_NAME="${COGNITO_USER_POOL_NAME:-base-admin-web}"
+REGION="${AWS_DEFAULT_REGION:-us-east-1}"
+DATA_DIR="${FLOCI_STORAGE_PERSISTENT_PATH:-/app/data}"
+ENV_OUTPUT_DIR="${COGNITO_ENV_OUTPUT_DIR:-/generated}"
+ENV_FILE="${ENV_OUTPUT_DIR}/cognito.local.env"
+
+ADMIN_USERNAME="${COGNITO_ADMIN_USERNAME:-admin}"
+ADMIN_PASSWORD="${COGNITO_ADMIN_PASSWORD:-Admin123*}"
+ADMIN_NAME="${COGNITO_ADMIN_DISPLAY_NAME:-Administrador Base}"
+
+SCANNER_USERNAME="${COGNITO_SCANNER_USERNAME:-scanner}"
+SCANNER_PASSWORD="${COGNITO_SCANNER_PASSWORD:-Scanner123*}"
+SCANNER_NAME="${COGNITO_SCANNER_DISPLAY_NAME:-Escaneador}"
+
+ADMIN_CLIENT_NAME="${COGNITO_ADMIN_CLIENT_NAME:-base-admin-web-admin}"
+SCANNER_CLIENT_NAME="${COGNITO_SCANNER_CLIENT_NAME:-base-admin-web-scanner}"
+ADMIN_GROUP="${COGNITO_ADMIN_GROUP:-admins}"
+SCANNER_GROUP="${COGNITO_SCANNER_GROUP:-scanners}"
+
+mkdir -p "$DATA_DIR" "$ENV_OUTPUT_DIR"
+
+log() {
+ printf '[cognito-bootstrap] %s\n' "$1" >&2
+}
+
+pool_exists() {
+ aws cognito-idp describe-user-pool --user-pool-id "$POOL_ID" >/dev/null 2>&1
+}
+
+create_pool() {
+ log "Creando user pool $POOL_ID"
+ aws cognito-idp create-user-pool \
+ --pool-name "$POOL_NAME" \
+ --user-pool-tags "floci:override-id=${POOL_ID}" \
+ --policies "PasswordPolicy={MinimumLength=8,RequireUppercase=true,RequireLowercase=true,RequireNumbers=true,RequireSymbols=true}" \
+ --username-configuration "CaseSensitive=false" \
+ --mfa-configuration OFF \
+ --account-recovery-setting "RecoveryMechanisms=[{Priority=1,Name=verified_email}]"
+}
+
+find_client_id() {
+ client_name="$1"
+ aws cognito-idp list-user-pool-clients \
+ --user-pool-id "$POOL_ID" \
+ --max-results 60 \
+ --query "UserPoolClients[?ClientName=='${client_name}'].ClientId | [0]" \
+ --output text
+}
+
+create_client() {
+ client_name="$1"
+ existing_id="$(find_client_id "$client_name" || true)"
+ if [ -n "$existing_id" ] && [ "$existing_id" != "None" ]; then
+ log "App client $client_name ya existe ($existing_id)"
+ printf '%s' "$existing_id"
+ return 0
+ fi
+
+ log "Creando app client $client_name"
+ aws cognito-idp create-user-pool-client \
+ --user-pool-id "$POOL_ID" \
+ --client-name "$client_name" \
+ --explicit-auth-flows \
+ ALLOW_USER_PASSWORD_AUTH \
+ ALLOW_REFRESH_TOKEN_AUTH \
+ ALLOW_USER_SRP_AUTH \
+ --prevent-user-existence-errors ENABLED \
+ --supported-identity-providers COGNITO \
+ --query "UserPoolClient.ClientId" \
+ --output text
+}
+
+create_group_if_needed() {
+ group_name="$1"
+ description="$2"
+ if aws cognito-idp get-group --user-pool-id "$POOL_ID" --group-name "$group_name" >/dev/null 2>&1; then
+ log "Grupo $group_name ya existe"
+ return 0
+ fi
+
+ log "Creando grupo $group_name"
+ aws cognito-idp create-group \
+ --user-pool-id "$POOL_ID" \
+ --group-name "$group_name" \
+ --description "$description"
+}
+
+user_exists() {
+ username="$1"
+ aws cognito-idp admin-get-user \
+ --user-pool-id "$POOL_ID" \
+ --username "$username" >/dev/null 2>&1
+}
+
+create_user_if_needed() {
+ username="$1"
+ password="$2"
+ display_name="$3"
+ group_name="$4"
+
+ if ! user_exists "$username"; then
+ log "Creando usuario $username"
+ aws cognito-idp admin-create-user \
+ --user-pool-id "$POOL_ID" \
+ --username "$username" \
+ --message-action SUPPRESS \
+ --user-attributes "Name=name,Value=${display_name}"
+ else
+ log "Usuario $username ya existe"
+ fi
+
+ aws cognito-idp admin-set-user-password \
+ --user-pool-id "$POOL_ID" \
+ --username "$username" \
+ --password "$password" \
+ --permanent
+
+ aws cognito-idp admin-add-user-to-group \
+ --user-pool-id "$POOL_ID" \
+ --username "$username" \
+ --group-name "$group_name" >/dev/null 2>&1 || true
+}
+
+write_env_file() {
+ admin_client_id="$1"
+ scanner_client_id="$2"
+
+ cat > "$ENV_FILE" <
-
-
-
diff --git a/flutter-app/qrscanner/android/app/src/main/AndroidManifest.xml b/flutter-app/qrscanner/android/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 2fbd078..0000000
--- a/flutter-app/qrscanner/android/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/flutter-app/qrscanner/android/app/src/main/kotlin/com/example/qrscanner/MainActivity.kt b/flutter-app/qrscanner/android/app/src/main/kotlin/com/example/qrscanner/MainActivity.kt
deleted file mode 100644
index ca0660c..0000000
--- a/flutter-app/qrscanner/android/app/src/main/kotlin/com/example/qrscanner/MainActivity.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.example.qrscanner
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity : FlutterActivity()
diff --git a/flutter-app/qrscanner/android/app/src/main/res/drawable-v21/launch_background.xml b/flutter-app/qrscanner/android/app/src/main/res/drawable-v21/launch_background.xml
deleted file mode 100644
index f74085f..0000000
--- a/flutter-app/qrscanner/android/app/src/main/res/drawable-v21/launch_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-