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/04/17 13:16:45 UTC
[incubator-dlab] branch develop updated: DLAB-000 fixed bug on gcp
connected with security configuration
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 ce3633c DLAB-000 fixed bug on gcp connected with security configuration
ce3633c is described below
commit ce3633cc8fdc9686ca0290f461d4fd28d8fa9608
Author: bhliva <bo...@epam.com>
AuthorDate: Wed Apr 17 16:16:12 2019 +0300
DLAB-000 fixed bug on gcp connected with security configuration
---
.../src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java | 2 +-
.../java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java | 2 +-
.../main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java | 2 +-
.../java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java b/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java
index 1ca2374..6dbaf02 100644
--- a/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java
+++ b/services/common/src/main/java/com/epam/dlab/auth/conf/GcpLoginConfiguration.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.epam.dlab.config.gcp;
+package com.epam.dlab.auth.conf;
import lombok.Data;
diff --git a/services/security-gcp/src/main/java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java b/services/security-gcp/src/main/java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java
index 2f338d5..3f70ce9 100644
--- a/services/security-gcp/src/main/java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java
+++ b/services/security-gcp/src/main/java/com/epam/dlab/auth/gcp/service/GcpAuthenticationService.java
@@ -21,8 +21,8 @@ package com.epam.dlab.auth.gcp.service;
import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.auth.UserInfoDAO;
+import com.epam.dlab.auth.conf.GcpLoginConfiguration;
import com.epam.dlab.auth.oauth2.Oauth2AuthenticationService;
-import com.epam.dlab.config.gcp.GcpLoginConfiguration;
import com.epam.dlab.exceptions.DlabAuthenticationException;
import com.epam.dlab.exceptions.DlabException;
import com.google.api.client.auth.oauth2.AuthorizationCodeFlow;
diff --git a/services/security-service/src/main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java b/services/security-service/src/main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java
index 839f19b..ac682ec 100644
--- a/services/security-service/src/main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java
+++ b/services/security-service/src/main/java/com/epam/dlab/auth/SecurityServiceConfiguration.java
@@ -22,8 +22,8 @@ package com.epam.dlab.auth;
import com.epam.dlab.ServiceConfiguration;
import com.epam.dlab.auth.conf.AzureLoginConfiguration;
+import com.epam.dlab.auth.conf.GcpLoginConfiguration;
import com.epam.dlab.auth.dao.Request;
-import com.epam.dlab.config.gcp.GcpLoginConfiguration;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.directory.ldap.client.api.LdapConnectionConfig;
diff --git a/services/security-service/src/main/java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java b/services/security-service/src/main/java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java
index 29a16a9..abddab2 100644
--- a/services/security-service/src/main/java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java
+++ b/services/security-service/src/main/java/com/epam/dlab/auth/modules/GcpSecurityServiceModule.java
@@ -21,6 +21,7 @@ package com.epam.dlab.auth.modules;
import com.epam.dlab.auth.SecurityServiceConfiguration;
import com.epam.dlab.auth.UserVerificationService;
+import com.epam.dlab.auth.conf.GcpLoginConfiguration;
import com.epam.dlab.auth.gcp.resources.GcpOauth2SecurityResource;
import com.epam.dlab.auth.gcp.service.GcpAuthenticationService;
import com.epam.dlab.auth.oauth2.Oauth2AuthenticationService;
@@ -28,7 +29,6 @@ import com.epam.dlab.auth.resources.SynchronousLdapAuthenticationResource;
import com.epam.dlab.cloud.CloudModule;
import com.google.api.client.auth.oauth2.AuthorizationCodeFlow;
import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow;
-import com.epam.dlab.config.gcp.GcpLoginConfiguration;
import com.google.api.client.http.HttpTransport;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.jackson2.JacksonFactory;
@@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit;
public class GcpSecurityServiceModule extends CloudModule {
private static final List<String> SCOPES = Arrays.asList("https://www.googleapis.com/auth/plus.login", "email",
"profile", "https://www.googleapis.com/auth/plus.me");
- private final com.epam.dlab.config.gcp.GcpLoginConfiguration conf;
+ private final GcpLoginConfiguration conf;
GcpSecurityServiceModule(SecurityServiceConfiguration conf) {
this.conf = conf.getGcpLoginConfiguration();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org