Skip to content

Commit e4013fc

Browse files
authored
Merge pull request #83 from neverovski/feature/forgot-password
Feature/forgot password
2 parents a786850 + 539b268 commit e4013fc

File tree

87 files changed

+1095
-451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1095
-451
lines changed

.env.example

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,59 @@
11
# APP
2+
NODE_ENV=development
3+
APP_HOST=http://127.0.0.1
24
APP_NAME=AUTH-SERVER
35
APP_PORT=5858
4-
APP_HOST=http://127.0.0.1
5-
APP_ENV=development
66

77
# JWT
8-
JWT_SECRET_TOKEN=
8+
JWT_EXPIRES_IN_ACCESS_TOKEN=15m
9+
JWT_EXPIRES_IN_REFRESH_TOKEN=30d
910
JWT_EXPIRES_IN_TOKEN=1d
1011
JWT_SECRET_ACCESS_TOKEN=
11-
JWT_EXPIRES_IN_ACCESS_TOKEN=15m
1212
JWT_SECRET_REFRESH_TOKEN=
13-
JWT_EXPIRES_IN_REFRESH_TOKEN=30d
13+
JWT_SECRET_TOKEN=
1414

1515
# LOGGER
1616
LOG_API_KEY=
1717
LOG_CLIENT=console
18-
LOG_ENABLED=false
19-
LOG_URL=
18+
LOG_ENABLED=true
2019
LOG_SSL_CA_BASE64=
20+
LOG_URL=
2121

2222
# DATABASE
23+
DB_CACHE_ENABLED=false
24+
DB_CACHE_TIME=5000
25+
DB_CHARSET=utf8
2326
DB_CLIENT=postgres
2427
DB_HOST=127.0.0.1
25-
DB_PORT=54323
26-
DB_USER=
27-
DB_PASSWORD=
28+
DB_LOG_ENABLED=true
2829
DB_NAME=
29-
DB_CHARSET=utf8
30-
DB_DEBUG=true
31-
DB_CACHE_TIME=5000
32-
DB_SSL_ENABLED=false
30+
DB_PASSWORD=
31+
DB_PORT=54323
3332
DB_SSL_CA_BASE64=
33+
DB_SSL_ENABLED=false
34+
DB_USER=
3435

3536
# REDIS
37+
REDIS_CLUSTER_MODE_ENABLED=false
3638
REDIS_HOST=127.0.0.1
39+
REDIS_PASSWORD=
3740
REDIS_PORT=6969
3841
REDIS_QUEUE_PREFIX=AUTH
39-
REDIS_PASSWORD=
40-
REDIS_USERNAME=
4142
REDIS_TLS=false
43+
REDIS_USERNAME=
4244

4345
# EMAIL SERVICE
4446
MAIL_DRIVER=smtp
47+
MAIL_ENCRYPTION=ssl
4548
MAIL_HOST=
46-
MAIL_PORT=465
4749
MAIL_NAME=
48-
MAIL_USERNAME=
4950
MAIL_PASSWORD=
50-
MAIL_ENCRYPTION=ssl
51+
MAIL_PORT=465
52+
MAIL_USERNAME=
5153

5254
# FACEBOOK
53-
FACEBOOK_URL=https://graph.facebook.com/me
5455
FACEBOOK_FIELDS=id,first_name,last_name,email
56+
FACEBOOK_URL=https://graph.facebook.com/me
5557

5658
# APPLE
5759
APPLE_URL=https://appleid.apple.com/auth/keys
@@ -61,3 +63,12 @@ GOOGLE_URL=https://www.googleapis.com/oauth2/v3/userinfo
6163

6264
# GITHUB
6365
GITHUB_URL=https://api.github.com/user
66+
67+
# REST CLIENT VSCODE [USER]
68+
REST_APPLE_TOKEN=
69+
REST_FACEBOOK_TOKEN=
70+
REST_GITHUB_TOKEN=
71+
REST_GOOGLE_TOKEN=
72+
REST_USER_ACCESS_TOKEN=
73+
REST_USER_LOGIN=[email protected]
74+
REST_USER_PASSWORD=12345678

.env.test

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,59 @@
11
# APP
2+
NODE_ENV=test
3+
APP_HOST=http://127.0.0.1
24
APP_NAME=AUTH-SERVER
35
APP_PORT=5858
4-
APP_HOST=APP_HOST
5-
APP_ENV=test
66

77
# JWT
8-
JWT_SECRET_TOKEN=JWT_SECRET_TOKEN
8+
JWT_EXPIRES_IN_ACCESS_TOKEN=15m
9+
JWT_EXPIRES_IN_REFRESH_TOKEN=30d
910
JWT_EXPIRES_IN_TOKEN=1d
1011
JWT_SECRET_ACCESS_TOKEN=JWT_SECRET_ACCESS_TOKEN
11-
JWT_EXPIRES_IN_ACCESS_TOKEN=15m
1212
JWT_SECRET_REFRESH_TOKEN=JWT_SECRET_REFRESH_TOKEN
13-
JWT_EXPIRES_IN_REFRESH_TOKEN=30d
13+
JWT_SECRET_TOKEN=JWT_SECRET_TOKEN
1414

