You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/20 09:39:43 UTC
[incubator-dlab] branch develop updated: DLAB-000 added new
parameter for generate key endpoint
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 625f2c5 DLAB-000 added new parameter for generate key endpoint
625f2c5 is described below
commit 625f2c5d80c82b7f715ff9cec1b55c449f95988c
Author: bhliva <bo...@epam.com>
AuthorDate: Fri Sep 20 12:39:15 2019 +0300
DLAB-000 added new parameter for generate key endpoint
---
.../src/main/java/com/epam/dlab/backendapi/resources/dto/KeysDTO.java | 1 +
.../com/epam/dlab/backendapi/service/impl/AccessKeyServiceImpl.java | 2 +-
.../java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/KeysDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/KeysDTO.java
index fc135a5..8093fc9 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/KeysDTO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/KeysDTO.java
@@ -8,4 +8,5 @@ import lombok.Data;
public class KeysDTO {
private String publicKey;
private String privateKey;
+ private String username;
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/AccessKeyServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/AccessKeyServiceImpl.java
index 847b626..5da41c6 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/AccessKeyServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/AccessKeyServiceImpl.java
@@ -140,7 +140,7 @@ public class AccessKeyServiceImpl implements AccessKeyService {
pair.writePublicKey(publicKeyOut, userInfo.getName());
pair.writePrivateKey(privateKeyOut);
return new KeysDTO(new String(publicKeyOut.toByteArray()),
- new String(privateKeyOut.toByteArray()));
+ new String(privateKeyOut.toByteArray()), userInfo.getName());
} catch (JSchException | IOException e) {
log.error("Can not generate private/public key pair due to: {}", e.getMessage());
throw new DlabException("Can not generate private/public key pair due to: " + e.getMessage(), e);
diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
index cefba6c..4a893a1 100644
--- a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
+++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/ProjectResourceTest.java
@@ -38,7 +38,8 @@ public class ProjectResourceTest extends TestBase {
@Test
public void generate() {
- when(keyService.generateKeys(any(UserInfo.class))).thenReturn(new KeysDTO("somePublicKey", "somePrivateKey"));
+ when(keyService.generateKeys(any(UserInfo.class))).thenReturn(new KeysDTO("somePublicKey", "somePrivateKey",
+ "user"));
final Response response = resources.getJerseyTest()
.target("/project/keys")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org