Skip to content
This repository was archived by the owner on Oct 21, 2024. It is now read-only.

Commit c33eb29

Browse files
author
kahverengi
committed
Review errorCodes
1 parent 7cfccb1 commit c33eb29

File tree

4 files changed

+28
-27
lines changed

4 files changed

+28
-27
lines changed

‎src/main/kotlin/com/parnote/ErrorCode.kt‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ enum class ErrorCode {
6565
UNKNOWN_ERROR_62,
6666
UNKNOWN_ERROR_63,
6767
UNKNOWN_ERROR_64,
68+
UNKNOWN_ERROR_65,
6869

6970
REGISTER_NAME_EMPTY,
7071
REGISTER_NAME_SHORT,
@@ -86,27 +87,27 @@ enum class ErrorCode {
8687

8788
RESET_PASSWORD_USERNAME_OR_EMAIL_INVALID,
8889

89-
LOGIN_IS_INVALID,
90+
LOGIN_LOGIN_IS_INVALID,
9091
LOGIN_EMAIL_NOT_VERIFIED,
9192

9293
EMAIL_VERIFICATION_INVALID_TOKEN,
9394

94-
TAKEN_EMAIL_ERROR,
95-
TAKEN_USERNAME_ERROR,
95+
REGISTER_TAKEN_EMAIL_ERROR,
96+
REGISTER_TAKEN_USERNAME_ERROR,
9697

9798
RECAPTCHA_NOT_VALID,
9899

99-
EXPIRED_TOKEN_VALIDATION,
100+
EXPIRED_TOKEN_VALIDATION, // system message
100101

101-
NEW_PASSWORD_EMPTY,
102-
NEW_PASSWORD_INVALID,
103-
NEW_PASSWORD_DOESNT_MATCH,
104-
NEW_PASSWORD_REPEAT_EMPTY,
105-
NEW_PASSWORD_REPEAT_INVALID,
102+
RESET_PASSWORD_NEW_PASSWORD_EMPTY,
103+
RESET_PASSWORD_NEW_PASSWORD_INVALID,
104+
RESET_PASSWORD_NEW_PASSWORD_DOESNT_MATCH,
105+
RESET_PASSWORD_NEW_PASSWORD_REPEAT_EMPTY,
106+
RESET_PASSWORD_NEW_PASSWORD_REPEAT_INVALID,
106107

107-
TOKEN_IS_INVALID,
108+
RESET_PASSWORD_INVALID_TOKEN,
108109

109-
NOT_LOGGED_IN,
110+
NOT_LOGGED_IN, // system message
110111

111112
SETTINGS_CHANGE_PASSWORD_INVALID_PASSWORD,
112113
SETTINGS_CHANGE_PASSWORD_NEW_PASSWORD_EMPTY,

‎src/main/kotlin/com/parnote/route/api/LoginAPI.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class LoginAPI : Api() {
7070

7171
if (!exists) {
7272
databaseManager.closeConnection(sqlConnection) {
73-
handler.invoke(Error(ErrorCode.LOGIN_IS_INVALID))
73+
handler.invoke(Error(ErrorCode.LOGIN_LOGIN_IS_INVALID))
7474
}
7575

7676
return@isExistsByUsernameOrEmail
@@ -137,7 +137,7 @@ class LoginAPI : Api() {
137137
if (isLoggedIn)
138138
handler.invoke(Successful())
139139
else
140-
handler.invoke(Error(ErrorCode.LOGIN_IS_INVALID))
140+
handler.invoke(Error(ErrorCode.LOGIN_LOGIN_IS_INVALID))
141141
}
142142
}
143143
}
@@ -155,25 +155,25 @@ class LoginAPI : Api() {
155155
successHandler: () -> Unit
156156
) {
157157
if (usernameOrEmail.isEmpty()) {
158-
errorHandler.invoke(Error(ErrorCode.LOGIN_IS_INVALID))
158+
errorHandler.invoke(Error(ErrorCode.LOGIN_LOGIN_IS_INVALID))
159159

160160
return
161161
}
162162

163163
if (!usernameOrEmail.matches(Regex("^[a-zA-Z0-9_]+\$")) && !usernameOrEmail.matches(Regex("^[\\w-.]+@([\\w-]+\\.)+[\\w-]{2,4}\$"))) {
164-
errorHandler.invoke(Error(ErrorCode.LOGIN_IS_INVALID))
164+
errorHandler.invoke(Error(ErrorCode.LOGIN_LOGIN_IS_INVALID))
165165

166166
return
167167
}
168168

169169
if (password.isEmpty()) {
170-
errorHandler.invoke(Error(ErrorCode.LOGIN_IS_INVALID))
170+
errorHandler.invoke(Error(ErrorCode.LOGIN_LOGIN_IS_INVALID))
171171

172172
return
173173
}
174174

175175
if (!password.matches(Regex("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[a-zA-Z]).{8,64}\$"))) {
176-
errorHandler.invoke(Error(ErrorCode.LOGIN_IS_INVALID))
176+
errorHandler.invoke(Error(ErrorCode.LOGIN_LOGIN_IS_INVALID))
177177

178178
return
179179
}

‎src/main/kotlin/com/parnote/route/api/RegisterAPI.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ class RegisterAPI : Api() {
260260

261261
if (emailExists) {
262262
databaseManager.closeConnection(sqlConnection) {
263-
handler.invoke(Error(ErrorCode.TAKEN_EMAIL_ERROR))
263+
handler.invoke(Error(ErrorCode.REGISTER_TAKEN_EMAIL_ERROR))
264264
}
265265

266266
return@handler
@@ -304,7 +304,7 @@ class RegisterAPI : Api() {
304304

305305
if (usernameExists) {
306306
databaseManager.closeConnection(sqlConnection) {
307-
handler.invoke(Error(ErrorCode.TAKEN_USERNAME_ERROR))
307+
handler.invoke(Error(ErrorCode.REGISTER_TAKEN_USERNAME_ERROR))
308308
}
309309

310310
return@handler

‎src/main/kotlin/com/parnote/route/api/ResetPasswordAPI.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ResetPasswordAPI : Api() {
5353

5454
if (!exists) {
5555
databaseManager.closeConnection(sqlConnection) {
56-
handler.invoke(Error(ErrorCode.TOKEN_IS_INVALID))
56+
handler.invoke(Error(ErrorCode.RESET_PASSWORD_INVALID_TOKEN))
5757
}
5858

5959
return@isTokenExists
@@ -88,7 +88,7 @@ class ResetPasswordAPI : Api() {
8888
return@closeConnection
8989
}
9090

91-
handler.invoke(Error(ErrorCode.TOKEN_IS_INVALID))
91+
handler.invoke(Error(ErrorCode.RESET_PASSWORD_INVALID_TOKEN))
9292
}
9393
}
9494

@@ -130,7 +130,7 @@ class ResetPasswordAPI : Api() {
130130
) { resultOfDeleteToken, _ ->
131131
databaseManager.closeConnection(sqlConnection) {
132132
if (resultOfDeleteToken == null) {
133-
handler.invoke(Error(ErrorCode.UNKNOWN_ERROR_28))
133+
handler.invoke(Error(ErrorCode.UNKNOWN_ERROR_65))
134134

135135
return@closeConnection
136136
}
@@ -161,31 +161,31 @@ class ResetPasswordAPI : Api() {
161161
}
162162

163163
if (newPassword.isEmpty()) {
164-
errorHandler.invoke(Error(ErrorCode.NEW_PASSWORD_EMPTY))
164+
errorHandler.invoke(Error(ErrorCode.RESET_PASSWORD_NEW_PASSWORD_EMPTY))
165165

166166
return
167167
}
168168

169169
if (newPasswordRepeat.isEmpty()) {
170-
errorHandler.invoke(Error(ErrorCode.NEW_PASSWORD_REPEAT_EMPTY))
170+
errorHandler.invoke(Error(ErrorCode.RESET_PASSWORD_NEW_PASSWORD_REPEAT_EMPTY))
171171

172172
return
173173
}
174174

175175
if (newPassword != newPasswordRepeat) {
176-
errorHandler.invoke(Error(ErrorCode.NEW_PASSWORD_DOESNT_MATCH))
176+
errorHandler.invoke(Error(ErrorCode.RESET_PASSWORD_NEW_PASSWORD_DOESNT_MATCH))
177177

178178
return
179179
}
180180

181181
if (!newPassword.matches(Regex("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[a-zA-Z]).{8,64}\$"))) {
182-
errorHandler.invoke(Error(ErrorCode.NEW_PASSWORD_INVALID))
182+
errorHandler.invoke(Error(ErrorCode.RESET_PASSWORD_NEW_PASSWORD_INVALID))
183183

184184
return
185185
}
186186

187187
if (!newPasswordRepeat.matches(Regex("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[a-zA-Z]).{8,64}\$"))) {
188-
errorHandler.invoke(Error(ErrorCode.NEW_PASSWORD_REPEAT_INVALID))
188+
errorHandler.invoke(Error(ErrorCode.RESET_PASSWORD_NEW_PASSWORD_REPEAT_INVALID))
189189

190190
return
191191
}

0 commit comments

Comments
 (0)