Skip to content

fix sp_USER_login error codes #51

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.

Sign up for GitHub

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

Merged
kambizzandi merged 1 commit into from
Jan 12, 2022
Merged

fix sp_USER_login error codes #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Modules/Account/moduleSrc/ORM/Schema.my.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2582,7 +2582,7 @@ BEGIN
AND tblUser.usrStatus IN ('A','V');

IF NOT ISNULL(vUserApprovalState) AND vUserApprovalState NOT IN ('A', IF(vUserEmail = iLogin, 'E', 'M')) THEN
SET vMessage = CONCAT('405:', IF(vUserEmail = iLogin, 'Email', 'Mobile'), ' not approved');
SET vMessage = CONCAT('428:', IF(vUserEmail = iLogin, 'Email', 'Mobile'), ' not approved');

SIGNAL SQLSTATE '45000'
SET MESSAGE_TEXT = vMessage;
Expand Down Expand Up @@ -2622,7 +2622,7 @@ BEGIN
tblActionLogs.atlBy_usrID = vUserID;
COMMIT;
SIGNAL SQLSTATE '45000'
SET MESSAGE_TEXT = '405:Max sessions used close old sessions';
SET MESSAGE_TEXT = '409:Max sessions used close old sessions';

WHEN 'I' THEN
INSERT
Expand All @@ -2640,7 +2640,7 @@ BEGIN
tblActionLogs.atlBy_usrID = vUserID;
COMMIT;
SIGNAL SQLSTATE '45000'
SET MESSAGE_TEXT = '405:User Removed. Ask administrator';
SET MESSAGE_TEXT = '403:User Removed. Ask administrator';

WHEN 'B' THEN
INSERT
Expand All @@ -2649,7 +2649,7 @@ BEGIN
tblActionLogs.atlBy_usrID = vUserID;
COMMIT;
SIGNAL SQLSTATE '45000'
SET MESSAGE_TEXT = '405:User Blocked. Ask administrator';
SET MESSAGE_TEXT = '403:User Blocked. Ask administrator';

WHEN 'V' THEN
IF ISNULL(iOAuthInfo) THEN
Expand All @@ -2659,7 +2659,7 @@ BEGIN
tblActionLogs.atlBy_usrID = vUserID;
COMMIT;
SIGNAL SQLSTATE '45000'
SET MESSAGE_TEXT = '405:You must approve either email or mobile';
SET MESSAGE_TEXT = '428:You must approve either email or mobile';
END IF;

WHEN 'A' THEN
Expand Down