1515
# LOGGER
1616
LOG_API_KEY=
1717
LOG_CLIENT=console
1818
LOG_ENABLED=false
19-
LOG_URL=
2019
LOG_SSL_CA_BASE64=
20+
LOG_URL=
2121

2222
# DATABASE
23+
DB_CACHE_ENABLED=false
24+
DB_CACHE_TIME=5000
25+
DB_CHARSET=utf8
2326
DB_CLIENT=postgres
2427
DB_HOST=127.0.0.1
25-
DB_PORT=5432
26-
DB_USER=DB_USER
27-
DB_PASSWORD=DB_PASSWORD
28+
DB_LOG_ENABLED=false
2829
DB_NAME=DB_NAME
29-
DB_CHARSET=utf8
30-
DB_DEBUG=false
31-
DB_CACHE_TIME=5000
32-
DB_SSL_ENABLED=false
30+
DB_PASSWORD=DB_PASSWORD
31+
DB_PORT=54323
3332
DB_SSL_CA_BASE64=
33+
DB_SSL_ENABLED=false
34+
DB_USER=
3435

3536
# REDIS
37+
REDIS_CLUSTER_MODE_ENABLED=false
3638
REDIS_HOST=127.0.0.1
37-
REDIS_PORT=6379
39+
REDIS_PASSWORD=
40+
REDIS_PORT=6969
3841
REDIS_QUEUE_PREFIX=AUTH
39-
REDIS_PASSWORD=REDIS_PASSWORD
40-
REDIS_USERNAME=REDIS_USERNAME
4142
REDIS_TLS=false
43+
REDIS_USERNAME=
4244

4345
# EMAIL SERVICE
4446
MAIL_DRIVER=smtp
45-
MAIL_HOST=MAIL_HOST
46-
MAIL_PORT=465
47-
MAIL_NAME=MAIL_NAME
48-
MAIL_USERNAME=MAIL_USERNAME
49-
MAIL_PASSWORD=MAIL_PASSWORD
5047
MAIL_ENCRYPTION=ssl
48+
MAIL_HOST=
49+
MAIL_NAME=
50+
MAIL_PASSWORD=
51+
MAIL_PORT=465
52+
MAIL_USERNAME=
5153

5254
# FACEBOOK
53-
FACEBOOK_URL=https://graph.facebook.com/me
5455
FACEBOOK_FIELDS=id,first_name,last_name,email
56+
FACEBOOK_URL=https://graph.facebook.com/me
5557

