Skip to content

Commit 4441124

Browse files
authored
Merge pull request #5 from dgw-dev/dw_main_dev
minor bug fixes
2 parents f469f57 + 0c06497 commit 4441124

5 files changed

Lines changed: 17 additions & 104 deletions

File tree

DbLocalizer/Controllers/SecurityController.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@ public class SecurityController : ControllerBase
2020
// return Ok(result);
2121
//}
2222

23-
[HttpGet("GetToken")]
23+
[HttpPost("GetToken")]
2424
[ProducesResponseType<string>(StatusCodes.Status200OK)]
25-
public IActionResult GetToken(string appKey)
25+
public IActionResult GetToken([FromBody] KeyPair appKey)
2626
{
27-
string result = SecureKeysManager.GenerateJwtToken(appKey);
27+
string result = SecureKeysManager.GenerateJwtToken(appKey.AppKeyValue);
28+
if (string.IsNullOrEmpty(result))
29+
{
30+
return BadRequest("Invalid app key");
31+
}
2832
return Ok(result);
2933
}
3034
}

DbLocalizer/Controllers/SmartlingImportController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ public async Task<IActionResult> Get([FromQuery] string fileUri, [FromQuery] str
104104
var importJson = await _smartlingFileDataService.GetTranslatedFileForLocaleAsync(locale, fileUri, processId);
105105

106106
// Run the import
107-
await _importUtility.Import(importJson);
107+
//do something with the importPackage
108+
SmartlingImportSqlFilePackageCollection importPackage = await _importUtility.Import(importJson);
108109

109110
returnData.IsJobRunning = _backgroundWorkerQueue.IsRunning;
110111
returnData.OperationComplete = true;

DbLocalizer/logging.Development.json

Lines changed: 0 additions & 50 deletions
This file was deleted.

DbLocalizer/logging.json

Lines changed: 0 additions & 50 deletions
This file was deleted.

Entities/KeyPair.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+

2+
namespace Entities
3+
{
4+
public class KeyPair
5+
{
6+
public string AppKeyValue { get; set; }
7+
}
8+
}

0 commit comments

Comments
 (0)