fixed:delete session token failure when time out

Author: xengine-qyt

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Get/AuthorizeHTTP_Token.cpp

@@ -177,7 +177,7 @@ bool XEngine_AuthorizeHTTP_Token(LPCXSTR lpszClientAddr, XCHAR** pptszList, int
 		}
 		Protocol_Packet_HttpOAuth(tszSDBuffer, &nSDLen, &st_OAuthInfo);
 		XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求关闭TOKEN:%s 成功"), lpszClientAddr, tszTokenStr);
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求创建OAuth的TOKEN:%s 成功"), lpszClientAddr, tszTokenStr);
 	}
 	return true;
 }

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_OAuth.cpp

@@ -78,7 +78,8 @@ bool XEngine_AuthorizeHTTP_OAuth(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, LP
 		{
 			DBModule_SQLite_UserQuery(st_OAuthInfo.tszUserName, &st_UserTable);
 		}
-		Session_Token_InsertStr(st_OAuthInfo.tszUserName, &st_UserTable.st_UserInfo, st_OAuthInfo.nExpirationTime);
+		st_UserTable.st_UserInfo.xhToken = 1;
+		Session_Token_InsertStr(st_OAuthInfo.tszTokenStr, &st_UserTable.st_UserInfo, st_OAuthInfo.nExpirationTime);
 
 		Protocol_Packet_HttpOAuth2(tszSDBuffer, &nSDLen, &st_OAuthInfo);
 		XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Task.cpp

@@ -64,9 +64,6 @@ void XCALLBACK XEngine_TaskEvent_Client(LPCXSTR lpszUserAddr, LPCXSTR lpszUserNa
 void XCALLBACK XEngine_TaskEvent_Token(LPCXSTR lpszTokenStr, int nTimeout, int nTimerenewal, XENGINE_LIBTIME* pSt_LibTime, XENGINE_PROTOCOL_USERINFO* pSt_UserInfo, XPVOID lParam)
 {
 	bool bRemove = true;
-	XENGINE_PROTOCOL_USERINFO st_UserInfo;
-
-	Session_Token_GetStr(lpszTokenStr, &st_UserInfo);
 	//自动续期?
 	if (st_AuthConfig.st_XVerification.st_XToken.bAutoRenewal)
 	{
@@ -86,13 +83,15 @@ void XCALLBACK XEngine_TaskEvent_Token(LPCXSTR lpszTokenStr, int nTimeout, int n
 		}
 	}
 
-	AUTHREG_OAUTHINFO st_OAuthInfo = {};
-	_tcsxcpy(st_OAuthInfo.tszTokenStr, lpszTokenStr);
-	bool bRet = DBModule_SQLite_OAuthDelete(&st_OAuthInfo);
-	
-	if (bRemove || bRet)
+	if (1 == pSt_UserInfo->xhToken)
+	{
+		AUTHREG_OAUTHINFO st_OAuthInfo = {};
+		_tcsxcpy(st_OAuthInfo.tszTokenStr, lpszTokenStr);
+		DBModule_SQLite_OAuthDelete(&st_OAuthInfo);
+	}
+	if (bRemove || (1 == pSt_UserInfo->xhToken))
 	{
 		Session_Token_DeleteStr(lpszTokenStr);
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Token:%s,用户名：%s，已经超时,权限级别:%d,被移除服务器,移除类型:%s"), lpszTokenStr, st_UserInfo.tszUserName, st_UserInfo.nUserLevel, bRet ? "普通" : "OAuth");
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("Token:%s,用户名：%s，已经超时,权限级别:%d,被移除服务器,移除类型:%s"), lpszTokenStr, pSt_UserInfo->tszUserName, pSt_UserInfo->nUserLevel, 1 == pSt_UserInfo->xhToken ? "OAuth" : "Token");
 	}
 }