1c/OpenIntegrations
1
0
Fork 0
mirror of https://github.com/Bayselonarrend/OpenIntegrations.git synced 2026-05-22 10:05:29 +02:00
Code Issues Releases Activity

Main build (Jenkins)

Browse Source
This commit is contained in:
Vitaly the Alpaca (bot)
2024-11-17 12:55:27 +03:00
parent 813aaa1527
commit 4462ac6a87
8 changed files with 5643 additions and 5635 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/en/md/S3/Common-methods/Get-basic-data-structure.mdx
+9 -1
View File
@@ -40,4 +40,12 @@ import TabItem from '@theme/TabItem';
```json title="Result"
{
"URL": "storage-155.s3hoster.by",
"AccessKey": "BRN5RKJE67YCVDZRRQVI",
"SecretKey": "***",
"Region": "BTC",
"Service": "s3"
}
```
service/dictionaries/en.json
+5582 -5582
View File
File diff suppressed because it is too large Load Diff
src/en/OInt/core/Modules/OPI_Dropbox.os
+2 -2
View File
@@ -77,11 +77,11 @@ Function GetToken(Val AppKey, Val AppSecret, Val Code) Export
OPI_Tools.AddField("grant_type", "authorization_code", "String", Parameters); OPI_Tools.AddField("grant_type", "authorization_code", "String", Parameters);
URLStructure = OPI_Tools.SplitURL(URL); URLStructure = OPI_Tools.SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Request = OPI_Tools.CreateRequest(Address, , DataType); Request = OPI_Tools.CreateRequest(Address, , DataType);
Connection = OPI_Tools.CreateConnection(Server, True, AppKey, AppSecret); Connection = OPI_Tools.CreateConnection(Host, True, AppKey, AppSecret);
ParameterString = OPI_Tools.RequestParametersToString(Parameters); ParameterString = OPI_Tools.RequestParametersToString(Parameters);
Data = Right(ParameterString, StrLen(ParameterString) - 1); Data = Right(ParameterString, StrLen(ParameterString) - 1);
src/en/OInt/core/Modules/OPI_S3.os
+3 -3
View File
@@ -637,7 +637,7 @@ Function CreateAuthorizationHeader(Val DataStructure, Val Request, Val Connectio
CurrentDate = CurrentUniversalDate(); CurrentDate = CurrentUniversalDate();
Request.Headers.Insert("x-amz-date", OPI_Tools.ISOTimestamp(CurrentDate)); Request.Headers.Insert("x-amz-date", OPI_Tools.ISOTimestamp(CurrentDate));
Request.Headers.Insert("Host" , Connection.Server); Request.Headers.Insert("Host" , Connection.Host);
SignKey = GetSignatureKey(SecretKey, Region, Service, CurrentDate); SignKey = GetSignatureKey(SecretKey, Region, Service, CurrentDate);
CanonicalRequest = CreateCanonicalRequest(Request, Connection, Method); CanonicalRequest = CreateCanonicalRequest(Request, Connection, Method);
@@ -910,12 +910,12 @@ Function SendRequest(Val Method, Val BasicData, Val Body = Undefined, Val Header
URL = BasicData["URL"]; URL = BasicData["URL"];
URLStructure = OPI_Tools.SplitURL(URL); URLStructure = OPI_Tools.SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
Request = OPI_Tools.CreateRequest(Address); Request = OPI_Tools.CreateRequest(Address);
Connection = OPI_Tools.CreateConnection(Server, Safe); Connection = OPI_Tools.CreateConnection(Host, Safe);
If ValueIsFilled(Body) Then If ValueIsFilled(Body) Then
SetRequestBody(Request, Body); SetRequestBody(Request, Body);
src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os
+20 -20
View File
@@ -210,20 +210,20 @@ Function CreateRequest(Val Address, Val AdditionalHeaders = "", Val DataType = "
EndFunction EndFunction
Function CreateConnection(Val Server, Val Safe = True, Val User = "", Val Password = "") Export Function CreateConnection(Val Host, Val Safe = True, Val User = "", Val Password = "") Export
If Safe Then If Safe Then
If IsOneScript() Then If IsOneScript() Then
Connection = New HTTPConnection(Server, 443, User, Password, , 3000); Connection = New HTTPConnection(Host, 443, User, Password, , 3000);
Else Else
SSL = New OpenSSLSecureConnection; SSL = New OpenSSLSecureConnection;
Connection = New HTTPConnection(Server, 443, User, Password, , 3000, SSL); Connection = New HTTPConnection(Host, 443, User, Password, , 3000, SSL);
EndIf; EndIf;
Else Else
Connection = New HTTPConnection(Server, 80, User, Password, , 3000, SSL); Connection = New HTTPConnection(Host, 80, User, Password, , 3000, SSL);
EndIf; EndIf;
@@ -244,11 +244,11 @@ Function ExecuteRequest(Val Request, Val Connection, Val View, Val ResponseFile
URL = Response.Headers["Location"]; URL = Response.Headers["Location"];
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
Request.ResourceAddress = Address; Request.ResourceAddress = Address;
Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse); Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse);
@@ -388,18 +388,18 @@ Function SplitURL(Val URL) Export
If StrFind(URL, "/") = 0 Then If StrFind(URL, "/") = 0 Then
Address = ""; Address = "";
Server = URL; Host = URL;
Else Else
Address = Right(URL, StrLen(URL) - StrFind(URL, "/", SearchDirection.FromBegin) + 1); Address = Right(URL, StrLen(URL) - StrFind(URL, "/", SearchDirection.FromBegin) + 1);
Server = Left(URL, StrFind(URL, "/", SearchDirection.FromBegin) - 1); Host = Left(URL, StrFind(URL, "/", SearchDirection.FromBegin) - 1);
EndIf; EndIf;
If IsOneScript() And SecureConnection Then If IsOneScript() And SecureConnection Then
Server = "https://" + Server; Host = "https://" + Host;
EndIf; EndIf;
ReturnStructure = New Structure; ReturnStructure = New Structure;
ReturnStructure.Insert("Server" , Server); ReturnStructure.Insert("Host" , Host);
ReturnStructure.Insert("Address" , Address); ReturnStructure.Insert("Address" , Address);
ReturnStructure.Insert("Safe" , SecureConnection); ReturnStructure.Insert("Safe" , SecureConnection);
@@ -932,12 +932,12 @@ Function ExecuteRequestWithBody(Val URL
EndIf; EndIf;
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
Request = CreateRequestWithBody(Address, Parameters, AdditionalHeaders, JSON); Request = CreateRequestWithBody(Address, Parameters, AdditionalHeaders, JSON);
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse); Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse);
Return Response; Return Response;
@@ -952,12 +952,12 @@ Function ExecuteRequestWithBinaryData(Val URL
, Val DataType) , Val DataType)
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
Request = CreateRequest(Address, AdditionalHeaders, DataType); Request = CreateRequest(Address, AdditionalHeaders, DataType);
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
If Not Data.Size() = 0 Then If Not Data.Size() = 0 Then
Request.SetBodyFromBinary(Data); Request.SetBodyFromBinary(Data);
@@ -980,12 +980,12 @@ Function ExecuteRequestWithoutBody(Val URL
EndIf; EndIf;
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"] + RequestParametersToString(Parameters); Address = URLStructure["Address"] + RequestParametersToString(Parameters);
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
Request = CreateRequest(Address, AdditionalHeaders); Request = CreateRequest(Address, AdditionalHeaders);
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
Response = ExecuteRequest(Request, Connection, View, ResponseFile); Response = ExecuteRequest(Request, Connection, View, ResponseFile);
@@ -1010,14 +1010,14 @@ Function ExecuteMultipartRequest(Val URL
EndIf; EndIf;
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
RequestBody = GetTempFileName(); RequestBody = GetTempFileName();
Request = CreateMultipartRequest(Address, Parameters, Files, AdditionalHeaders, RequestBody, ContentType); Request = CreateMultipartRequest(Address, Parameters, Files, AdditionalHeaders, RequestBody, ContentType);
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
Response = ExecuteRequest(Request, Connection, View, ResponseFile); Response = ExecuteRequest(Request, Connection, View, ResponseFile);
Request = Undefined; Request = Undefined;
@@ -1036,14 +1036,14 @@ Function ExecuteMultipartRelatedRequest(Val URL
, Val ResponseFile = Undefined) , Val ResponseFile = Undefined)
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
RequestBody = GetTempFileName(); RequestBody = GetTempFileName();
Request = CreateMultipartRelatedRequest(Address, Files, JSON, AdditionalHeaders, RequestBody); Request = CreateMultipartRelatedRequest(Address, Files, JSON, AdditionalHeaders, RequestBody);
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
Response = ExecuteRequest(Request, Connection, View, ResponseFile); Response = ExecuteRequest(Request, Connection, View, ResponseFile);
src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl
+2 -2
View File
@@ -77,11 +77,11 @@ Function GetToken(Val AppKey, Val AppSecret, Val Code) Export
OPI_Tools.AddField("grant_type", "authorization_code", "String", Parameters); OPI_Tools.AddField("grant_type", "authorization_code", "String", Parameters);
URLStructure = OPI_Tools.SplitURL(URL); URLStructure = OPI_Tools.SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Request = OPI_Tools.CreateRequest(Address, , DataType); Request = OPI_Tools.CreateRequest(Address, , DataType);
Connection = OPI_Tools.CreateConnection(Server, True, AppKey, AppSecret); Connection = OPI_Tools.CreateConnection(Host, True, AppKey, AppSecret);
ParameterString = OPI_Tools.RequestParametersToString(Parameters); ParameterString = OPI_Tools.RequestParametersToString(Parameters);
Data = Right(ParameterString, StrLen(ParameterString) - 1); Data = Right(ParameterString, StrLen(ParameterString) - 1);
src/en/OPI/src/CommonModules/OPI_S3/Module.bsl
+3 -3
View File
@@ -637,7 +637,7 @@ Function CreateAuthorizationHeader(Val DataStructure, Val Request, Val Connectio
CurrentDate = CurrentUniversalDate(); CurrentDate = CurrentUniversalDate();
Request.Headers.Insert("x-amz-date", OPI_Tools.ISOTimestamp(CurrentDate)); Request.Headers.Insert("x-amz-date", OPI_Tools.ISOTimestamp(CurrentDate));
Request.Headers.Insert("Host" , Connection.Server); Request.Headers.Insert("Host" , Connection.Host);
SignKey = GetSignatureKey(SecretKey, Region, Service, CurrentDate); SignKey = GetSignatureKey(SecretKey, Region, Service, CurrentDate);
CanonicalRequest = CreateCanonicalRequest(Request, Connection, Method); CanonicalRequest = CreateCanonicalRequest(Request, Connection, Method);
@@ -910,12 +910,12 @@ Function SendRequest(Val Method, Val BasicData, Val Body = Undefined, Val Header
URL = BasicData["URL"]; URL = BasicData["URL"];
URLStructure = OPI_Tools.SplitURL(URL); URLStructure = OPI_Tools.SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
Request = OPI_Tools.CreateRequest(Address); Request = OPI_Tools.CreateRequest(Address);
Connection = OPI_Tools.CreateConnection(Server, Safe); Connection = OPI_Tools.CreateConnection(Host, Safe);
If ValueIsFilled(Body) Then If ValueIsFilled(Body) Then
SetRequestBody(Request, Body); SetRequestBody(Request, Body);
src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl
+20 -20
View File
@@ -210,20 +210,20 @@ Function CreateRequest(Val Address, Val AdditionalHeaders = "", Val DataType = "
EndFunction EndFunction
Function CreateConnection(Val Server, Val Safe = True, Val User = "", Val Password = "") Export Function CreateConnection(Val Host, Val Safe = True, Val User = "", Val Password = "") Export
If Safe Then If Safe Then
If IsOneScript() Then If IsOneScript() Then
Connection = New HTTPConnection(Server, 443, User, Password, , 3000); Connection = New HTTPConnection(Host, 443, User, Password, , 3000);
Else Else
SSL = New OpenSSLSecureConnection; SSL = New OpenSSLSecureConnection;
Connection = New HTTPConnection(Server, 443, User, Password, , 3000, SSL); Connection = New HTTPConnection(Host, 443, User, Password, , 3000, SSL);
EndIf; EndIf;
Else Else
Connection = New HTTPConnection(Server, 80, User, Password, , 3000, SSL); Connection = New HTTPConnection(Host, 80, User, Password, , 3000, SSL);
EndIf; EndIf;
@@ -244,11 +244,11 @@ Function ExecuteRequest(Val Request, Val Connection, Val View, Val ResponseFile
URL = Response.Headers["Location"]; URL = Response.Headers["Location"];
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
Request.ResourceAddress = Address; Request.ResourceAddress = Address;
Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse); Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse);
@@ -388,18 +388,18 @@ Function SplitURL(Val URL) Export
If StrFind(URL, "/") = 0 Then If StrFind(URL, "/") = 0 Then
Address = ""; Address = "";
Server = URL; Host = URL;
Else Else
Address = Right(URL, StrLen(URL) - StrFind(URL, "/", SearchDirection.FromBegin) + 1); Address = Right(URL, StrLen(URL) - StrFind(URL, "/", SearchDirection.FromBegin) + 1);
Server = Left(URL, StrFind(URL, "/", SearchDirection.FromBegin) - 1); Host = Left(URL, StrFind(URL, "/", SearchDirection.FromBegin) - 1);
EndIf; EndIf;
If IsOneScript() And SecureConnection Then If IsOneScript() And SecureConnection Then
Server = "https://" + Server; Host = "https://" + Host;
EndIf; EndIf;
ReturnStructure = New Structure; ReturnStructure = New Structure;
ReturnStructure.Insert("Server" , Server); ReturnStructure.Insert("Host" , Host);
ReturnStructure.Insert("Address" , Address); ReturnStructure.Insert("Address" , Address);
ReturnStructure.Insert("Safe" , SecureConnection); ReturnStructure.Insert("Safe" , SecureConnection);
@@ -932,12 +932,12 @@ Function ExecuteRequestWithBody(Val URL
EndIf; EndIf;
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
Request = CreateRequestWithBody(Address, Parameters, AdditionalHeaders, JSON); Request = CreateRequestWithBody(Address, Parameters, AdditionalHeaders, JSON);
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse); Response = ExecuteRequest(Request, Connection, View, ResponseFile, FullResponse);
Return Response; Return Response;
@@ -952,12 +952,12 @@ Function ExecuteRequestWithBinaryData(Val URL
, Val DataType) , Val DataType)
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
Request = CreateRequest(Address, AdditionalHeaders, DataType); Request = CreateRequest(Address, AdditionalHeaders, DataType);
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
If Not Data.Size() = 0 Then If Not Data.Size() = 0 Then
Request.SetBodyFromBinaryData(Data); Request.SetBodyFromBinaryData(Data);
@@ -980,12 +980,12 @@ Function ExecuteRequestWithoutBody(Val URL
EndIf; EndIf;
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"] + RequestParametersToString(Parameters); Address = URLStructure["Address"] + RequestParametersToString(Parameters);
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
Request = CreateRequest(Address, AdditionalHeaders); Request = CreateRequest(Address, AdditionalHeaders);
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
Response = ExecuteRequest(Request, Connection, View, ResponseFile); Response = ExecuteRequest(Request, Connection, View, ResponseFile);
@@ -1010,14 +1010,14 @@ Function ExecuteMultipartRequest(Val URL
EndIf; EndIf;
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
RequestBody = GetTempFileName(); RequestBody = GetTempFileName();
Request = CreateMultipartRequest(Address, Parameters, Files, AdditionalHeaders, RequestBody, ContentType); Request = CreateMultipartRequest(Address, Parameters, Files, AdditionalHeaders, RequestBody, ContentType);
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
Response = ExecuteRequest(Request, Connection, View, ResponseFile); Response = ExecuteRequest(Request, Connection, View, ResponseFile);
Request = Undefined; Request = Undefined;
@@ -1036,14 +1036,14 @@ Function ExecuteMultipartRelatedRequest(Val URL
, Val ResponseFile = Undefined) , Val ResponseFile = Undefined)
URLStructure = SplitURL(URL); URLStructure = SplitURL(URL);
Server = URLStructure["Server"]; Host = URLStructure["Host"];
Address = URLStructure["Address"]; Address = URLStructure["Address"];
Safe = URLStructure["Safe"]; Safe = URLStructure["Safe"];
RequestBody = GetTempFileName(); RequestBody = GetTempFileName();
Request = CreateMultipartRelatedRequest(Address, Files, JSON, AdditionalHeaders, RequestBody); Request = CreateMultipartRelatedRequest(Address, Files, JSON, AdditionalHeaders, RequestBody);
Connection = CreateConnection(Server, Safe); Connection = CreateConnection(Host, Safe);
Response = ExecuteRequest(Request, Connection, View, ResponseFile); Response = ExecuteRequest(Request, Connection, View, ResponseFile);