Merge branch 'develop' into features/testing-routes

.env.example

@@ -15,6 +15,8 @@ CLIENT_APP_HOST='url to root of client app'
 ## Email
 EMAIL_HOST='your smpt email host'
 EMAIL_USER='your email user'
-EMAIL_PASS='password for your email password'
 EMAIL_FROM='sender'
 EMAIL_PORT='smpt port'
+EMAIL_CLIENT_ID='client ig'
+EMAIL_CLIENT_SECRET='client secret'
+EMAIL_REFRESH_TOKEN='refresh token'

.github/workflows/publish-docker-image.yml

@@ -0,0 +1,44 @@
+name: Docker
+
+on:
+  push:
+    tags: [ 'v*.*.*' ]
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main", "develop" ]
+
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: bricks667/abctasks-server
+
+      - name: Extract package version
+        run: |
+          echo "TAG=$(jq -r '.version' package.json)" >> $GITHUB_ENV
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: |
+                  ${{ steps.meta.outputs.tags }}
+                  v${{ env.TAG }}
+          labels: ${{ steps.meta.outputs.labels }}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "server",
-	"version": "1.0.0",
+	"version": "2.2.1",
 	"description": "",
 	"main": "./dist/index.js",
 	"scripts": {
@@ -33,6 +33,7 @@
 		"class-validator": "^0.14.0",
 		"cookie-parser": "^1.4.6",
 		"express": "^4.18.2",
+		"googleapis": "^131.0.0",
 		"handlebars": "^4.7.7",
 		"nodemailer": "^6.9.1",
 		"redis": "^4.6.5",

src/auth/controllers/auth.controller.ts

@@ -110,6 +110,7 @@ export class AuthController {
 		type: AuthenticationResultDto,
 		description: 'Данные пользователя и пара токенов',
 	})
+	@DisableIsActivatedCheck()
 	@DisableAuthCheck()
 	@Post('login')
 	async login(

src/auth/services/auth/auth.service.ts

@@ -1,5 +1,4 @@
 import {
-	BadRequestException,
 	ConflictException,
 	ForbiddenException,
 	Injectable,
@@ -78,7 +77,7 @@ export class AuthService {
 		const user = await this.usersService.getInsecure({ email, });
 
 		if (!user.activated) {
-			throw new BadRequestException('User is not activated');
+			throw new ConflictException('User is not activated');
 		}
 
 		const isValidPassword = await compare(password, user.password);