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/10/08 10:02:46 UTC
[incubator-dlab] branch develop updated: DLAB-1194 fixed bug
connected with project key
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 68800c5 DLAB-1194 fixed bug connected with project key
68800c5 is described below
commit 68800c5c976e31f730a49c10da521d943c8e9aca
Author: bhliva <bo...@epam.com>
AuthorDate: Tue Oct 8 13:02:27 2019 +0300
DLAB-1194 fixed bug connected with project key
---
.../com/epam/dlab/backendapi/service/impl/AccessKeyServiceImpl.java | 2 +-
.../src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 dc4efc7..193e28a 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
@@ -139,7 +139,7 @@ public class AccessKeyServiceImpl implements AccessKeyService {
KeyPair pair = KeyPair.genKeyPair(new JSch(), KeyPair.RSA, configuration.getPrivateKeySize());
pair.writePublicKey(publicKeyOut, userInfo.getName());
pair.writePrivateKey(privateKeyOut);
- return new KeysDTO(new String(publicKeyOut.toByteArray()).replace("\n", ""),
+ return new KeysDTO(new String(publicKeyOut.toByteArray()),
new String(privateKeyOut.toByteArray()), userInfo.getName());
} catch (JSchException | IOException e) {
log.error("Can not generate private/public key pair due to: {}", e.getMessage());
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
index 34cda1b..9f450c8 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
@@ -620,7 +620,7 @@ public class RequestBuilder {
public ProjectCreateDTO newProjectCreate(UserInfo userInfo, ProjectDTO projectDTO, String endpoint) {
return ProjectCreateDTO.builder()
- .key(projectDTO.getKey())
+ .key(projectDTO.getKey().replace("\n", ""))
.name(projectDTO.getName())
.tag(projectDTO.getTag())
.endpoint(endpoint)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org