Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge to main #1

Merged
merged 34 commits into from
Dec 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6d6b29b
rename root directory
gribanoveu Oct 13, 2023
cea9c46
refactor code
gribanoveu Oct 24, 2023
54b1eda
refresh token new logic
gribanoveu Oct 24, 2023
cf07d37
refactor moderator controller
gribanoveu Oct 24, 2023
769cb3d
change email length to 80 symbols
gribanoveu Oct 26, 2023
fc9f3bc
add utils to log request and response
gribanoveu Oct 26, 2023
b93a639
change status level to warning in CredentialEx
gribanoveu Oct 26, 2023
a64a2ea
refactor refresh token logic
gribanoveu Oct 26, 2023
8ebf44a
refactor response log, add graylog
gribanoveu Nov 27, 2023
dd5eba0
fix anonymous account endpoint
gribanoveu Nov 27, 2023
71ae1a8
clean response messages
gribanoveu Nov 28, 2023
7c858b0
fix server error message
gribanoveu Nov 28, 2023
444c560
create service to send email, add email when restore password
gribanoveu Nov 28, 2023
b6a73a7
add email template
gribanoveu Dec 2, 2023
b4738ff
serts gen instruction added
gribanoveu Dec 2, 2023
0049530
fix template
gribanoveu Dec 2, 2023
40fbbbe
fix template
gribanoveu Dec 2, 2023
0a60f87
Create successfull-registration.html
gribanoveu Dec 3, 2023
f119ec1
refactor emails
gribanoveu Dec 18, 2023
9cec24d
add swagger
gribanoveu Dec 18, 2023
b9ddf59
change name to cuddle
gribanoveu Dec 21, 2023
1023ec0
refactor project structure
gribanoveu Dec 22, 2023
046b14c
fix imports
gribanoveu Dec 22, 2023
6925651
add set moderator controller and refactor code
gribanoveu Dec 22, 2023
fc27f4c
enable https, refactor anonymous controller endpoint
gribanoveu Dec 22, 2023
9f67c0c
fix email templates
gribanoveu Dec 22, 2023
3c814e0
refactor get pageable users
gribanoveu Dec 22, 2023
8aeb46c
refactor email templates
gribanoveu Dec 22, 2023
4f92bd6
refactor account disabled logic, ban account, add more swagger
gribanoveu Dec 27, 2023
c051391
add missing swagger props
gribanoveu Dec 27, 2023
4aacc1d
refactor email templates
gribanoveu Dec 28, 2023
b649a79
translate error messages to russian
gribanoveu Dec 28, 2023
1860201
refactor api endpoints
gribanoveu Dec 28, 2023
f39f8f9
translate validation messages to russian
gribanoveu Dec 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .fleet/run.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"configurations": [

]
}
58 changes: 58 additions & 0 deletions docker/dev-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: cuddle
version: '3.7'

services:
postgres-db:
image: postgres:15.4-alpine
container_name: cuddle_db_postgres
restart: unless-stopped
environment:
POSTGRES_USER: auth_postgres
POSTGRES_PASSWORD: auth#7533245
POSTGRES_DB: auth_service_db
volumes:
- pgdata:/var/lib/postgresql/data
ports:
- "5432:5432"
command: >
postgres
-c max_connections=100
-c shared_buffers=256MB
-c effective_cache_size=512MB
-c maintenance_work_mem=128MB
-c checkpoint_completion_target=0.7
-c wal_buffers=8MB
-c random_page_cost=2
-c effective_io_concurrency=1
-c work_mem=8192kB

redis-db:
image: redis:7.2.1-alpine
container_name: cuddle_db_redis
restart: unless-stopped
ports:
- "6379:6379"
command: redis-server --save 20 1 --loglevel warning
volumes:
- cache:/data

# dev only stuff
mailcatcher:
container_name: cuddle_dev_mailcatcher
image: sj26/mailcatcher
restart: unless-stopped
ports:
- "1080:1080" # smtp
- "1025:1025" # http (ui)

it-tools:
container_name: cuddle_dev_it-tools
image: 'corentinth/it-tools:latest'
ports:
- '8888:80'
restart: unless-stopped

volumes:
pgdata:
cache:
driver: local
29 changes: 0 additions & 29 deletions docker/postgres-compose.yml

This file was deleted.

16 changes: 0 additions & 16 deletions docker/redis-compose.yml

This file was deleted.

2 changes: 1 addition & 1 deletion mvnw.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@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 specific language governing roles and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------

Expand Down
28 changes: 24 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@
</parent>

<groupId>com.github.gribanoveu</groupId>
<artifactId>auth-service</artifactId>
<artifactId>cuddle-backend</artifactId>
<version>0.1</version>
<name>auth-service</name>
<description>Auth stateless server on Spring Boot 3, Security 6</description>
<name>cuddle-backend</name>
<description>Cuddle backend server on Spring</description>

<properties>
<java.version>17</java.version>
<snakeyaml.version>2.0</snakeyaml.version>
<log-viewer-spring-boot.version>1.0.7</log-viewer-spring-boot.version>
<logback-gelf.version>5.0.0</logback-gelf.version>
<springdoc-openapi-starter-webmvc-ui.version>2.3.0</springdoc-openapi-starter-webmvc-ui.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -54,6 +57,14 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>

<!-- DB -->
<dependency>
Expand All @@ -79,7 +90,16 @@
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>

<dependency>
<groupId>de.siegmar</groupId>
<artifactId>logback-gelf</artifactId>
<version>${logback-gelf.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc-openapi-starter-webmvc-ui.version}</version>
</dependency>

<!-- TEST -->
<dependency>
Expand Down

This file was deleted.

10 changes: 0 additions & 10 deletions src/main/java/com/github/gribanoveu/auth/constants/Constants.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading