Skip to content

Commit e2f764e

Browse files
strongtigermanstrongtigerman
authored
Merge pull request #19 from easymorph/development/5.8.1
5.8.1
2 parents 6bc6acc + 0562f94 commit e2f764e

16 files changed

+61
-50
lines changed

‎src/BusinessLogic/Commands/BaseCommand.cs‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -63,33 +63,34 @@ protected async Task<ApiSession> OpenSession(Parameters parameters)
6363
{
6464
throw new Exception($"Server has no space '{parameters.SpaceName}'");
6565
}
66-
switch (desiredSpace.SpaceAccessRestriction)
66+
67+
68+
if (desiredSpace.SpaceAuthenticationProviderTypes.Contains(IdPType.SpacePwd))
6769
{
68-
case SpaceAccessRestriction.None:
69-
_output.WriteInfo("Method: Anonymous access");
70-
break;
71-
case SpaceAccessRestriction.BasicPassword when string.IsNullOrWhiteSpace(parameters.Password):
72-
_output.WriteInfo("Method: Password protected space");
73-
throw new Exception($"Space '{parameters.SpaceName}' requires password. You should pass '-password' parameter");
74-
case SpaceAccessRestriction.BasicPassword:
75-
_output.WriteInfo("Method: Password protected space");
76-
break;
77-
case SpaceAccessRestriction.WindowsAuthentication:
78-
_output.WriteInfo("Method: Windows authentication");
79-
break;
80-
case SpaceAccessRestriction.NotSupported when desiredSpace.IsPublic:
81-
_output.WriteInfo("Method: Fall-back anonymous session");
82-
break;
83-
case SpaceAccessRestriction.NotSupported when !desiredSpace.IsPublic & string.IsNullOrWhiteSpace(parameters.Password):
70+
_output.WriteInfo("Method: Password protected space");
71+
if (string.IsNullOrWhiteSpace(parameters.Password))
72+
{
8473
throw new Exception($"Space '{parameters.SpaceName}' requires password. You should pass '-password' parameter");
85-
case SpaceAccessRestriction.NotSupported when !desiredSpace.IsPublic:
86-
_output.WriteInfo("Method: Fall-back password protected space");
87-
break;
88-
default:
89-
throw new Exception("Space access restriction method is not supported by this client.");
74+
}
75+
76+
}
77+
else if (desiredSpace.SpaceAuthenticationProviderTypes.Contains(IdPType.Anonymous))
78+
{
79+
_output.WriteInfo("Method: Anonymous access");
80+
}
81+
else if (desiredSpace.SpaceAuthenticationProviderTypes.Contains(IdPType.AdSeamlessIdP))
82+
{
83+
// windows authentication
84+
_output.WriteInfo("Method: Windows authentication");
9085
}
86+
else
87+
{
88+
throw new Exception("Space access authentification method is not supported by this client.");
89+
}
90+
91+
9192

92-
var session = await _apiClient.OpenSessionAsync(new OpenSessionRequest { SpaceName = parameters.SpaceName, Password = parameters.Password }, _cancellationTokenSource.Token);
93+
var session = await _apiClient.OpenLegacySessionAsync(new OpenLegacySessionRequest { SpaceName = parameters.SpaceName, Password = parameters.Password }, _cancellationTokenSource.Token);
9394
_output.WriteInfo("Session opened");
9495
return session;
9596
}

‎src/BusinessLogic/Commands/BrowseFilesCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public async Task Execute(Parameters parameters)
3030
using (var apiSession = await OpenSession(parameters))
3131
{
3232

33-
var data = await _apiClient.SpaceBrowseAsync(apiSession, parameters.Location, _cancellationTokenSource.Token);
33+
var data = await _apiClient.SpaceBrowseAsync(apiSession, parameters.SpaceName, parameters.Location, _cancellationTokenSource.Token);
3434
_output.WriteInfo("Space: " + data.SpaceName);
3535
_output.WriteInfo("Free space: " + data.FreeSpaceBytes + " bytes");
3636
foreach (var folder in data.Folders)

‎src/BusinessLogic/Commands/DeleteFileCommand.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public async Task Execute(Parameters parameters)
2929

3030
using (var apiSession = await OpenSession(parameters))
3131
{
32-
_output.WriteInfo(string.Format("Deleting file {0} in space {1}...", parameters.Target, apiSession.SpaceName));
33-
await _apiClient.SpaceDeleteFileAsync(apiSession, parameters.Target, _cancellationTokenSource.Token);
32+
_output.WriteInfo(string.Format("Deleting file {0} in space {1}...", parameters.Target, parameters.SpaceName));
33+
await _apiClient.SpaceDeleteFileAsync(apiSession, parameters.SpaceName, parameters.Target, _cancellationTokenSource.Token);
3434
_output.WriteInfo("Operation completed");
3535
}
3636

‎src/BusinessLogic/Commands/DownloadFileCommand.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public async Task Execute(Parameters parameters)
4444

4545
using (var apiSession = await OpenSession(parameters))
4646
{
47-
_output.WriteInfo(string.Format("Downloading file '{0}' from space '{1}' into '{2}'...", parameters.Source, apiSession.SpaceName, parameters.Target));
47+
_output.WriteInfo(string.Format("Downloading file '{0}' from space '{1}' into '{2}'...", parameters.Source, parameters.SpaceName, parameters.Target));
4848

4949
ProgressBar progress = new ProgressBar(_output, 40);
5050
_apiClient.OnDataDownloadProgress += (object sender, FileTransferProgressEventArgs e) =>
@@ -86,7 +86,9 @@ public async Task Execute(Parameters parameters)
8686
try
8787
{
8888

89-
using (var serverStreamingData = await _apiClient.SpaceOpenStreamingDataAsync(apiSession, parameters.Source, _cancellationTokenSource.Token))
89+
using (var serverStreamingData = await _apiClient.SpaceOpenStreamingDataAsync(apiSession,
90+
parameters.SpaceName,
91+
parameters.Source, _cancellationTokenSource.Token))
9092
using(var reader = new BinaryReader(serverStreamingData.Stream))
9193
{
9294

@@ -127,7 +129,8 @@ public async Task Execute(Parameters parameters)
127129
if (allowLoading)
128130
{
129131
_output.WriteInfo(string.Format("Downloading '{0}' ...", parameters.Source));
130-
using (var serverStreamingData = await _apiClient.SpaceOpenStreamingDataAsync(apiSession, parameters.Source, _cancellationTokenSource.Token))
132+
using (var serverStreamingData = await _apiClient.SpaceOpenStreamingDataAsync(apiSession,
133+
parameters.SpaceName,parameters.Source, _cancellationTokenSource.Token))
131134
{
132135
await serverStreamingData.Stream.CopyToAsync(streamToWriteTo, 81920, _cancellationTokenSource.Token);
133136
}

‎src/BusinessLogic/Commands/GetTaskCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public async Task Execute(Parameters parameters)
3232
using (var apiSession = await OpenSession(parameters))
3333
{
3434

35-
var task = await _apiClient.GetTaskAsync(apiSession, parameters.TaskId.Value, _cancellationTokenSource.Token);
35+
var task = await _apiClient.GetTaskAsync(apiSession, parameters.SpaceName, parameters.TaskId.Value, _cancellationTokenSource.Token);
3636
_output.WriteInfo("Info about task:");
3737
_output.WriteInfo(string.Format("Id:'{0}'", task.Id));
3838
_output.WriteInfo(string.Format("Name:'{0}'", task.TaskName));

‎src/BusinessLogic/Commands/ListTasksCommand.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ public async Task Execute(Parameters parameters)
1818
{
1919
using (var apiSession = await OpenSession(parameters))
2020
{
21-
_output.WriteInfo(string.Format("Listing tasks in the space {0}", apiSession.SpaceName));
22-
var data = await _apiClient.GetTasksListAsync(apiSession, _cancellationTokenSource.Token);
21+
_output.WriteInfo(string.Format("Listing tasks in the space {0}", parameters.SpaceName));
22+
var data = await _apiClient.GetTasksListAsync(apiSession, parameters.SpaceName, _cancellationTokenSource.Token);
2323

2424
foreach (var task in data.Items)
2525
{
2626
_output.WriteInfo(string.Format("{0}: {1}", task.Id.ToString(), task.TaskName));
27-
}
27+
}
2828

2929
_output.WriteInfo("Listing done");
3030
}

‎src/BusinessLogic/Commands/QuickFilesSearchCommand.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public async Task Execute(Parameters parameters)
3939
};
4040
var data = await _apiClient.SpaceFilesQuickSearchAsync(
4141
apiSession,
42+
parameters.SpaceName,
4243
request,
4344
_cancellationTokenSource.Token,
4445
parameters.Offset,

‎src/BusinessLogic/Commands/RunTaskAndForgetCommand.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ public async Task Execute(Parameters parameters)
3737
{
3838

3939
ComputationDetailedItem info = await _apiClient.StartTaskAsync(apiSession,
40+
parameters.SpaceName,
4041
new StartTaskRequest(parameters.TaskId.Value)
4142
{
42-
TaskParameters = parameters.TaskRunParameters.Select(x => new TaskStringParameter(x.Name, x.Value)).ToArray()
43+
TaskParameters = parameters.TaskRunParameters.Select(x => new ParameterNameValue(x.Name, x.Value)).ToArray()
4344
},
4445
_cancellationTokenSource.Token
4546
);

‎src/BusinessLogic/Commands/RunTaskAndWaitCommand.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ public async Task Execute(Parameters parameters)
4040
{
4141
ComputationDetailedItem info = await _apiClient.StartTaskAsync(
4242
apiSession,
43+
parameters.SpaceName,
4344
new StartTaskRequest(parameters.TaskId.Value)
4445
{
45-
TaskParameters = parameters.TaskRunParameters.Select(x => new TaskStringParameter(x.Name, x.Value)).ToArray()
46+
TaskParameters = parameters.TaskRunParameters.Select(x => new ParameterNameValue(x.Name, x.Value)).ToArray()
4647
},
4748
_cancellationTokenSource.Token);
4849

@@ -53,12 +54,13 @@ public async Task Execute(Parameters parameters)
5354
{
5455
await Task.Delay(TimeSpan.FromSeconds(2));
5556
}
56-
while ((info = await _apiClient.GetComputationDetailsAsync(apiSession, info.ComputationId, _cancellationTokenSource.Token)).State.IsRunning);
57+
while ((info = await _apiClient.GetComputationDetailsAsync(apiSession, parameters.SpaceName, info.ComputationId, _cancellationTokenSource.Token)).State.IsRunning);
5758

5859
if (info.State is ComputationState.Finished finished)
5960
{
6061

6162
var workflowResult = await _apiClient.GetWorkflowResultDetailsAsync(apiSession,
63+
parameters.SpaceName,
6264
finished.ResultObtainingToken, _cancellationTokenSource.Token);
6365
try
6466
{
@@ -94,7 +96,9 @@ public async Task Execute(Parameters parameters)
9496
}
9597
finally
9698
{
97-
await _apiClient.AcknowledgeWorkflowResultAsync(apiSession, info.ComputationId,
99+
await _apiClient.AcknowledgeWorkflowResultAsync(apiSession,
100+
parameters.SpaceName,
101+
info.ComputationId,
98102
_cancellationTokenSource.Token);
99103
}
100104

‎src/BusinessLogic/Commands/SharedMemoryForgetCommand.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public async Task Execute(Parameters parameters)
2222

2323
using (var session = await OpenSession(parameters))
2424
{
25-
_output.WriteInfo($"Deleting shared memory record {parameters.Key} in space {session.SpaceName}...");
26-
var deletedKeyCount = await _apiClient.SharedMemoryForget(session, parameters.Key,
25+
_output.WriteInfo($"Deleting shared memory record {parameters.Key} in space {parameters.SpaceName}...");
26+
var deletedKeyCount = await _apiClient.SharedMemoryForget(session, parameters.SpaceName, parameters.Key,
2727
_cancellationTokenSource.Token);
2828
_output.WriteInfo($"Operation completed, {deletedKeyCount} records deleted");
2929
}

0 commit comments

Comments
 (0)