5658
# APPLE
5759
APPLE_URL=https://appleid.apple.com/auth/keys

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"rest-client.environmentVariables": {
33
"local": {
4-
"host": "http://127.0.0.1:5858"
4+
"host": "http://127.0.0.1:5858",
5+
"apiUrl": "http://127.0.0.1:5858/api",
56
}
67
},
78
"rest-client.defaultHeaders": {

http/auth.http

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,72 @@
1-
### LOGS USER INTO THE SYSTEM BY EMAIL AND PASSWORD
2-
POST {{host}}/api/auth/login
3-
Content-Type: application/json
1+
### LOGIN [USER]
2+
# @name loginUser
3+
POST {{apiUrl}}/auth/login
44

55
{
6-
"email": "[email protected]",
7-
"password": "12345678"
6+
"email": "{{$dotenv REST_USER_LOGIN}}",
7+
"password": "{{$dotenv REST_USER_PASSWORD}}"
88
}
99

10+
### LOGOUT [USER]
11+
POST {{apiUrl}}/auth/logout
12+
Authorization: Bearer {{loginUser.response.body.data.accessToken}}
1013

11-
### LOGS OUT CURRENT LOGGED-IN USER SESSION
12-
POST {{host}}/api/auth/logout
13-
Authorization: Bearer {{accessToken}}
14-
Content-Type: application/json
14+
### LOGOUT [USER]
15+
POST {{apiUrl}}/auth/logout
16+
Cookie: accessToken={{loginUser.response.body.data.accessToken}}
1517

16-
### FORGOT PASSWORD
17-
POST {{host}}/api/auth/forgot-password
18-
Content-Type: application/json
18+
### REFRESH-TOKEN [USER]
19+
POST {{apiUrl}}/auth/refresh-token
1920

2021
{
21-
"email": "{{email}}"
22+
"refreshToken": "{{loginUser.response.body.data.refreshToken}}"
2223
}
2324

24-
### RESET PASSWORD
25-
POST {{host}}/api/auth/reset-password
26-
Content-Type: application/json
27-
28-
{
29-
"token": "{{passwordToken}}",
30-
"password": "{{newPassword}}"
31-
}
32-
33-
### REFRESH TOKEN
34-
POST {{host}}/api/auth/refresh-token
35-
Content-Type: application/json
25+
### LOGS USER INTO THE SYSTEM THROUGH A APPLE
26+
POST {{apiUrl}}/auth/platform
3627

3728
{
38-
"refreshToken": "{{refreshToken}}"
29+
"token": "{{$dotenv REST_APPLE_TOKEN}}",
30+
"platform": "apple"
3931
}
4032

4133
### LOGS USER INTO THE SYSTEM THROUGH A FACEBOOK
42-
POST {{host}}/api/auth/platform
43-
Content-Type: application/json
34+
POST {{apiUrl}}/auth/platform
4435

4536
{
46-
"token": "{{facebookToken}}",
37+
"token": "{{$dotenv REST_FACEBOOK_TOKEN}}",
4738
"platform": "facebook"
4839
}
4940

50-
### LOGS USER INTO THE SYSTEM THROUGH A APPLE
51-
POST {{host}}/api/auth/platform
52-
Content-Type: application/json
41+
42+
### LOGS USER INTO THE SYSTEM THROUGH A GOOGLE
43+
POST {{apiUrl}}/auth/platform
5344

5445
{
55-
"token": "{{appleToken}}",
56-
"platform": "apple"
46+
"token": "{{$dotenv REST_GOOGLE_TOKEN}}",
47+
"platform": "github"
5748
}
5849

5950
### LOGS USER INTO THE SYSTEM THROUGH A GITHUB
60-
POST {{host}}/api/auth/platform
61-
Content-Type: application/json
51+
POST {{apiUrl}}/auth/platform
6252

6353
{
64-
"token": "{{githubToken}}",
54+
"token": "{{$dotenv REST_GITHUB_TOKEN}}",
6555
"platform": "github"
6656
}
57+
58+
### FORGOT PASSWORD BY EMAIL
59+
POST {{apiUrl}}/auth/password/email
60+
61+
{
62+
"email": "{{$dotenv REST_USER_LOGIN}}"
63+
}
64+
65+
### RESET PASSWORD BY EMAIL
66+
POST {{apiUrl}}/auth/password/reset/email
67+
68+
{
69+
"email": "{{$dotenv REST_USER_LOGIN}}",
70+
"token": "b70e0419-9839-4a6e-a799-8580e929e5a9",
71+
"password": "{{$dotenv REST_USER_PASSWORD}}"
72+
}

http/config/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

http/config/http-client.env.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

http/config/http-client.private.env.example.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

http/user.http

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
1-
### RETURN A CURRENT USER
2-
GET {{host}}/api/users/current
3-
Content-Type: application/json
1+
### RETURN A CURRENT USER [USER]
2+
GET {{apiUrl}}/users/current
3+
Authorization: Bearer {{dotenv REST_USER_ACCESS_TOKEN}}
44

5-
### UPDATE A CURRENT USER
6-
PUT {{host}}/api/users/current
7-
Authorization: Bearer {{accessToken}}
8-
Content-Type: application/json
5+
### CREATE A USER [USER]
6+
POST {{apiUrl}}/users
97

108
{
9+
"email": "{{$dotenv REST_USER_LOGIN}}",
10+
"password": "{{$dotenv REST_USER_PASSWORD}}",
1111
"profile": {
12-
"firstName": "Dmitry",
13-
"lastName": "Neverovski"
12+
"firstName": "D.",
13+
"lastName": "N."
1414
}
1515
}
1616

17-
### CREATE A USER
18-
POST {{host}}/api/users
19-
Content-Type: application/json
17+
### UPDATE A CURRENT USER [USER]
18+
PUT {{apiUrl}}/users/current
19+
Authorization: Bearer {{dotenv REST_USER_ACCESS_TOKEN}}
2020

2121
{
22-
"email": "{{email}}",
23-
"password": "{{password}}",
2422
"profile": {
25-
"firstName": "D.",
26-
"lastName": "N."
23+
"firstName": "Dmitry",
24+
"lastName": "Neverovski"
2725
}
2826
}
2927

30-
### CHANGE PASSWORD FOR A CURRENT USER
31-
POST {{host}}/api/users/current/change-password
32-
Authorization: Bearer {{accessToken}}
33-
Content-Type: application/json
28+
### CHANGE PASSWORD FOR A CURRENT USER [USER]
29+
POST {{apiUrl}}/users/current/change-password
30+
Authorization: Bearer {{dotenv REST_USER_ACCESS_TOKEN}}
3431

3532
{
36-
"oldPassword": "{{password}}",
37-
"newPassword": "{{newPassword}}"
33+
"oldPassword": "{{$dotenv REST_USER_PASSWORD}}",
34+
"newPassword": "87654321"
3835
}
3936

40-
### DELETE A CURRENT USER
41-
DELETE {{host}}/api/users/current
42-
Authorization: Bearer {{accessToken}}
43-
Content-Type: application/json
37+
### DELETE A CURRENT USER [USER]
38+
DELETE {{apiUrl}}/users/current
39+
Authorization: Bearer {{dotenv REST_USER_ACCESS_TOKEN}}

0 commit comments

Comments
 (0)