From fc72a1697fc32ebc63c956d9583be4173d051417 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 21 May 2023 10:40:55 -0400 Subject: [PATCH] Family login --- wrenchboard/src/include/wrenchboard_api.h | 3 +++ wrenchboard/src/shared_tool/account.cc | 11 +++++++++++ www-api/app/Config/Constants.php | 2 ++ www-api/app/Controllers/WrenchApi.php | 4 +++- www-api/public/svs/user/constants.php | 3 +++ www-api/public/svs/user/userve.php | 4 +++- 6 files changed, 25 insertions(+), 2 deletions(-) diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index 9516e2d2..61dfb4e5 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -31,6 +31,9 @@ enum { PARTNER_STRIPE }; #define APPLE_LOGIN 1103 #define GOOGLE_LOGIN 1104 +#define LOGIN_MODE_GENERAL 1100 +#define LOGIN_MODE_FAMILY 1105 + #define CONTRACT_CANCEL_CONTRACT 7 #define CONTRACT_EXTEND_TIMELINE 9 #define CONTRACT_NOTIFY_COMPLETE 4 diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc index 8e61098e..cc05808d 100644 --- a/wrenchboard/src/shared_tool/account.cc +++ b/wrenchboard/src/shared_tool/account.cc @@ -1504,10 +1504,21 @@ long LoginLogger( long member_id, long login_mode){ #define FACEBOOK_LOGIN 1102 #define APPLE_LOGIN 1103 #define GOOGLE_LOGIN 1104 +#define LOGIN_MODE_GENERAL 1100 +#define LOGIN_MODE_FAMILY 1105 */ +long LoginWrenchBoardFamilyLogin(CVars in, CVars &out); +long LoginWrenchBoardFamilyLogin(CVars in, CVars &out){ +logfmt(logINFO, "********~~~~~~~~ ------LoginWrenchBoardFamilyLogint()"); +return 0; +} long LoginWrenchBoardAccount(CVars in, CVars &out) { long ret = PHP_API_BAD_PARAM; + long login_mode = REQ_LONG(in, "login_mode", 1, -1); + if( login_mode == LOGIN_MODE_FAMILY){ + return LoginWrenchBoardFamilyLogin(in, out); + } logfmt(logINFO, "LoginWrenchBoardAccount()"); REQ_STRING(in, "username", 5, 49, "(.*)"); REQ_STRING(in, "password", 5, 49, "(.*)"); diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php index dd7c6133..bc1d8650 100644 --- a/www-api/app/Config/Constants.php +++ b/www-api/app/Config/Constants.php @@ -94,6 +94,8 @@ define('EVENT_PRIORITY_NORMAL', 100); define('EVENT_PRIORITY_HIGH', 10); +define('LOGIN_MODE_GENERAL', 1100); +define('LOGIN_MODE_FAMILY', 1105); define('ADD_JOB', 10010); define('UPDATE_JOB', 10020); diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index f87b3721..451a601f 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -321,7 +321,9 @@ class WrenchApi extends BaseController break; case 'userlogin': $in["action"] = WRENCHBOARD_ACCOUNT_LOGIN; - $in["login_mode"] = MOBILE_LOGIN; + if (!isset($in["login_mode"])){ + $in["login_mode"] = MOBILE_LOGIN; + } break; case 'dashdata': $in["action"] = WRENCHBOARD_ACCOUNT_DASHDATA; diff --git a/www-api/public/svs/user/constants.php b/www-api/public/svs/user/constants.php index 52aa21a4..cd6db7ce 100755 --- a/www-api/public/svs/user/constants.php +++ b/www-api/public/svs/user/constants.php @@ -5,6 +5,9 @@ require_once 'config.php'; define('ADD_JOB', 10010); define('UPDATE_JOB', 10020); +define('LOGIN_MODE_GENERAL', 1100); +define('LOGIN_MODE_FAMILY', 1105); + define('PHP_API_OK', 0); define('PHP_LOGIN_OK', 100); define('PHP_CREATED_OK', 10); diff --git a/www-api/public/svs/user/userve.php b/www-api/public/svs/user/userve.php index 14c33dd8..0e32ed35 100755 --- a/www-api/public/svs/user/userve.php +++ b/www-api/public/svs/user/userve.php @@ -350,7 +350,9 @@ switch ($endpoint) { break; case 'userlogin': $in["action"] = WRENCHBOARD_ACCOUNT_LOGIN; - $in["login_mode"] = MOBILE_LOGIN; + if (!isset($in["login_mode"])){ + $in["login_mode"] = MOBILE_LOGIN; + } break; case 'dashdata': $in["action"] = WRENCHBOARD_ACCOUNT_DASHDATA;