Merge branch 'dev-fastapi' of https://gitlab.com/UnicodeLabs/OpenRPA into dev-fastapi

Sources/pyOpenRPA/Orchestrator/Server.py

@@ -126,29 +126,33 @@ for lItem in lRouteList:
 
 from . import ServerSettings  
 
-def BackwardCompatibility(inRequest:Request, inResponse:Response, inBodyStr:str = Body(""), inAuthTokenStr = None):
+async def BackwardCompatibility(inRequest:Request, inResponse:Response, inAuthTokenStr = None):
     lHTTPRequest = ServerBC.HTTPRequestOld(inRequest=inRequest, inResponse=inResponse, inAuthTokenStr=inAuthTokenStr)
     lHTTPRequest.path = inRequest.url.path
+    inBodyStr = await inRequest.body()
+    if inBodyStr == None: inBodyStr = ""
+    else: inBodyStr = inBodyStr.decode("utf8")
     lHTTPRequest.body = inBodyStr
     lHTTPRequest.client_address = [inRequest.client.host]
     threading.current_thread().request = lHTTPRequest
-    lResult = lHTTPRequest.do_GET(inBodyStr=inBodyStr)
-    if lResult is None:
+    if inRequest.method=="GET":
+        lResult = lHTTPRequest.do_GET(inBodyStr=inBodyStr)
+    elif inRequest.method=="POST":
         lResult = lHTTPRequest.do_POST(inBodyStr=inBodyStr)
     if lHTTPRequest.OpenRPAResponseDict["Headers"]["Content-type"] != None:
         return StreamingResponse(io.BytesIO(lResult), media_type=lHTTPRequest.OpenRPAResponseDict["Headers"]["Content-type"])
 
 #WRAPPERS!
-def BackwardCompatibityWrapperAuth(inRequest:Request, inResponse:Response, inBodyStr:str = Body(""),
+async def BackwardCompatibityWrapperAuth(inRequest:Request, inResponse:Response,
     inAuthTokenStr:str=Depends(ServerSettings.IdentifyAuthorize)): # Old from v1.3.1 (updated to FastAPI)
-    return BackwardCompatibility(inRequest = inRequest, inResponse = inResponse, inBodyStr = inBodyStr, inAuthTokenStr=inAuthTokenStr)
-def BackwardCompatibityWrapperNoAuth(inRequest:Request, inResponse:Response, inBodyStr:str = Body("")): # Old from v1.3.1 (updated to FastAPI)
-    return BackwardCompatibility(inRequest = inRequest, inResponse = inResponse, inBodyStr = inBodyStr, inAuthTokenStr=None)
-def BackwardCompatibityBeginWrapperAuth(inBeginTokenStr, inRequest:Request, inResponse:Response, inBodyStr:str = Body(""),
+    return await BackwardCompatibility(inRequest = inRequest, inResponse = inResponse, inAuthTokenStr=inAuthTokenStr)
+async def BackwardCompatibityWrapperNoAuth(inRequest:Request, inResponse:Response): # Old from v1.3.1 (updated to FastAPI)
+    return await BackwardCompatibility(inRequest = inRequest, inResponse = inResponse, inAuthTokenStr=None)
+async def BackwardCompatibityBeginWrapperAuth(inBeginTokenStr, inRequest:Request, inResponse:Response,
     inAuthTokenStr:str=Depends(ServerSettings.IdentifyAuthorize)): # Old from v1.3.1 (updated to FastAPI)
-    return BackwardCompatibility(inRequest = inRequest, inResponse = inResponse, inBodyStr = inBodyStr, inAuthTokenStr=inAuthTokenStr)
-def BackwardCompatibityBeginWrapperNoAuth(inBeginTokenStr, inRequest:Request, inResponse:Response, inBodyStr:str = Body("")): # Old from v1.3.1 (updated to FastAPI)
-    return BackwardCompatibility(inRequest = inRequest, inResponse = inResponse, inBodyStr = inBodyStr, inAuthTokenStr=None)
+    return await BackwardCompatibility(inRequest = inRequest, inResponse = inResponse, inAuthTokenStr=inAuthTokenStr)
+async def BackwardCompatibityBeginWrapperNoAuth(inBeginTokenStr, inRequest:Request, inResponse:Response): # Old from v1.3.1 (updated to FastAPI)
+    return await BackwardCompatibility(inRequest = inRequest, inResponse = inResponse, inAuthTokenStr=None)
 
 
 
@@ -173,7 +177,7 @@ def BCURLUpdate():
             StaticFiles(directory=CrossOS.PathStr(lConnectItemDict["ResponseFolderPath"])), 
             name=lConnectItemDict["URL"].replace('/',"_"))
             else:
-                if lConnectItemDict.get("MatchType") in ["EqualCase", "Equal","EqualNoParam"]:
+                if lConnectItemDict.get("MatchType") in ["BeginWith", "EqualCase", "Equal","EqualNoParam"]:
                     if lConnectItemDict.get("UACBool",True):
                         app.add_api_route(
                             path=lConnectItemDict["URL"],