From 65336083dfb83188a1873dc3c34f33bc34181d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Tue, 3 Dec 2024 23:37:28 -0300 Subject: [PATCH 01/24] Base Configuration --- .gitattributes | 2 + .gitignore | 33 +++ .mvn/wrapper/maven-wrapper.properties | 19 ++ init.sql | 202 +++++++++++++++++ mvnw | 259 ++++++++++++++++++++++ mvnw.cmd | 149 +++++++++++++ pom.xml | 118 ++++++++++ src/main/resources/application.properties | 20 ++ 8 files changed, 802 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 init.sql create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/resources/application.properties diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/init.sql b/init.sql new file mode 100644 index 0000000..6be05f6 --- /dev/null +++ b/init.sql @@ -0,0 +1,202 @@ +CREATE SCHEMA IF NOT EXISTS `prontorecife` DEFAULT CHARACTER SET utf8; +USE `prontorecife`; + +-- Tabela Estabelecimento +CREATE TABLE `estabelecimento` ( + id CHAR(36) DEFAULT (UUID()), + cnpj VARCHAR(18) UNIQUE NOT NULL, + nome VARCHAR(255) NOT NULL, + endereco VARCHAR(255) NOT NULL, + telefone VARCHAR(15) NOT NULL, + email VARCHAR(255) UNIQUE NOT NULL, + senha VARCHAR(255) NOT NULL, + id_medico CHAR(36), + id_paciente CHAR(36), + id_consulta CHAR(36), + PRIMARY KEY (`id`) +) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +-- Tabela Laudos +CREATE TABLE `laudos` ( + id CHAR(36) DEFAULT (UUID()), + descricao TEXT, + PRIMARY KEY (`id`) +) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +-- Tabela Responsável +CREATE TABLE IF NOT EXISTS `responsavel` ( + id CHAR(36) DEFAULT (UUID()), + nome_completo VARCHAR(100) NOT NULL, + grau_parentesco VARCHAR(45) NOT NULL, + data_nascimento DATE NOT NULL, + genero VARCHAR(10) NOT NULL, + telefone VARCHAR(15) NOT NULL, + email VARCHAR(50) UNIQUE , + cpf VARCHAR(14) UNIQUE NOT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `email_UNIQUE` (`email` ASC), + UNIQUE INDEX `idx_cpf` (`cpf`) -- Índice adicionado para o campo cpf +) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +-- Tabela Médico +CREATE TABLE `medico` ( + id CHAR(36) DEFAULT (UUID()), + crm VARCHAR(15) UNIQUE NOT NULL, + id_estabelecimento CHAR(36), + especialidade VARCHAR(255) NOT NULL, + email VARCHAR(255) UNIQUE NOT NULL, + senha VARCHAR(255) NOT NULL, + nome_completo VARCHAR(100) NOT NULL, + telefone VARCHAR(15) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE INDEX `crm_UNIQUE` (`crm` ASC), + UNIQUE INDEX `email_UNIQUE` (`email` ASC), + CONSTRAINT `fk_medico_estabelecimento` + FOREIGN KEY (id_estabelecimento) + REFERENCES estabelecimento (id) + ON DELETE NO ACTION ON UPDATE NO ACTION +) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +-- tabela agente de saude +CREATE TABLE IF NOT EXISTS agente_saude ( + id CHAR(36) DEFAULT (UUID()), + nome VARCHAR(255) NOT NULL, + email VARCHAR(255) NOT NULL UNIQUE, + senha VARCHAR(255) NOT NULL, + telefone VARCHAR(255) NOT NULL, + id_estabelecimento CHAR(36), + PRIMARY KEY pk_id(id), + CONSTRAINT `fk_agente_estabelecimento` + FOREIGN KEY (id_estabelecimento) + REFERENCES estabelecimento (id) + ON DELETE NO ACTION ON UPDATE NO ACTION +) ENGINE = InnoDB; + +CREATE TABLE IF NOT EXISTS profissional_saude ( + id CHAR(36) DEFAULT (UUID()), + nome VARCHAR(255) NOT NULL, + coren VARCHAR(15) UNIQUE NOT NULL, + email VARCHAR(255) UNIQUE NOT NULL, + senha VARCHAR(255) NOT NULL, + telefone VARCHAR(255) NOT NULL, + id_estabelecimento CHAR(36), + PRIMARY KEY pk_id(id), + CONSTRAINT `fk_profissional_estabelecimento` + FOREIGN KEY (id_estabelecimento) + REFERENCES estabelecimento (id) + ON DELETE NO ACTION ON UPDATE NO ACTION +) ENGINE = InnoDB; + +-- Tabela Paciente +CREATE TABLE IF NOT EXISTS `paciente` ( + id CHAR(36) DEFAULT (UUID()), + nome_completo VARCHAR(100) NOT NULL, + cpf VARCHAR(14) UNIQUE NOT NULL, + data_nascimento DATE NOT NULL, + genero VARCHAR(10) NOT NULL, + email VARCHAR(100) UNIQUE, + senha VARCHAR(255) NOT NULL, + telefone VARCHAR(15) NOT NULL, + contato_representante VARCHAR(15), + cep VARCHAR(9) NOT NULL, + endereco VARCHAR(250) NOT NULL, + responsavel_cpf VARCHAR(14), + id_estabelecimento CHAR(36), + PRIMARY KEY (`id`), + UNIQUE INDEX `email_UNIQUE` (`email` ASC), + CONSTRAINT `fk_paciente_responsavel` + FOREIGN KEY (`responsavel_cpf`) + REFERENCES `responsavel` (`cpf`) +ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT `fk_paciente_estabelecimento` + FOREIGN KEY (id_estabelecimento) + REFERENCES estabelecimento (id) + ON DELETE NO ACTION ON UPDATE NO ACTION +) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +-- Tabela Consulta +CREATE TABLE `consulta` ( + id CHAR(36) DEFAULT (UUID()), + data_consulta DATE NOT NULL, + tratamentos_prescritos TEXT NOT NULL, + instrucoes_recomendacoes TEXT NOT NULL, + sintomas TEXT NOT NULL, + historico_familiar VARCHAR(255), + paciente_id CHAR(36) NOT NULL, + medico_id CHAR(36) NOT NULL, + laudos_id CHAR(36), + id_estabelecimento CHAR(36), + PRIMARY KEY (`id`), + CONSTRAINT `fk_consulta_paciente` + FOREIGN KEY (`paciente_id`) + REFERENCES `paciente` (`id`) + ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT `fk_consulta_medico` + FOREIGN KEY (`medico_id`) + REFERENCES `medico` (`id`) + ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT `fk_consulta_laudos` + FOREIGN KEY (`laudos_id`) + REFERENCES `laudos` (`id`) + ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT `fk_consulta_estabelecimento` + FOREIGN KEY (id_estabelecimento) + REFERENCES estabelecimento (id) + ON DELETE NO ACTION ON UPDATE NO ACTION +) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +-- tabelas de reset password +CREATE TABLE password_reset_token ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + token VARCHAR(6) NOT NULL, + expiration DATETIME NOT NULL, + medico_id CHAR(36), + paciente_id CHAR(36), + CONSTRAINT fk_password_reset_medico FOREIGN KEY (medico_id) + REFERENCES medico (id) ON DELETE CASCADE ON UPDATE NO ACTION, + CONSTRAINT fk_password_reset_paciente FOREIGN KEY (paciente_id) + REFERENCES paciente (id) ON DELETE CASCADE ON UPDATE NO ACTION +) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE password_reset_token_seq ( + next_not_cached_value BIGINT(21) NOT NULL, + minimum_value BIGINT(21) NOT NULL, + maximum_value BIGINT(21) NOT NULL, + start_value BIGINT(21) NOT NULL, + increment BIGINT(21) NOT NULL, + cache_size BIGINT(21) NOT NULL, + cycle_option TINYINT(1) NOT NULL, + cycle_count BIGINT(21) NOT NULL +); + +-- Tabela Exame do Paciente +CREATE TABLE IF NOT EXISTS `exame_do_paciente` ( + id CHAR(36) DEFAULT (UUID()), + data_exame DATE NOT NULL, + resultado TEXT NOT NULL, + nome_do_exame VARCHAR(100) NOT NULL, + paciente_id CHAR(36) NOT NULL, + consulta_id CHAR(36), + PRIMARY KEY (`id`), + CONSTRAINT `fk_exame_paciente` + FOREIGN KEY (`paciente_id`) + REFERENCES `paciente` (`id`) + ON DELETE NO ACTION ON UPDATE NO ACTION, + CONSTRAINT `fk_exame_consulta` + FOREIGN KEY (`consulta_id`) + REFERENCES `consulta` (`id`) + ON DELETE NO ACTION ON UPDATE NO ACTION +) ENGINE = InnoDB DEFAULT CHARSET=utf8; + +-- Tabela Histórico Médico +CREATE TABLE IF NOT EXISTS `historico_medico` ( + id CHAR(36) DEFAULT (UUID()), + cirurgias_anteriores TEXT, + condicoes_gerais VARCHAR(255), + paciente_id CHAR(36) NOT NULL, + PRIMARY KEY (`id`), + CONSTRAINT `fk_historico_paciente` + FOREIGN KEY (`paciente_id`) + REFERENCES `paciente` (`id`) + ON DELETE NO ACTION ON UPDATE NO ACTION +) ENGINE = InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..73b91e8 --- /dev/null +++ b/pom.xml @@ -0,0 +1,118 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.0 + + + br.com.prontorecife + auth + 0.0.1-SNAPSHOT + Auth + Micro service de autenticação do usuário + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jdbc + + + mysql + mysql-connector-java + 8.0.33 + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-data-redis + + + com.auth0 + java-jwt + 3.19.4 + + + io.jsonwebtoken + jjwt-api + 0.12.6 + + + io.jsonwebtoken + jjwt-impl + 0.12.6 + runtime + + + io.jsonwebtoken + jjwt-jackson + 0.12.6 + runtime + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.security + spring-security-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..717f0c5 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,20 @@ +spring.application.name=Auth +spring.datasource.url=jdbc:mysql://localhost:3308/prontorecife +spring.datasource.username=root +spring.datasource.password=root +#spring.data.redis.host= +#spring.data.redis.port= +#spring.data.redis.password= +spring.jpa.hibernate.ddl-auto=none +spring.datasource.hikari.maximum-pool-size=10 +#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect +springdoc.swagger-ui.path=/swagger-ui.html +jjwt.secret = VGhlIHN0YW5kYXJkIExvcmVtIElwc3VtIHBhc3NhZ2UsIHVzZWQgc2luY2UgdGhlIDE1MDBz +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +logging.level.org.hibernate.SQL = DEBUG +#logging.level.org.springframework.jdbc.core = DEBUG +#spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true + +spring.jpa.defer-datasource-initialization=true +spring.sql.init.mode=always +#http://localhost:8080/swagger-ui.html. \ No newline at end of file From 77009d5b86d4dac04ff59766af1f1581fa3eea60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Wed, 4 Dec 2024 00:40:54 -0300 Subject: [PATCH 02/24] =?UTF-8?q?feature:=20Cria=C3=A7=C3=A3o=20da=20entid?= =?UTF-8?q?ade=20de=20Autentica=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Criação do DTO Authentication Request para armazenar os dados da requisição - Criação do DTO Session para armazenar o token de acesso - Criação do Authentication Controller com a rota do login e a rota session para validação do token - Criação do Authentication Service com os devidos serviços de autenticação e checagem de flows --- .../prontorecife/auth/AuthApplication.java | 13 ++++ .../Controller/AuthenticationController.java | 31 ++++++++ .../auth/DTOs/AuthenticationRequestDTO.java | 13 ++++ .../prontorecife/auth/DTOs/SessionDTO.java | 12 +++ .../auth/Service/AuthenticationService.java | 74 +++++++++++++++++++ .../auth/Service/TokenService.java | 51 +++++++++++++ .../auth/AuthApplicationTests.java | 13 ++++ 7 files changed, 207 insertions(+) create mode 100644 src/main/java/br/com/prontorecife/auth/AuthApplication.java create mode 100644 src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java create mode 100644 src/main/java/br/com/prontorecife/auth/DTOs/AuthenticationRequestDTO.java create mode 100644 src/main/java/br/com/prontorecife/auth/DTOs/SessionDTO.java create mode 100644 src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java create mode 100644 src/main/java/br/com/prontorecife/auth/Service/TokenService.java create mode 100644 src/test/java/br/com/prontorecife/auth/AuthApplicationTests.java diff --git a/src/main/java/br/com/prontorecife/auth/AuthApplication.java b/src/main/java/br/com/prontorecife/auth/AuthApplication.java new file mode 100644 index 0000000..9d6fd52 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/AuthApplication.java @@ -0,0 +1,13 @@ +package br.com.prontorecife.auth; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AuthApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthApplication.class, args); + } + +} diff --git a/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java b/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java new file mode 100644 index 0000000..727efb1 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java @@ -0,0 +1,31 @@ +package br.com.prontorecife.auth.Controller; + +import br.com.prontorecife.auth.DTOs.AuthenticationRequestDTO; +import br.com.prontorecife.auth.DTOs.SessionDTO; +import br.com.prontorecife.auth.Service.AuthenticationService; +import br.com.prontorecife.auth.Service.TokenService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/auth") +public class AuthenticationController { + private final TokenService tokenService; + private final AuthenticationService authenticationService; + + @PostMapping("/login") + public SessionDTO login(@RequestBody AuthenticationRequestDTO request){ + String token = authenticationService.authenticate(request); + return new SessionDTO(token); + } + @PostMapping("/session") + public ResponseEntity verifySession(@RequestBody SessionDTO request){ + tokenService.validateToken(request.getAccessToken()); + return ResponseEntity.ok().build(); + } +} diff --git a/src/main/java/br/com/prontorecife/auth/DTOs/AuthenticationRequestDTO.java b/src/main/java/br/com/prontorecife/auth/DTOs/AuthenticationRequestDTO.java new file mode 100644 index 0000000..35dcb1f --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/DTOs/AuthenticationRequestDTO.java @@ -0,0 +1,13 @@ +package br.com.prontorecife.auth.DTOs; + +import br.com.prontorecife.auth.Enum.LoginFlowEnum; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class AuthenticationRequestDTO { + private String identificador; + private String senha; + private LoginFlowEnum flow; +} diff --git a/src/main/java/br/com/prontorecife/auth/DTOs/SessionDTO.java b/src/main/java/br/com/prontorecife/auth/DTOs/SessionDTO.java new file mode 100644 index 0000000..f944670 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/DTOs/SessionDTO.java @@ -0,0 +1,12 @@ +package br.com.prontorecife.auth.DTOs; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class SessionDTO { + private String accessToken; +} \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java b/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java new file mode 100644 index 0000000..bae9445 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java @@ -0,0 +1,74 @@ +package br.com.prontorecife.auth.Service; + +import br.com.prontorecife.auth.DTOs.AuthenticationRequestDTO; +import br.com.prontorecife.auth.Enum.LoginFlowEnum; +import br.com.prontorecife.auth.Service.TokenService; +import br.com.prontorecife.auth.Exceptions.CustomException; +import br.com.prontorecife.auth.Models.EstabelecimentoModel; +import br.com.prontorecife.auth.Models.MedicoModel; +import br.com.prontorecife.auth.Models.PacienteModel; +import br.com.prontorecife.auth.Repositories.EstabelecimentoRepository; +import br.com.prontorecife.auth.Repositories.MedicoRepository; +import br.com.prontorecife.auth.Repositories.PacienteRepository; +import io.jsonwebtoken.Jwts; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; + +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.Date; + +@Service +@RequiredArgsConstructor +public class AuthenticationService { + @Value("${jjwt.secret}") + private String jjwtSecret; + private final MedicoRepository medicoRepository; + private final PacienteRepository pacienteRepository; + private final EstabelecimentoRepository estabelecimentoRepository; + private final PasswordEncoder passwordEncoder; + private final TokenService tokenService; + + public String authenticate(AuthenticationRequestDTO request){ + if (request.getFlow() == LoginFlowEnum.CNPJ) { + EstabelecimentoModel estabelecimento = getEstabelecimento(request.getIdentificador()); + if (!passwordEncoder.matches(request.getSenha(), estabelecimento.getSenha())) { + throw new CustomException("CNPJ ou Senha Incorreta!", HttpStatus.UNAUTHORIZED, null); + } + return tokenService.generateToken(estabelecimento.getId()); + } + if (request.getFlow() == LoginFlowEnum.CRM) { + MedicoModel medico = getMedico(request.getIdentificador()); + if (!passwordEncoder.matches(request.getSenha(), medico.getSenha())) { + throw new CustomException("CRM ou Senha Incorreta!", HttpStatus.UNAUTHORIZED, null); + } + return tokenService.generateToken(medico.getId()); + } + if (request.getFlow() == LoginFlowEnum.CPF) { + PacienteModel paciente = getPaciente(request.getIdentificador()); + if (!passwordEncoder.matches(request.getSenha(), paciente.getSenha())) { + throw new CustomException("CPF ou Senha Incorreta!", HttpStatus.UNAUTHORIZED, null); + } + return tokenService.generateToken(paciente.getId()); + } + return "Invalid Flow!"; + } + public MedicoModel getMedico(String crm){ + return medicoRepository.findByCRM(crm).orElseThrow(() -> + new RuntimeException("Medico Não Encontrado!")); + } + public PacienteModel getPaciente(String cpf){ + return pacienteRepository.findByCPF(cpf).orElseThrow(() -> + new RuntimeException("Paciente Não Encontrado!")); + } + public EstabelecimentoModel getEstabelecimento(String cnpj){ + return estabelecimentoRepository.findByCnpj(cnpj).orElseThrow(() -> + new RuntimeException("Estabelecimento Não Encontrado!")); + } +} \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Service/TokenService.java b/src/main/java/br/com/prontorecife/auth/Service/TokenService.java new file mode 100644 index 0000000..6087f02 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Service/TokenService.java @@ -0,0 +1,51 @@ +package br.com.prontorecife.auth.Service; + +import br.com.prontorecife.auth.Exceptions.CustomException; +import com.auth0.jwt.JWT; +import com.auth0.jwt.interfaces.DecodedJWT; +import io.jsonwebtoken.Jwts; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; +import com.auth0.jwt.algorithms.Algorithm; + +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import java.security.Key; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Service +public class TokenService { + @Value("${jjwt.secret}") + private String jjwtSecret; + + public String generateToken(String id){ + return Jwts.builder() + .subject(id) + .issuedAt(new Date()) + .expiration(Date.from(Instant.now().plus(24, ChronoUnit.HOURS))) + .signWith(getSecretKey()) + .compact(); + } + private SecretKey getSecretKey() { + return new SecretKeySpec(jjwtSecret.getBytes(), "HmacSHA256"); + } + public String validateToken(String token){ + Algorithm algorithm = encryptor(jjwtSecret); + try { + return JWT.require(algorithm) + .build() + .verify(token) + .getToken(); + }catch (Exception e){ + throw new CustomException("Sessão invalida!", HttpStatus.FORBIDDEN, Map.of("error", e.getMessage())); + } + } + public Algorithm encryptor(String jjwtSecret){ + return Algorithm.HMAC256(jjwtSecret); + } +} \ No newline at end of file diff --git a/src/test/java/br/com/prontorecife/auth/AuthApplicationTests.java b/src/test/java/br/com/prontorecife/auth/AuthApplicationTests.java new file mode 100644 index 0000000..57054ef --- /dev/null +++ b/src/test/java/br/com/prontorecife/auth/AuthApplicationTests.java @@ -0,0 +1,13 @@ +package br.com.prontorecife.auth; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class AuthApplicationTests { + + @Test + void contextLoads() { + } + +} From e72345f82ef377b66bf817e934ecf1ce9b82aad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Wed, 4 Dec 2024 00:43:37 -0300 Subject: [PATCH 03/24] =?UTF-8?q?Adi=C3=A7=C3=A3o:=20Arquivo=20LoginFlowEn?= =?UTF-8?q?um?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prontorecife/auth/Enum/LoginFlowEnum.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java diff --git a/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java b/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java new file mode 100644 index 0000000..8530ad1 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java @@ -0,0 +1,21 @@ +package br.com.prontorecife.auth.Enum; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +public enum LoginFlowEnum { + CRM, + CPF, + CNPJ; + + @JsonValue + @Override + public String toString() { + return name(); + } + + @JsonCreator + public static LoginFlowEnum fromValue(String value) { + return LoginFlowEnum.valueOf(value.toUpperCase()); + } +} \ No newline at end of file From ba9795440520aac17360ed09b4b45fbd87c20066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Wed, 4 Dec 2024 00:49:53 -0300 Subject: [PATCH 04/24] =?UTF-8?q?Feature:=20Exce=C3=A7=C3=B5es=20personali?= =?UTF-8?q?zadas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Global Exception Handler para a manipulação das exceções - Base Exception para servir de base para as outras exceções - Authorization Header Exception para falhas nos headers de autenticação - Custom Exception usada como classe principal para as exceções personalizadas --- .../auth/DTOs/ExceptionResponseDTO.java | 13 ++++++++++ .../AuthorizationHeaderException.java | 12 +++++++++ .../auth/Exceptions/BaseException.java | 19 ++++++++++++++ .../auth/Exceptions/CustomException.java | 19 ++++++++++++++ .../Exceptions/GlobalExceptionHandler.java | 25 +++++++++++++++++++ 5 files changed, 88 insertions(+) create mode 100644 src/main/java/br/com/prontorecife/auth/DTOs/ExceptionResponseDTO.java create mode 100644 src/main/java/br/com/prontorecife/auth/Exceptions/AuthorizationHeaderException.java create mode 100644 src/main/java/br/com/prontorecife/auth/Exceptions/BaseException.java create mode 100644 src/main/java/br/com/prontorecife/auth/Exceptions/CustomException.java create mode 100644 src/main/java/br/com/prontorecife/auth/Exceptions/GlobalExceptionHandler.java diff --git a/src/main/java/br/com/prontorecife/auth/DTOs/ExceptionResponseDTO.java b/src/main/java/br/com/prontorecife/auth/DTOs/ExceptionResponseDTO.java new file mode 100644 index 0000000..2a9250c --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/DTOs/ExceptionResponseDTO.java @@ -0,0 +1,13 @@ +package com.start.pronto_recife.DTOs; + +import lombok.Getter; +import lombok.Setter; + +import java.util.Map; + +@Getter +@Setter +public class ExceptionResponseDTO { + String message; + Map erros; +} \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Exceptions/AuthorizationHeaderException.java b/src/main/java/br/com/prontorecife/auth/Exceptions/AuthorizationHeaderException.java new file mode 100644 index 0000000..6e9eff0 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Exceptions/AuthorizationHeaderException.java @@ -0,0 +1,12 @@ +package br.com.prontorecife.auth.Exceptions; + +import org.springframework.http.HttpStatus; + +public class AuthorizationHeaderException extends BaseException{ + + public AuthorizationHeaderException(){ + super(HttpStatus.UNAUTHORIZED, + "Authorization Header Error.", + "Authorization Header is null or empty."); + } +} diff --git a/src/main/java/br/com/prontorecife/auth/Exceptions/BaseException.java b/src/main/java/br/com/prontorecife/auth/Exceptions/BaseException.java new file mode 100644 index 0000000..912cc67 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Exceptions/BaseException.java @@ -0,0 +1,19 @@ +package br.com.prontorecife.auth.Exceptions; + +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ProblemDetail; + +@RequiredArgsConstructor +public class BaseException extends RuntimeException { + private final HttpStatus httpStatus; + private final String title; + private final String detail; + + public ProblemDetail problemDetail(){ + ProblemDetail probD = ProblemDetail.forStatus(httpStatus); + probD.setTitle(title); + probD.setDetail(detail); + return probD; + } +} diff --git a/src/main/java/br/com/prontorecife/auth/Exceptions/CustomException.java b/src/main/java/br/com/prontorecife/auth/Exceptions/CustomException.java new file mode 100644 index 0000000..e21bcf0 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Exceptions/CustomException.java @@ -0,0 +1,19 @@ +package br.com.prontorecife.auth.Exceptions; + +import lombok.Getter; + +import org.springframework.http.HttpStatus; + +import java.util.Map; + +@Getter +public class CustomException extends RuntimeException { + private final HttpStatus httpStatus; + private final Map errors; + + public CustomException(String message, HttpStatus httpStatus, Map errors) { + super(message); + this.httpStatus = httpStatus; + this.errors = errors; + } +} \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Exceptions/GlobalExceptionHandler.java b/src/main/java/br/com/prontorecife/auth/Exceptions/GlobalExceptionHandler.java new file mode 100644 index 0000000..16d7822 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Exceptions/GlobalExceptionHandler.java @@ -0,0 +1,25 @@ +package br.com.prontorecife.auth.Exceptions; + +import com.start.pronto_recife.DTOs.ExceptionResponseDTO; +import org.springframework.http.ProblemDetail; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class GlobalExceptionHandler { + @ExceptionHandler(BaseException.class) + public ResponseEntity handleUnauthorizedInSecurity(BaseException exception){ + ProblemDetail probD = exception.problemDetail(); + return ResponseEntity.status(probD.getStatus()).body(probD); + } + @ExceptionHandler(CustomException.class) + public ResponseEntity handleCustomException(CustomException ex) { + ExceptionResponseDTO response = new ExceptionResponseDTO(); + response.setMessage(ex.getMessage()); + response.setErros(ex.getErrors()); + return ResponseEntity + .status(ex.getHttpStatus()) + .body(response); + } +} From fa5ee971a5fd0258e204c4d4a74a92fdf121e630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Wed, 4 Dec 2024 00:52:24 -0300 Subject: [PATCH 05/24] =?UTF-8?q?Adi=C3=A7=C3=A3o:=20Entidades=20(Models?= =?UTF-8?q?=20e=20Repositories)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Estabelecimento - Paciente - Medico --- .../auth/Models/EstabelecimentoModel.java | 34 ++++++++++++++ .../prontorecife/auth/Models/MedicoModel.java | 35 ++++++++++++++ .../auth/Models/PacienteModel.java | 46 +++++++++++++++++++ .../EstabelecimentoRepository.java | 16 +++++++ .../auth/Repositories/MedicoRepository.java | 15 ++++++ .../auth/Repositories/PacienteRepository.java | 17 +++++++ .../auth/config/SecurityConfiguration.java | 27 +++++++++++ 7 files changed, 190 insertions(+) create mode 100644 src/main/java/br/com/prontorecife/auth/Models/EstabelecimentoModel.java create mode 100644 src/main/java/br/com/prontorecife/auth/Models/MedicoModel.java create mode 100644 src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java create mode 100644 src/main/java/br/com/prontorecife/auth/Repositories/EstabelecimentoRepository.java create mode 100644 src/main/java/br/com/prontorecife/auth/Repositories/MedicoRepository.java create mode 100644 src/main/java/br/com/prontorecife/auth/Repositories/PacienteRepository.java create mode 100644 src/main/java/br/com/prontorecife/auth/config/SecurityConfiguration.java diff --git a/src/main/java/br/com/prontorecife/auth/Models/EstabelecimentoModel.java b/src/main/java/br/com/prontorecife/auth/Models/EstabelecimentoModel.java new file mode 100644 index 0000000..57c41d3 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Models/EstabelecimentoModel.java @@ -0,0 +1,34 @@ +package br.com.prontorecife.auth.Models; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.UUID; + +@Entity +@Table(name = "estabelecimento") +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +public class EstabelecimentoModel { + @Id + private String id; + private String cnpj; + private String nome; + private String senha; + private String endereco; + private String telefone; + @Column(name = "email", unique = true) + private String email; + + @PrePersist + public void prePersist() { + if (id == null) { + id = UUID.randomUUID().toString(); + } + } +} diff --git a/src/main/java/br/com/prontorecife/auth/Models/MedicoModel.java b/src/main/java/br/com/prontorecife/auth/Models/MedicoModel.java new file mode 100644 index 0000000..61a1b86 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Models/MedicoModel.java @@ -0,0 +1,35 @@ +package br.com.prontorecife.auth.Models; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +import java.util.UUID; + + +@Entity +@Table(name = "medico") +@Getter @Setter +public class MedicoModel{ + + @Id + private String id; + @Column(name = "CRM", unique = true) + private String CRM; + @Column(name = "nome_completo") + private String nomeCompleto; + private String telefone; + private String email; + @Column(name = "senha") + private String senha; + @Column (name = "id_estabelecimento") + private String idEstabelecimento; + + @PrePersist + public void prePersist() { + if (id == null) { + id = UUID.randomUUID().toString(); + } + } +} + diff --git a/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java b/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java new file mode 100644 index 0000000..ab4a059 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java @@ -0,0 +1,46 @@ +package br.com.prontorecife.auth.Models; + +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.io.Serializable; +import java.time.LocalDate; +import java.util.UUID; + +@Entity +@Table(name = "paciente") +@Getter @Setter +@AllArgsConstructor +@NoArgsConstructor +public class PacienteModel{ + @Id + private String id; + @Column(name = "cpf", unique = true, length = 14) + private String CPF; + @Column(name = "nome_completo") + private String nomeCompleto; + @Column(name = "data_nascimento") + private LocalDate dataNascimento; + private String genero; + @Column(name = "email", unique = true) + private String email; + private String senha; + private String telefone; + @Column(name = "contato_representante") + private String contatoRepresentante; + private String cep; + private String endereco; + @Column(name = "responsavel_cpf", length = 14) + private String responsavelCpf; + + @PrePersist + public void prePersist() { + if (id == null) { + id = UUID.randomUUID().toString(); + } + } +} diff --git a/src/main/java/br/com/prontorecife/auth/Repositories/EstabelecimentoRepository.java b/src/main/java/br/com/prontorecife/auth/Repositories/EstabelecimentoRepository.java new file mode 100644 index 0000000..ce2623d --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Repositories/EstabelecimentoRepository.java @@ -0,0 +1,16 @@ +package br.com.prontorecife.auth.Repositories; + +import br.com.prontorecife.auth.Models.EstabelecimentoModel; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + + +@Repository +public interface EstabelecimentoRepository extends JpaRepository { + Optional findByEmail(@NotBlank String email); + Optional findByCnpj(@NotNull @NotBlank String cnpj); +} diff --git a/src/main/java/br/com/prontorecife/auth/Repositories/MedicoRepository.java b/src/main/java/br/com/prontorecife/auth/Repositories/MedicoRepository.java new file mode 100644 index 0000000..ee11b3e --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Repositories/MedicoRepository.java @@ -0,0 +1,15 @@ +package br.com.prontorecife.auth.Repositories; + +import br.com.prontorecife.auth.Models.MedicoModel; +import jakarta.transaction.Transactional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface MedicoRepository extends JpaRepository { + Optional findByCRM(String CRM); + @Transactional + void deleteByCRM(String CRM); +} diff --git a/src/main/java/br/com/prontorecife/auth/Repositories/PacienteRepository.java b/src/main/java/br/com/prontorecife/auth/Repositories/PacienteRepository.java new file mode 100644 index 0000000..f50e9f4 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Repositories/PacienteRepository.java @@ -0,0 +1,17 @@ +package br.com.prontorecife.auth.Repositories; + +import br.com.prontorecife.auth.Models.PacienteModel; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +@Repository +public interface PacienteRepository extends JpaRepository { + Optional findByCPF(@NotBlank @Pattern(regexp = "\\d{11}") String CPF); + List findByResponsavelCpf(String CPF); + +} diff --git a/src/main/java/br/com/prontorecife/auth/config/SecurityConfiguration.java b/src/main/java/br/com/prontorecife/auth/config/SecurityConfiguration.java new file mode 100644 index 0000000..1a31f05 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/config/SecurityConfiguration.java @@ -0,0 +1,27 @@ +package br.com.prontorecife.auth.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +@EnableWebSecurity +public class SecurityConfiguration { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity httpSecurity) throws Exception { + return httpSecurity.csrf(csrf -> csrf.disable()) + .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .authorizeHttpRequests(authorize -> authorize.anyRequest().permitAll()) + .build(); + } + @Bean + public PasswordEncoder passwordEncoder(){ + return new BCryptPasswordEncoder(); + } +} From 3846c2a80998e79fe7e8904c952988181db92880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Wed, 4 Dec 2024 00:54:21 -0300 Subject: [PATCH 06/24] =?UTF-8?q?Inicio=20das=20configura=C3=A7=C3=B5es=20?= =?UTF-8?q?principais=20do=20micro=20servi=C3=A7o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Redis - Docker --- Dockerfile | 18 ++++++++++++++++ docker-compose.yml | 17 +++++++++++++++ .../prontorecife/auth/config/RedisConfig.java | 21 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml create mode 100644 src/main/java/br/com/prontorecife/auth/config/RedisConfig.java diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..af09de4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +FROM maven:3.9.8-amazoncorretto-21 AS build +WORKDIR /app +COPY . . + +RUN mvn clean package -DskipTests -Dmaven.resources.encoding=UTF-8 + +FROM openjdk:21-jdk +WORKDIR /app + +EXPOSE 8080 + +COPY --from=build /app/target/pronto-recife-0.0.1-SNAPSHOT.jar app.jar +ENTRYPOINT ["java", "-jar", "app.jar"] + +FROM mysql:8.0.40-debian +COPY init.sql /docker-entrypoint-initdb.d/init.sql +EXPOSE 3306 + diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..b04ebc1 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,17 @@ +services: + mysql: + image: mysql:8.0.40-debian + container_name: mysql + environment: + MYSQL_DATABASE: prontorecife + MYQSL_USER: root + MYSQL_PASSWORD: root + MYSQL_ROOT_PASSWORD: root + ports: + - "3308:3306" + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD}"] + interval: 10s + retries: 5 + start_period: 30s + timeout: 10s diff --git a/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java b/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java new file mode 100644 index 0000000..a9536c7 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java @@ -0,0 +1,21 @@ +package br.com.prontorecife.auth.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@Configuration +public class RedisConfig { + + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate<>(); + template.setConnectionFactory(connectionFactory); + template.setKeySerializer(new StringRedisSerializer()); + template.setValueSerializer(new GenericJackson2JsonRedisSerializer()); + return template; + } +} \ No newline at end of file From b7bc22389195a03a7b4db00880c1b593b0154633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Wed, 4 Dec 2024 17:39:29 -0300 Subject: [PATCH 07/24] =?UTF-8?q?Ajustes:=20Adi=C3=A7=C3=A3o=20de=20depend?= =?UTF-8?q?encias=20no=20pom.xml,=20ajustes=20no=20aplication=20properties?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 +++++ .../java/br/com/prontorecife/auth/config/RedisConfig.java | 6 +++--- src/main/resources/application.properties | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 73b91e8..22b636e 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,11 @@ spring-security-test test + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.7.0 + diff --git a/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java b/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java index a9536c7..6b7189b 100644 --- a/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java +++ b/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java @@ -7,15 +7,15 @@ import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -@Configuration +//@Configuration public class RedisConfig { - @Bean + /* @Bean public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) { RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); template.setKeySerializer(new StringRedisSerializer()); template.setValueSerializer(new GenericJackson2JsonRedisSerializer()); return template; - } + }*/ } \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 717f0c5..0efda27 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=Auth -spring.datasource.url=jdbc:mysql://localhost:3308/prontorecife +spring.datasource.url=jdbc:mysql://localhost:3307/prontorecife spring.datasource.username=root spring.datasource.password=root #spring.data.redis.host= From 2debaf385f1aa5b2fa4d7be119ceae59f8479498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Fri, 6 Dec 2024 00:07:17 -0300 Subject: [PATCH 08/24] Ajuste no Security Filter, Token Service e Authentication controller. --- Dockerfile | 7 +-- docker-compose.yml | 35 ++++++++++- .../Controller/AuthenticationController.java | 13 ++-- .../auth/Models/PacienteModel.java | 8 +-- .../auth/Security/SecurityFilter.java | 61 +++++++++++++++++++ .../auth/Service/TokenService.java | 8 +++ 6 files changed, 115 insertions(+), 17 deletions(-) create mode 100644 src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java diff --git a/Dockerfile b/Dockerfile index af09de4..67c6522 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,5 @@ WORKDIR /app EXPOSE 8080 -COPY --from=build /app/target/pronto-recife-0.0.1-SNAPSHOT.jar app.jar +COPY --from=build /app/target/auth-0.0.1-SNAPSHOT.jar app.jar ENTRYPOINT ["java", "-jar", "app.jar"] - -FROM mysql:8.0.40-debian -COPY init.sql /docker-entrypoint-initdb.d/init.sql -EXPOSE 3306 - diff --git a/docker-compose.yml b/docker-compose.yml index b04ebc1..06d02da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,14 +4,43 @@ services: container_name: mysql environment: MYSQL_DATABASE: prontorecife - MYQSL_USER: root + MYSQL_USER: root MYSQL_PASSWORD: root MYSQL_ROOT_PASSWORD: root ports: - - "3308:3306" + - "3307:3306" healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD}"] + test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-proot"] interval: 10s retries: 5 start_period: 30s timeout: 10s + + app: + depends_on: + mysql: + condition: service_healthy + build: . + container_name: prontorecife_app + environment: + SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/prontorecife + SPRING_DATASOURCE_USERNAME: root + SPRING_DATASOURCE_PASSWORD: root + ports: + - "8081:8080" + + flyway: + image: flyway/flyway:8.5.11 + depends_on: + mysql: + condition: service_healthy + container_name: flyway + restart: always # Adicionado + environment: + FLYWAY_URL: jdbc:mysql://mysql:3306/prontorecife?allowPublicKeyRetrieval=true&useSSL=false + FLYWAY_USER: root + FLYWAY_PASSWORD: root + FLYWAY_SCHEMAS: prontorecife + volumes: + - ./flyway:/flyway/sql + command: -connectRetries=10 migrate diff --git a/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java b/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java index 727efb1..4f314ff 100644 --- a/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java +++ b/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java @@ -6,10 +6,7 @@ import br.com.prontorecife.auth.Service.TokenService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @@ -23,6 +20,14 @@ public SessionDTO login(@RequestBody AuthenticationRequestDTO request){ String token = authenticationService.authenticate(request); return new SessionDTO(token); } + @PostMapping("/logout") + public ResponseEntity logout(@RequestHeader("Authorization") String token){ + String processedToken = token.startsWith("token: ") ? token.substring(7) : token; + + tokenService.invalidateToken(processedToken); + + return ResponseEntity.ok("Logout realizado com sucesso!"); + } @PostMapping("/session") public ResponseEntity verifySession(@RequestBody SessionDTO request){ tokenService.validateToken(request.getAccessToken()); diff --git a/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java b/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java index ab4a059..2608bc1 100644 --- a/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java +++ b/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java @@ -21,7 +21,9 @@ public class PacienteModel{ private String id; @Column(name = "cpf", unique = true, length = 14) private String CPF; - @Column(name = "nome_completo") + @Column (name = "estado_civil") + private String estadoCivil; + @Column (name = "nome_completo") private String nomeCompleto; @Column(name = "data_nascimento") private LocalDate dataNascimento; @@ -30,11 +32,9 @@ public class PacienteModel{ private String email; private String senha; private String telefone; - @Column(name = "contato_representante") private String contatoRepresentante; - private String cep; private String endereco; - @Column(name = "responsavel_cpf", length = 14) + @Column(name = "responsavel_CPF", length = 14) private String responsavelCpf; @PrePersist diff --git a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java new file mode 100644 index 0000000..f530e63 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java @@ -0,0 +1,61 @@ +package br.com.prontorecife.auth.Security; + +import br.com.prontorecife.auth.Exceptions.AuthorizationHeaderException; +import br.com.prontorecife.auth.Service.TokenService; +import br.com.prontorecife.auth.Exceptions.CustomException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Component +@RequiredArgsConstructor +public class SecurityFilter extends OncePerRequestFilter { + + private final TokenService tokenService; + + protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response, @NonNull FilterChain filterChain) throws ServletException, IOException, AuthenticationException { + if (request.getRequestURI().startsWith("/swagger") + || request.getRequestURI().startsWith("/v3/api-docs") + || request.getRequestURI().startsWith("/auth/register") + || request.getRequestURI().startsWith("/auth/login") + || request.getRequestURI().startsWith("/auth/session")) { + filterChain.doFilter(request, response); + return; + } + String token = this.recoverToken(request); + String validatedToken = tokenService.validateToken(token); + //String email = tokenService.getEmailFromToken(validatedToken); + if (token != null && token.startsWith("Bearer: ")) { + String processedToken = token.substring(7); + if (tokenService.isTokenInvalid(processedToken)) { + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + response.getWriter().write("Token invalido ou expirado!"); + return; + } + } + /*if (validatedToken.isEmpty()) { + throw new CustomException("Não foi possivel receber o email de autenticação do usuário ou o token!", HttpStatus.UNAUTHORIZED, null); + } + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(email, null); + SecurityContextHolder.getContext().setAuthentication(authenticationToken);*/ + filterChain.doFilter(request, response); + } + private String recoverToken (@NonNull HttpServletRequest request){ + String authHeader = request.getHeader("Authorization"); + if (authHeader == null || authHeader.isEmpty()) { + throw new AuthorizationHeaderException(); + } + return authHeader.substring(7); + } +} \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Service/TokenService.java b/src/main/java/br/com/prontorecife/auth/Service/TokenService.java index 6087f02..bfd4c91 100644 --- a/src/main/java/br/com/prontorecife/auth/Service/TokenService.java +++ b/src/main/java/br/com/prontorecife/auth/Service/TokenService.java @@ -17,11 +17,13 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; @Service public class TokenService { @Value("${jjwt.secret}") private String jjwtSecret; + private final ConcurrentHashMap invalidatedTokens = new ConcurrentHashMap<>(); public String generateToken(String id){ return Jwts.builder() @@ -45,6 +47,12 @@ public String validateToken(String token){ throw new CustomException("Sessão invalida!", HttpStatus.FORBIDDEN, Map.of("error", e.getMessage())); } } + public void invalidateToken(String token){ + invalidatedTokens.put(token, true); + } + public boolean isTokenInvalid(String token) { + return invalidatedTokens.containsKey(token); + } public Algorithm encryptor(String jjwtSecret){ return Algorithm.HMAC256(jjwtSecret); } From a64cb64ce23547f62af209b87f7e46033de07689 Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sat, 7 Dec 2024 15:58:35 -0300 Subject: [PATCH 09/24] Ajuste no application.properties --- src/main/resources/application.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0efda27..7ec59d3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,6 +2,7 @@ spring.application.name=Auth spring.datasource.url=jdbc:mysql://localhost:3307/prontorecife spring.datasource.username=root spring.datasource.password=root +server.port=8082 #spring.data.redis.host= #spring.data.redis.port= #spring.data.redis.password= @@ -17,4 +18,6 @@ logging.level.org.hibernate.SQL = DEBUG spring.jpa.defer-datasource-initialization=true spring.sql.init.mode=always -#http://localhost:8080/swagger-ui.html. \ No newline at end of file +#http://localhost:8080/swagger-ui.html. + +logging.level.org.springdoc=DEBUG \ No newline at end of file From 65d71a8a2608a7b8adfc8bf83424ef67b294eafc Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sat, 7 Dec 2024 19:10:22 -0300 Subject: [PATCH 10/24] =?UTF-8?q?Adicionar=20controller=20RedisTestControl?= =?UTF-8?q?ler=20para=20testar=20conex=C3=A3o=20com=20o=20redis=20no=20end?= =?UTF-8?q?point=20/test-redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/prontorecife/auth/AuthApplication.java | 1 + .../auth/Controller/RedisTestController.java | 18 ++++++++++++++++++ .../auth/Security/SecurityFilter.java | 3 ++- src/main/resources/application.properties | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java diff --git a/src/main/java/br/com/prontorecife/auth/AuthApplication.java b/src/main/java/br/com/prontorecife/auth/AuthApplication.java index 9d6fd52..1b554f9 100644 --- a/src/main/java/br/com/prontorecife/auth/AuthApplication.java +++ b/src/main/java/br/com/prontorecife/auth/AuthApplication.java @@ -10,4 +10,5 @@ public static void main(String[] args) { SpringApplication.run(AuthApplication.class, args); } + } diff --git a/src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java b/src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java new file mode 100644 index 0000000..20256d3 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java @@ -0,0 +1,18 @@ +package br.com.prontorecife.auth.Controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class RedisTestController { + @Autowired + private StringRedisTemplate redisTemplate; + + @GetMapping("/test-redis") + public String testRedis(){ + redisTemplate.opsForValue().set("testKey", "Hello, Redis!"); + return redisTemplate.opsForValue().get("testKey"); + } +} \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java index f530e63..b3924f8 100644 --- a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java +++ b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java @@ -29,7 +29,8 @@ protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull Ht || request.getRequestURI().startsWith("/v3/api-docs") || request.getRequestURI().startsWith("/auth/register") || request.getRequestURI().startsWith("/auth/login") - || request.getRequestURI().startsWith("/auth/session")) { + || request.getRequestURI().startsWith("/auth/session") + || request.getRequestURI().startsWith("/test-redis")) { filterChain.doFilter(request, response); return; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7ec59d3..af842cd 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.application.name=Auth spring.datasource.url=jdbc:mysql://localhost:3307/prontorecife spring.datasource.username=root spring.datasource.password=root -server.port=8082 +server.port=8083 #spring.data.redis.host= #spring.data.redis.port= #spring.data.redis.password= From d29428c1a2fcb13a9c0d1bcbbe963da43377699f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Sat, 7 Dec 2024 23:11:54 -0300 Subject: [PATCH 11/24] =?UTF-8?q?Configura=C3=A7=C3=A3o=20dos=20metodos=20?= =?UTF-8?q?do=20Redis,=20ajuste=20no=20metodo=20logout=20e=20no=20Token=20?= =?UTF-8?q?Service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AuthenticationController.java | 5 +++-- .../auth/Controller/RedisTestController.java | 15 +++++++++++++- .../prontorecife/auth/Enum/LoginFlowEnum.java | 4 ++-- .../auth/Security/SecurityFilter.java | 2 +- .../auth/Service/AuthenticationService.java | 8 ++++---- .../auth/Service/RedisService.java | 20 +++++++++++++++++++ .../auth/Service/TokenService.java | 9 ++++++--- src/main/resources/application.properties | 6 +++--- 8 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 src/main/java/br/com/prontorecife/auth/Service/RedisService.java diff --git a/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java b/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java index 4f314ff..1095f1a 100644 --- a/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java +++ b/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java @@ -22,9 +22,10 @@ public SessionDTO login(@RequestBody AuthenticationRequestDTO request){ } @PostMapping("/logout") public ResponseEntity logout(@RequestHeader("Authorization") String token){ - String processedToken = token.startsWith("token: ") ? token.substring(7) : token; + String processedToken = token.startsWith("Bearer ") ? token.substring(7) : token; - tokenService.invalidateToken(processedToken); + long expirationTimeInSeconds = 86400; + tokenService.invalidateToken(processedToken, expirationTimeInSeconds); return ResponseEntity.ok("Logout realizado com sucesso!"); } diff --git a/src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java b/src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java index 20256d3..7f850a2 100644 --- a/src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java +++ b/src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java @@ -10,9 +10,22 @@ public class RedisTestController { @Autowired private StringRedisTemplate redisTemplate; - @GetMapping("/test-redis") + /* @GetMapping("/test-redis") public String testRedis(){ redisTemplate.opsForValue().set("testKey", "Hello, Redis!"); return redisTemplate.opsForValue().get("testKey"); + }*/ + @GetMapping("/redis-test") + public String testRedisConnection() { + try { + // Salvar um valor no Redis + redisTemplate.opsForValue().set("test-key", "Redis conectado!"); + + // Recuperar o valor do Redis + String value = redisTemplate.opsForValue().get("test-key"); + return "Conexão com Redis bem-sucedida! Valor armazenado: " + value; + } catch (Exception e) { + return "Falha ao conectar ao Redis: " + e.getMessage(); + } } } \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java b/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java index 8530ad1..8e3f479 100644 --- a/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java +++ b/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java @@ -5,8 +5,8 @@ public enum LoginFlowEnum { CRM, - CPF, - CNPJ; + CPF; + //CNPJ; @JsonValue @Override diff --git a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java index b3924f8..bfa18d7 100644 --- a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java +++ b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java @@ -37,7 +37,7 @@ protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull Ht String token = this.recoverToken(request); String validatedToken = tokenService.validateToken(token); //String email = tokenService.getEmailFromToken(validatedToken); - if (token != null && token.startsWith("Bearer: ")) { + if (token != null && token.startsWith("Bearer ")) { String processedToken = token.substring(7); if (tokenService.isTokenInvalid(processedToken)) { response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); diff --git a/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java b/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java index bae9445..8ad0c59 100644 --- a/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java +++ b/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java @@ -36,13 +36,13 @@ public class AuthenticationService { private final TokenService tokenService; public String authenticate(AuthenticationRequestDTO request){ - if (request.getFlow() == LoginFlowEnum.CNPJ) { + /*if (request.getFlow() == LoginFlowEnum.CNPJ) { EstabelecimentoModel estabelecimento = getEstabelecimento(request.getIdentificador()); if (!passwordEncoder.matches(request.getSenha(), estabelecimento.getSenha())) { throw new CustomException("CNPJ ou Senha Incorreta!", HttpStatus.UNAUTHORIZED, null); } return tokenService.generateToken(estabelecimento.getId()); - } + }*/ if (request.getFlow() == LoginFlowEnum.CRM) { MedicoModel medico = getMedico(request.getIdentificador()); if (!passwordEncoder.matches(request.getSenha(), medico.getSenha())) { @@ -67,8 +67,8 @@ public PacienteModel getPaciente(String cpf){ return pacienteRepository.findByCPF(cpf).orElseThrow(() -> new RuntimeException("Paciente Não Encontrado!")); } - public EstabelecimentoModel getEstabelecimento(String cnpj){ + /*public EstabelecimentoModel getEstabelecimento(String cnpj){ return estabelecimentoRepository.findByCnpj(cnpj).orElseThrow(() -> new RuntimeException("Estabelecimento Não Encontrado!")); - } + }*/ } \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Service/RedisService.java b/src/main/java/br/com/prontorecife/auth/Service/RedisService.java new file mode 100644 index 0000000..ac3b1ee --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/Service/RedisService.java @@ -0,0 +1,20 @@ +package br.com.prontorecife.auth.Service; + +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.concurrent.TimeUnit; + +@Service +@RequiredArgsConstructor +public class RedisService { + private final StringRedisTemplate redisTemplate; + + public void addTokenToBlacklist(String token, long duration){ + redisTemplate.opsForValue().set(token, "blacklisted", duration, TimeUnit.SECONDS); + } + public boolean isTokenBlacklisted(String token){ + return redisTemplate.hasKey(token); + } +} diff --git a/src/main/java/br/com/prontorecife/auth/Service/TokenService.java b/src/main/java/br/com/prontorecife/auth/Service/TokenService.java index bfd4c91..7f5ad2f 100644 --- a/src/main/java/br/com/prontorecife/auth/Service/TokenService.java +++ b/src/main/java/br/com/prontorecife/auth/Service/TokenService.java @@ -4,6 +4,7 @@ import com.auth0.jwt.JWT; import com.auth0.jwt.interfaces.DecodedJWT; import io.jsonwebtoken.Jwts; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -20,9 +21,11 @@ import java.util.concurrent.ConcurrentHashMap; @Service +@RequiredArgsConstructor public class TokenService { @Value("${jjwt.secret}") private String jjwtSecret; + private final RedisService redisService; private final ConcurrentHashMap invalidatedTokens = new ConcurrentHashMap<>(); public String generateToken(String id){ @@ -47,11 +50,11 @@ public String validateToken(String token){ throw new CustomException("Sessão invalida!", HttpStatus.FORBIDDEN, Map.of("error", e.getMessage())); } } - public void invalidateToken(String token){ - invalidatedTokens.put(token, true); + public void invalidateToken(String token, long expirationTime){ + redisService.addTokenToBlacklist(token, expirationTime); } public boolean isTokenInvalid(String token) { - return invalidatedTokens.containsKey(token); + return redisService.isTokenBlacklisted(token); } public Algorithm encryptor(String jjwtSecret){ return Algorithm.HMAC256(jjwtSecret); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index af842cd..e13ea0f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,9 +3,9 @@ spring.datasource.url=jdbc:mysql://localhost:3307/prontorecife spring.datasource.username=root spring.datasource.password=root server.port=8083 -#spring.data.redis.host= -#spring.data.redis.port= -#spring.data.redis.password= +spring.data.redis.host=localhost +spring.data.redis.port=6379 +spring.data.redis.password=root spring.jpa.hibernate.ddl-auto=none spring.datasource.hikari.maximum-pool-size=10 #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect From cfb7187ef341c26f9f851d0673dd9059760af594 Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sun, 8 Dec 2024 01:28:38 -0300 Subject: [PATCH 12/24] Ajuste no application.properties: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Mudança nas credenciais do banco de dados para suporte ao deploy na nuvem Railway - Atribuição das credenciais do Redis para suporte ao deploy na nuvem Railway --- src/main/resources/application.properties | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e13ea0f..d2ec4aa 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,23 +1,15 @@ spring.application.name=Auth -spring.datasource.url=jdbc:mysql://localhost:3307/prontorecife +spring.datasource.url=jdbc:mysql://autorack.proxy.rlwy.net:32736/prontorecife spring.datasource.username=root -spring.datasource.password=root -server.port=8083 -spring.data.redis.host=localhost -spring.data.redis.port=6379 -spring.data.redis.password=root +spring.datasource.password=ZMNMcoCclYMYjKAAGygxbyccOcpiQQVc +spring.data.redis.host=junction.proxy.rlwy.net +spring.data.redis.port=30951 +spring.data.redis.password=ffLHhJnwImcmhCsuikcixfUdPOdIOEHj spring.jpa.hibernate.ddl-auto=none spring.datasource.hikari.maximum-pool-size=10 -#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect springdoc.swagger-ui.path=/swagger-ui.html jjwt.secret = VGhlIHN0YW5kYXJkIExvcmVtIElwc3VtIHBhc3NhZ2UsIHVzZWQgc2luY2UgdGhlIDE1MDBz spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -logging.level.org.hibernate.SQL = DEBUG -#logging.level.org.springframework.jdbc.core = DEBUG -#spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true spring.jpa.defer-datasource-initialization=true -spring.sql.init.mode=always -#http://localhost:8080/swagger-ui.html. - -logging.level.org.springdoc=DEBUG \ No newline at end of file +spring.sql.init.mode=always \ No newline at end of file From 3c7ac959ee695a5640f1d48742923f75e19e34e2 Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sun, 8 Dec 2024 02:00:23 -0300 Subject: [PATCH 13/24] Ajuste no endpoint /session e /logout na classe AuthenticationController: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Implementar método tokenService.invalidateToken no /logout - Implementar retorno de verificação de token no /session - Mudança de tipo de retorno no método validateToken - Implementar retorno de verificão token isTokenBlackListed --- .../auth/Controller/AuthenticationController.java | 13 ++++++++----- .../com/prontorecife/auth/Service/TokenService.java | 8 ++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java b/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java index 1095f1a..603a9b3 100644 --- a/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java +++ b/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java @@ -5,12 +5,16 @@ import br.com.prontorecife.auth.Service.AuthenticationService; import br.com.prontorecife.auth.Service.TokenService; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor @RequestMapping("/auth") +@Slf4j public class AuthenticationController { private final TokenService tokenService; private final AuthenticationService authenticationService; @@ -21,17 +25,16 @@ public SessionDTO login(@RequestBody AuthenticationRequestDTO request){ return new SessionDTO(token); } @PostMapping("/logout") - public ResponseEntity logout(@RequestHeader("Authorization") String token){ - String processedToken = token.startsWith("Bearer ") ? token.substring(7) : token; + public ResponseEntity logout(@RequestBody SessionDTO request){ long expirationTimeInSeconds = 86400; - tokenService.invalidateToken(processedToken, expirationTimeInSeconds); + tokenService.invalidateToken(request.getAccessToken(), expirationTimeInSeconds); return ResponseEntity.ok("Logout realizado com sucesso!"); } @PostMapping("/session") public ResponseEntity verifySession(@RequestBody SessionDTO request){ - tokenService.validateToken(request.getAccessToken()); - return ResponseEntity.ok().build(); + boolean valid = tokenService.validateToken(request.getAccessToken()); + return valid ? ResponseEntity.ok().build() : ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } } diff --git a/src/main/java/br/com/prontorecife/auth/Service/TokenService.java b/src/main/java/br/com/prontorecife/auth/Service/TokenService.java index 7f5ad2f..e4a624b 100644 --- a/src/main/java/br/com/prontorecife/auth/Service/TokenService.java +++ b/src/main/java/br/com/prontorecife/auth/Service/TokenService.java @@ -3,6 +3,7 @@ import br.com.prontorecife.auth.Exceptions.CustomException; import com.auth0.jwt.JWT; import com.auth0.jwt.interfaces.DecodedJWT; +import com.mysql.cj.util.StringUtils; import io.jsonwebtoken.Jwts; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; @@ -39,13 +40,16 @@ public String generateToken(String id){ private SecretKey getSecretKey() { return new SecretKeySpec(jjwtSecret.getBytes(), "HmacSHA256"); } - public String validateToken(String token){ + public boolean validateToken(String token){ Algorithm algorithm = encryptor(jjwtSecret); try { - return JWT.require(algorithm) + JWT.require(algorithm) .build() .verify(token) .getToken(); + + return !redisService.isTokenBlacklisted(token); + }catch (Exception e){ throw new CustomException("Sessão invalida!", HttpStatus.FORBIDDEN, Map.of("error", e.getMessage())); } From daba4816367d8b7039d199c30d54e6051c03d852 Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sun, 8 Dec 2024 02:54:11 -0300 Subject: [PATCH 14/24] =?UTF-8?q?Altera=C3=A7=C3=B5es=20na=20classe=20Secu?= =?UTF-8?q?rityFilter:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Mudança de tipo de retorno do método recoverToken - Alterar request header para x-auth --- .../auth/Security/SecurityFilter.java | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java index bfa18d7..cf4e755 100644 --- a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java +++ b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java @@ -9,6 +9,7 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.NonNull; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.AuthenticationException; @@ -20,6 +21,7 @@ @Component @RequiredArgsConstructor +@Slf4j public class SecurityFilter extends OncePerRequestFilter { private final TokenService tokenService; @@ -29,31 +31,21 @@ protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull Ht || request.getRequestURI().startsWith("/v3/api-docs") || request.getRequestURI().startsWith("/auth/register") || request.getRequestURI().startsWith("/auth/login") - || request.getRequestURI().startsWith("/auth/session") - || request.getRequestURI().startsWith("/test-redis")) { + || request.getRequestURI().startsWith("/auth/logout")){ filterChain.doFilter(request, response); return; } String token = this.recoverToken(request); - String validatedToken = tokenService.validateToken(token); - //String email = tokenService.getEmailFromToken(validatedToken); - if (token != null && token.startsWith("Bearer ")) { - String processedToken = token.substring(7); - if (tokenService.isTokenInvalid(processedToken)) { - response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); - response.getWriter().write("Token invalido ou expirado!"); - return; - } - } - /*if (validatedToken.isEmpty()) { - throw new CustomException("Não foi possivel receber o email de autenticação do usuário ou o token!", HttpStatus.UNAUTHORIZED, null); + log.info(token); + if (tokenService.isTokenInvalid(token)) { + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + response.getWriter().write("Token invalido ou expirado!"); + return; } - UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(email, null); - SecurityContextHolder.getContext().setAuthentication(authenticationToken);*/ filterChain.doFilter(request, response); } - private String recoverToken (@NonNull HttpServletRequest request){ - String authHeader = request.getHeader("Authorization"); + private String recoverToken (HttpServletRequest request){ + String authHeader = String.valueOf(request.getHeader("x-auth")); if (authHeader == null || authHeader.isEmpty()) { throw new AuthorizationHeaderException(); } From 9362ddabef0f09376c3ab1fdf8102d9311683abb Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sun, 8 Dec 2024 02:57:11 -0300 Subject: [PATCH 15/24] =?UTF-8?q?Altera=C3=A7=C3=B5es=20no=20m=C3=A9todo?= =?UTF-8?q?=20verifySession:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Incluir RequestHeader x-auth ao header da requisição no /session --- .../auth/Controller/AuthenticationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java b/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java index 603a9b3..0c9622a 100644 --- a/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java +++ b/src/main/java/br/com/prontorecife/auth/Controller/AuthenticationController.java @@ -33,8 +33,8 @@ public ResponseEntity logout(@RequestBody SessionDTO request){ return ResponseEntity.ok("Logout realizado com sucesso!"); } @PostMapping("/session") - public ResponseEntity verifySession(@RequestBody SessionDTO request){ - boolean valid = tokenService.validateToken(request.getAccessToken()); + public ResponseEntity verifySession(@RequestHeader(name="x-auth", required = true) String request){ + boolean valid = tokenService.validateToken(request); return valid ? ResponseEntity.ok().build() : ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } } From 746c1df0648aa11e0bda0facd19f26891f625a9e Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sun, 8 Dec 2024 02:58:52 -0300 Subject: [PATCH 16/24] =?UTF-8?q?Mudan=C3=A7a=20nos=20imports=20da=20class?= =?UTF-8?q?e=20AuthenticationService:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - import de CustomException --- .../auth/Service/AuthenticationService.java | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java b/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java index 8ad0c59..17e25f1 100644 --- a/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java +++ b/src/main/java/br/com/prontorecife/auth/Service/AuthenticationService.java @@ -2,47 +2,26 @@ import br.com.prontorecife.auth.DTOs.AuthenticationRequestDTO; import br.com.prontorecife.auth.Enum.LoginFlowEnum; -import br.com.prontorecife.auth.Service.TokenService; import br.com.prontorecife.auth.Exceptions.CustomException; -import br.com.prontorecife.auth.Models.EstabelecimentoModel; import br.com.prontorecife.auth.Models.MedicoModel; import br.com.prontorecife.auth.Models.PacienteModel; -import br.com.prontorecife.auth.Repositories.EstabelecimentoRepository; import br.com.prontorecife.auth.Repositories.MedicoRepository; import br.com.prontorecife.auth.Repositories.PacienteRepository; -import io.jsonwebtoken.Jwts; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.Date; - @Service @RequiredArgsConstructor public class AuthenticationService { - @Value("${jjwt.secret}") - private String jjwtSecret; private final MedicoRepository medicoRepository; private final PacienteRepository pacienteRepository; - private final EstabelecimentoRepository estabelecimentoRepository; private final PasswordEncoder passwordEncoder; private final TokenService tokenService; public String authenticate(AuthenticationRequestDTO request){ - /*if (request.getFlow() == LoginFlowEnum.CNPJ) { - EstabelecimentoModel estabelecimento = getEstabelecimento(request.getIdentificador()); - if (!passwordEncoder.matches(request.getSenha(), estabelecimento.getSenha())) { - throw new CustomException("CNPJ ou Senha Incorreta!", HttpStatus.UNAUTHORIZED, null); - } - return tokenService.generateToken(estabelecimento.getId()); - }*/ if (request.getFlow() == LoginFlowEnum.CRM) { MedicoModel medico = getMedico(request.getIdentificador()); if (!passwordEncoder.matches(request.getSenha(), medico.getSenha())) { @@ -67,8 +46,4 @@ public PacienteModel getPaciente(String cpf){ return pacienteRepository.findByCPF(cpf).orElseThrow(() -> new RuntimeException("Paciente Não Encontrado!")); } - /*public EstabelecimentoModel getEstabelecimento(String cnpj){ - return estabelecimentoRepository.findByCnpj(cnpj).orElseThrow(() -> - new RuntimeException("Estabelecimento Não Encontrado!")); - }*/ } \ No newline at end of file From 3bd74ce2b36eaad591286f0719bee05df5ba67bb Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sun, 8 Dec 2024 03:01:42 -0300 Subject: [PATCH 17/24] =?UTF-8?q?Adicionar=20classe=20de=20configura=C3=A7?= =?UTF-8?q?=C3=A3o=20do=20Redis:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - classe RedisConfig - Método RedisTemplate - Definir padrões de chave-valor --- .../br/com/prontorecife/auth/config/RedisConfig.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java b/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java index 6b7189b..101507e 100644 --- a/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java +++ b/src/main/java/br/com/prontorecife/auth/config/RedisConfig.java @@ -7,15 +7,15 @@ import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -//@Configuration +@Configuration public class RedisConfig { - /* @Bean - public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) { - RedisTemplate template = new RedisTemplate<>(); + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate<>(); template.setConnectionFactory(connectionFactory); template.setKeySerializer(new StringRedisSerializer()); template.setValueSerializer(new GenericJackson2JsonRedisSerializer()); return template; - }*/ + } } \ No newline at end of file From 60d36ed3937fafd8b055abfa443d4acd54e1e084 Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sun, 8 Dec 2024 03:04:15 -0300 Subject: [PATCH 18/24] Ajustes: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Mudança no LoginFlowEnum - Exclusão de arquivos não utilizados --- init.sql | 202 ------------------ .../auth/Controller/RedisTestController.java | 31 --- .../prontorecife/auth/Enum/LoginFlowEnum.java | 1 - .../auth/Models/EstabelecimentoModel.java | 34 --- .../EstabelecimentoRepository.java | 16 -- 5 files changed, 284 deletions(-) delete mode 100644 init.sql delete mode 100644 src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java delete mode 100644 src/main/java/br/com/prontorecife/auth/Models/EstabelecimentoModel.java delete mode 100644 src/main/java/br/com/prontorecife/auth/Repositories/EstabelecimentoRepository.java diff --git a/init.sql b/init.sql deleted file mode 100644 index 6be05f6..0000000 --- a/init.sql +++ /dev/null @@ -1,202 +0,0 @@ -CREATE SCHEMA IF NOT EXISTS `prontorecife` DEFAULT CHARACTER SET utf8; -USE `prontorecife`; - --- Tabela Estabelecimento -CREATE TABLE `estabelecimento` ( - id CHAR(36) DEFAULT (UUID()), - cnpj VARCHAR(18) UNIQUE NOT NULL, - nome VARCHAR(255) NOT NULL, - endereco VARCHAR(255) NOT NULL, - telefone VARCHAR(15) NOT NULL, - email VARCHAR(255) UNIQUE NOT NULL, - senha VARCHAR(255) NOT NULL, - id_medico CHAR(36), - id_paciente CHAR(36), - id_consulta CHAR(36), - PRIMARY KEY (`id`) -) ENGINE = InnoDB DEFAULT CHARSET=utf8; - --- Tabela Laudos -CREATE TABLE `laudos` ( - id CHAR(36) DEFAULT (UUID()), - descricao TEXT, - PRIMARY KEY (`id`) -) ENGINE = InnoDB DEFAULT CHARSET=utf8; - --- Tabela Responsável -CREATE TABLE IF NOT EXISTS `responsavel` ( - id CHAR(36) DEFAULT (UUID()), - nome_completo VARCHAR(100) NOT NULL, - grau_parentesco VARCHAR(45) NOT NULL, - data_nascimento DATE NOT NULL, - genero VARCHAR(10) NOT NULL, - telefone VARCHAR(15) NOT NULL, - email VARCHAR(50) UNIQUE , - cpf VARCHAR(14) UNIQUE NOT NULL, - PRIMARY KEY (`id`), - UNIQUE INDEX `email_UNIQUE` (`email` ASC), - UNIQUE INDEX `idx_cpf` (`cpf`) -- Índice adicionado para o campo cpf -) ENGINE = InnoDB DEFAULT CHARSET=utf8; - --- Tabela Médico -CREATE TABLE `medico` ( - id CHAR(36) DEFAULT (UUID()), - crm VARCHAR(15) UNIQUE NOT NULL, - id_estabelecimento CHAR(36), - especialidade VARCHAR(255) NOT NULL, - email VARCHAR(255) UNIQUE NOT NULL, - senha VARCHAR(255) NOT NULL, - nome_completo VARCHAR(100) NOT NULL, - telefone VARCHAR(15) NOT NULL, - PRIMARY KEY (`id`), - UNIQUE INDEX `crm_UNIQUE` (`crm` ASC), - UNIQUE INDEX `email_UNIQUE` (`email` ASC), - CONSTRAINT `fk_medico_estabelecimento` - FOREIGN KEY (id_estabelecimento) - REFERENCES estabelecimento (id) - ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB DEFAULT CHARSET=utf8; - --- tabela agente de saude -CREATE TABLE IF NOT EXISTS agente_saude ( - id CHAR(36) DEFAULT (UUID()), - nome VARCHAR(255) NOT NULL, - email VARCHAR(255) NOT NULL UNIQUE, - senha VARCHAR(255) NOT NULL, - telefone VARCHAR(255) NOT NULL, - id_estabelecimento CHAR(36), - PRIMARY KEY pk_id(id), - CONSTRAINT `fk_agente_estabelecimento` - FOREIGN KEY (id_estabelecimento) - REFERENCES estabelecimento (id) - ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB; - -CREATE TABLE IF NOT EXISTS profissional_saude ( - id CHAR(36) DEFAULT (UUID()), - nome VARCHAR(255) NOT NULL, - coren VARCHAR(15) UNIQUE NOT NULL, - email VARCHAR(255) UNIQUE NOT NULL, - senha VARCHAR(255) NOT NULL, - telefone VARCHAR(255) NOT NULL, - id_estabelecimento CHAR(36), - PRIMARY KEY pk_id(id), - CONSTRAINT `fk_profissional_estabelecimento` - FOREIGN KEY (id_estabelecimento) - REFERENCES estabelecimento (id) - ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB; - --- Tabela Paciente -CREATE TABLE IF NOT EXISTS `paciente` ( - id CHAR(36) DEFAULT (UUID()), - nome_completo VARCHAR(100) NOT NULL, - cpf VARCHAR(14) UNIQUE NOT NULL, - data_nascimento DATE NOT NULL, - genero VARCHAR(10) NOT NULL, - email VARCHAR(100) UNIQUE, - senha VARCHAR(255) NOT NULL, - telefone VARCHAR(15) NOT NULL, - contato_representante VARCHAR(15), - cep VARCHAR(9) NOT NULL, - endereco VARCHAR(250) NOT NULL, - responsavel_cpf VARCHAR(14), - id_estabelecimento CHAR(36), - PRIMARY KEY (`id`), - UNIQUE INDEX `email_UNIQUE` (`email` ASC), - CONSTRAINT `fk_paciente_responsavel` - FOREIGN KEY (`responsavel_cpf`) - REFERENCES `responsavel` (`cpf`) -ON DELETE NO ACTION ON UPDATE NO ACTION, - CONSTRAINT `fk_paciente_estabelecimento` - FOREIGN KEY (id_estabelecimento) - REFERENCES estabelecimento (id) - ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB DEFAULT CHARSET=utf8; - --- Tabela Consulta -CREATE TABLE `consulta` ( - id CHAR(36) DEFAULT (UUID()), - data_consulta DATE NOT NULL, - tratamentos_prescritos TEXT NOT NULL, - instrucoes_recomendacoes TEXT NOT NULL, - sintomas TEXT NOT NULL, - historico_familiar VARCHAR(255), - paciente_id CHAR(36) NOT NULL, - medico_id CHAR(36) NOT NULL, - laudos_id CHAR(36), - id_estabelecimento CHAR(36), - PRIMARY KEY (`id`), - CONSTRAINT `fk_consulta_paciente` - FOREIGN KEY (`paciente_id`) - REFERENCES `paciente` (`id`) - ON DELETE NO ACTION ON UPDATE NO ACTION, - CONSTRAINT `fk_consulta_medico` - FOREIGN KEY (`medico_id`) - REFERENCES `medico` (`id`) - ON DELETE NO ACTION ON UPDATE NO ACTION, - CONSTRAINT `fk_consulta_laudos` - FOREIGN KEY (`laudos_id`) - REFERENCES `laudos` (`id`) - ON DELETE NO ACTION ON UPDATE NO ACTION, - CONSTRAINT `fk_consulta_estabelecimento` - FOREIGN KEY (id_estabelecimento) - REFERENCES estabelecimento (id) - ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB DEFAULT CHARSET=utf8; - --- tabelas de reset password -CREATE TABLE password_reset_token ( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - token VARCHAR(6) NOT NULL, - expiration DATETIME NOT NULL, - medico_id CHAR(36), - paciente_id CHAR(36), - CONSTRAINT fk_password_reset_medico FOREIGN KEY (medico_id) - REFERENCES medico (id) ON DELETE CASCADE ON UPDATE NO ACTION, - CONSTRAINT fk_password_reset_paciente FOREIGN KEY (paciente_id) - REFERENCES paciente (id) ON DELETE CASCADE ON UPDATE NO ACTION -) ENGINE = InnoDB DEFAULT CHARSET=utf8; - -CREATE TABLE password_reset_token_seq ( - next_not_cached_value BIGINT(21) NOT NULL, - minimum_value BIGINT(21) NOT NULL, - maximum_value BIGINT(21) NOT NULL, - start_value BIGINT(21) NOT NULL, - increment BIGINT(21) NOT NULL, - cache_size BIGINT(21) NOT NULL, - cycle_option TINYINT(1) NOT NULL, - cycle_count BIGINT(21) NOT NULL -); - --- Tabela Exame do Paciente -CREATE TABLE IF NOT EXISTS `exame_do_paciente` ( - id CHAR(36) DEFAULT (UUID()), - data_exame DATE NOT NULL, - resultado TEXT NOT NULL, - nome_do_exame VARCHAR(100) NOT NULL, - paciente_id CHAR(36) NOT NULL, - consulta_id CHAR(36), - PRIMARY KEY (`id`), - CONSTRAINT `fk_exame_paciente` - FOREIGN KEY (`paciente_id`) - REFERENCES `paciente` (`id`) - ON DELETE NO ACTION ON UPDATE NO ACTION, - CONSTRAINT `fk_exame_consulta` - FOREIGN KEY (`consulta_id`) - REFERENCES `consulta` (`id`) - ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB DEFAULT CHARSET=utf8; - --- Tabela Histórico Médico -CREATE TABLE IF NOT EXISTS `historico_medico` ( - id CHAR(36) DEFAULT (UUID()), - cirurgias_anteriores TEXT, - condicoes_gerais VARCHAR(255), - paciente_id CHAR(36) NOT NULL, - PRIMARY KEY (`id`), - CONSTRAINT `fk_historico_paciente` - FOREIGN KEY (`paciente_id`) - REFERENCES `paciente` (`id`) - ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE = InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java b/src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java deleted file mode 100644 index 7f850a2..0000000 --- a/src/main/java/br/com/prontorecife/auth/Controller/RedisTestController.java +++ /dev/null @@ -1,31 +0,0 @@ -package br.com.prontorecife.auth.Controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class RedisTestController { - @Autowired - private StringRedisTemplate redisTemplate; - - /* @GetMapping("/test-redis") - public String testRedis(){ - redisTemplate.opsForValue().set("testKey", "Hello, Redis!"); - return redisTemplate.opsForValue().get("testKey"); - }*/ - @GetMapping("/redis-test") - public String testRedisConnection() { - try { - // Salvar um valor no Redis - redisTemplate.opsForValue().set("test-key", "Redis conectado!"); - - // Recuperar o valor do Redis - String value = redisTemplate.opsForValue().get("test-key"); - return "Conexão com Redis bem-sucedida! Valor armazenado: " + value; - } catch (Exception e) { - return "Falha ao conectar ao Redis: " + e.getMessage(); - } - } -} \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java b/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java index 8e3f479..585fda9 100644 --- a/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java +++ b/src/main/java/br/com/prontorecife/auth/Enum/LoginFlowEnum.java @@ -6,7 +6,6 @@ public enum LoginFlowEnum { CRM, CPF; - //CNPJ; @JsonValue @Override diff --git a/src/main/java/br/com/prontorecife/auth/Models/EstabelecimentoModel.java b/src/main/java/br/com/prontorecife/auth/Models/EstabelecimentoModel.java deleted file mode 100644 index 57c41d3..0000000 --- a/src/main/java/br/com/prontorecife/auth/Models/EstabelecimentoModel.java +++ /dev/null @@ -1,34 +0,0 @@ -package br.com.prontorecife.auth.Models; - -import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.UUID; - -@Entity -@Table(name = "estabelecimento") -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class EstabelecimentoModel { - @Id - private String id; - private String cnpj; - private String nome; - private String senha; - private String endereco; - private String telefone; - @Column(name = "email", unique = true) - private String email; - - @PrePersist - public void prePersist() { - if (id == null) { - id = UUID.randomUUID().toString(); - } - } -} diff --git a/src/main/java/br/com/prontorecife/auth/Repositories/EstabelecimentoRepository.java b/src/main/java/br/com/prontorecife/auth/Repositories/EstabelecimentoRepository.java deleted file mode 100644 index ce2623d..0000000 --- a/src/main/java/br/com/prontorecife/auth/Repositories/EstabelecimentoRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package br.com.prontorecife.auth.Repositories; - -import br.com.prontorecife.auth.Models.EstabelecimentoModel; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.Optional; - - -@Repository -public interface EstabelecimentoRepository extends JpaRepository { - Optional findByEmail(@NotBlank String email); - Optional findByCnpj(@NotNull @NotBlank String cnpj); -} From d7c8d9c771593c836a2ee2a33fdb573cda861000 Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sun, 8 Dec 2024 03:06:26 -0300 Subject: [PATCH 19/24] =?UTF-8?q?Cria=C3=A7=C3=A3o=20do=20arquivo=20dev.ym?= =?UTF-8?q?l=20para=20o=20processo=20de=20deploy=20do=20micro=20servi?= =?UTF-8?q?=C3=A7o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/dev.yml diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml new file mode 100644 index 0000000..ecd9d57 --- /dev/null +++ b/.github/workflows/dev.yml @@ -0,0 +1,26 @@ +name: Deploy in Railway -> Dev + +on: + push: + branches: + - Develop + +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: Check out code + uses: actions/checkout@v2 + + - name: Install curl + run: | + sudo apt-get update && sudo apt-get install -y curl + + - name: Install Railway CLI + run: | + curl -fsSL https://railway.app/install.sh | sh + + - name: Deploy to Railway + run: | + RAILWAY_TOKEN=${{ secrets.RAILWAY_TOKEN }} railway up --service=prontorecife_auth --environment dev --verbose \ No newline at end of file From 9a52bae97da7aa0ba8bca6062cca99b355b9a2bd Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Sun, 8 Dec 2024 03:10:38 -0300 Subject: [PATCH 20/24] Reajuste nas classes SecurityFilter e TokenService --- .../java/br/com/prontorecife/auth/Security/SecurityFilter.java | 3 +-- .../java/br/com/prontorecife/auth/Service/TokenService.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java index cf4e755..3762b37 100644 --- a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java +++ b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java @@ -29,7 +29,6 @@ public class SecurityFilter extends OncePerRequestFilter { protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response, @NonNull FilterChain filterChain) throws ServletException, IOException, AuthenticationException { if (request.getRequestURI().startsWith("/swagger") || request.getRequestURI().startsWith("/v3/api-docs") - || request.getRequestURI().startsWith("/auth/register") || request.getRequestURI().startsWith("/auth/login") || request.getRequestURI().startsWith("/auth/logout")){ filterChain.doFilter(request, response); @@ -49,6 +48,6 @@ private String recoverToken (HttpServletRequest request){ if (authHeader == null || authHeader.isEmpty()) { throw new AuthorizationHeaderException(); } - return authHeader.substring(7); + return authHeader; } } \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Service/TokenService.java b/src/main/java/br/com/prontorecife/auth/Service/TokenService.java index e4a624b..6243fc0 100644 --- a/src/main/java/br/com/prontorecife/auth/Service/TokenService.java +++ b/src/main/java/br/com/prontorecife/auth/Service/TokenService.java @@ -58,7 +58,7 @@ public void invalidateToken(String token, long expirationTime){ redisService.addTokenToBlacklist(token, expirationTime); } public boolean isTokenInvalid(String token) { - return redisService.isTokenBlacklisted(token); + return !redisService.isTokenBlacklisted(token); } public Algorithm encryptor(String jjwtSecret){ return Algorithm.HMAC256(jjwtSecret); From 3722b6cb95a4d5c7b229172b10b816b7b3c11e4a Mon Sep 17 00:00:00 2001 From: CarlosfcPinheiro Date: Mon, 9 Dec 2024 01:23:40 -0300 Subject: [PATCH 21/24] Ajuste nos imports e exports --- .../br/com/prontorecife/auth/DTOs/ExceptionResponseDTO.java | 2 +- .../prontorecife/auth/Exceptions/GlobalExceptionHandler.java | 2 +- .../java/br/com/prontorecife/auth/Models/PacienteModel.java | 2 -- .../br/com/prontorecife/auth/Security/SecurityFilter.java | 4 ---- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/br/com/prontorecife/auth/DTOs/ExceptionResponseDTO.java b/src/main/java/br/com/prontorecife/auth/DTOs/ExceptionResponseDTO.java index 2a9250c..d989af2 100644 --- a/src/main/java/br/com/prontorecife/auth/DTOs/ExceptionResponseDTO.java +++ b/src/main/java/br/com/prontorecife/auth/DTOs/ExceptionResponseDTO.java @@ -1,4 +1,4 @@ -package com.start.pronto_recife.DTOs; +package br.com.prontorecife.auth.DTOs; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/br/com/prontorecife/auth/Exceptions/GlobalExceptionHandler.java b/src/main/java/br/com/prontorecife/auth/Exceptions/GlobalExceptionHandler.java index 16d7822..0e18968 100644 --- a/src/main/java/br/com/prontorecife/auth/Exceptions/GlobalExceptionHandler.java +++ b/src/main/java/br/com/prontorecife/auth/Exceptions/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ package br.com.prontorecife.auth.Exceptions; -import com.start.pronto_recife.DTOs.ExceptionResponseDTO; +import br.com.prontorecife.auth.DTOs.ExceptionResponseDTO; import org.springframework.http.ProblemDetail; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java b/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java index 2608bc1..3e36b4a 100644 --- a/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java +++ b/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java @@ -1,13 +1,11 @@ package br.com.prontorecife.auth.Models; -import com.fasterxml.jackson.annotation.JsonFormat; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.io.Serializable; import java.time.LocalDate; import java.util.UUID; diff --git a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java index 3762b37..5a7c9f3 100644 --- a/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java +++ b/src/main/java/br/com/prontorecife/auth/Security/SecurityFilter.java @@ -2,7 +2,6 @@ import br.com.prontorecife.auth.Exceptions.AuthorizationHeaderException; import br.com.prontorecife.auth.Service.TokenService; -import br.com.prontorecife.auth.Exceptions.CustomException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -10,10 +9,7 @@ import lombok.NonNull; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; From 77515edcf9d3a119e2e89645ed2d021eeaf08278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Tue, 10 Dec 2024 13:22:03 -0300 Subject: [PATCH 22/24] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20nos=20models=20e?= =?UTF-8?q?=20no=20aplication.properties?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prontorecife/auth/Models/MedicoModel.java | 17 +++++++++-------- .../prontorecife/auth/Models/PacienteModel.java | 13 ++++++++----- src/main/resources/application.properties | 1 + 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/br/com/prontorecife/auth/Models/MedicoModel.java b/src/main/java/br/com/prontorecife/auth/Models/MedicoModel.java index 61a1b86..5dde4b3 100644 --- a/src/main/java/br/com/prontorecife/auth/Models/MedicoModel.java +++ b/src/main/java/br/com/prontorecife/auth/Models/MedicoModel.java @@ -14,16 +14,18 @@ public class MedicoModel{ @Id private String id; - @Column(name = "CRM", unique = true) + @Column(name = "crm", unique = true) private String CRM; - @Column(name = "nome_completo") - private String nomeCompleto; - private String telefone; + @Column(name = "email") private String email; @Column(name = "senha") private String senha; - @Column (name = "id_estabelecimento") - private String idEstabelecimento; + @Column(name = "nome_completo") + private String nomeCompleto; + private String telefone; + + + @PrePersist public void prePersist() { @@ -31,5 +33,4 @@ public void prePersist() { id = UUID.randomUUID().toString(); } } -} - +} \ No newline at end of file diff --git a/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java b/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java index 3e36b4a..1e7d009 100644 --- a/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java +++ b/src/main/java/br/com/prontorecife/auth/Models/PacienteModel.java @@ -17,12 +17,10 @@ public class PacienteModel{ @Id private String id; - @Column(name = "cpf", unique = true, length = 14) - private String CPF; - @Column (name = "estado_civil") - private String estadoCivil; @Column (name = "nome_completo") private String nomeCompleto; + @Column(name = "cpf", unique = true, length = 14) + private String CPF; @Column(name = "data_nascimento") private LocalDate dataNascimento; private String genero; @@ -30,11 +28,16 @@ public class PacienteModel{ private String email; private String senha; private String telefone; + @Column(name = "contato_representante", unique = true) private String contatoRepresentante; private String endereco; - @Column(name = "responsavel_CPF", length = 14) + private String alergia; + @Column(name = "condicoes_cronicas", unique = true) + private String condicoesCronicas; + @Column(name = "responsavel_cpf", unique = true) private String responsavelCpf; + @PrePersist public void prePersist() { if (id == null) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d2ec4aa..534af73 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,6 +4,7 @@ spring.datasource.username=root spring.datasource.password=ZMNMcoCclYMYjKAAGygxbyccOcpiQQVc spring.data.redis.host=junction.proxy.rlwy.net spring.data.redis.port=30951 +server.port=8083 spring.data.redis.password=ffLHhJnwImcmhCsuikcixfUdPOdIOEHj spring.jpa.hibernate.ddl-auto=none spring.datasource.hikari.maximum-pool-size=10 From 30d93c49430c8d463700b0fadf09875d48566220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Tue, 10 Dec 2024 13:23:43 -0300 Subject: [PATCH 23/24] Ajuste no aplication.properties --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 534af73..b40406b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,7 +4,7 @@ spring.datasource.username=root spring.datasource.password=ZMNMcoCclYMYjKAAGygxbyccOcpiQQVc spring.data.redis.host=junction.proxy.rlwy.net spring.data.redis.port=30951 -server.port=8083 + spring.data.redis.password=ffLHhJnwImcmhCsuikcixfUdPOdIOEHj spring.jpa.hibernate.ddl-auto=none spring.datasource.hikari.maximum-pool-size=10 From 302fb6c4c1599292468f87b381e0f8037ca71c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96Ben-SS1?= Date: Tue, 10 Dec 2024 15:44:01 -0300 Subject: [PATCH 24/24] =?UTF-8?q?Implementa=C3=A7=C3=A3o=20do=20Web=20conf?= =?UTF-8?q?iguration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/prontorecife/auth/config/WebConfig.java | 16 ++++++++++++++++ src/main/resources/application.properties | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/main/java/br/com/prontorecife/auth/config/WebConfig.java diff --git a/src/main/java/br/com/prontorecife/auth/config/WebConfig.java b/src/main/java/br/com/prontorecife/auth/config/WebConfig.java new file mode 100644 index 0000000..d07cdf8 --- /dev/null +++ b/src/main/java/br/com/prontorecife/auth/config/WebConfig.java @@ -0,0 +1,16 @@ +package br.com.prontorecife.auth.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("*") + .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH") + .allowedHeaders("*"); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b40406b..534af73 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,7 +4,7 @@ spring.datasource.username=root spring.datasource.password=ZMNMcoCclYMYjKAAGygxbyccOcpiQQVc spring.data.redis.host=junction.proxy.rlwy.net spring.data.redis.port=30951 - +server.port=8083 spring.data.redis.password=ffLHhJnwImcmhCsuikcixfUdPOdIOEHj spring.jpa.hibernate.ddl-auto=none spring.datasource.hikari.maximum-pool-size=10