X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FWebSecurityMockConfiguration.java;h=257b4a4978ba3864284d9830cf1eddc6a5d3116d;hb=refs%2Fchanges%2F58%2F2258%2F2;hp=de2ee55d83364b57bac67ba66a1132619b0ee0fa;hpb=9fef9615bd5889eacbe8ddad454b7ff4b4c195c0;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java
index de2ee55d..257b4a49 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,11 @@
  */
 package org.oransc.ric.portal.dashboard.config;
 
-import java.io.IOException;
 import java.lang.invoke.MethodHandles;
-import java.util.HashSet;
-import java.util.Set;
 
-import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
-import org.onap.portalsdk.core.restful.domain.EcompRole;
-import org.onap.portalsdk.core.restful.domain.EcompUser;
+import org.onap.portalsdk.core.onboarding.crossapi.IPortalRestCentralService;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
-import org.oransc.ric.portal.dashboard.portalapi.DashboardUserManager;
+import org.oransc.ric.portal.dashboard.portalapi.PortalAuthManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -55,12 +50,18 @@ public class WebSecurityMockConfiguration extends WebSecurityConfigurerAdapter {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-	public WebSecurityMockConfiguration(@Value("${userfile}") final String userFilePath) {
-		logger.debug("ctor: user file path {}", userFilePath);
-	}
+	// Although constructor arguments are recommended over field injection,
+	// this results in fewer lines of code.
+	@Value("${portalapi.decryptor}")
+	private String decryptor;
+	@Value("${portalapi.usercookie}")
+	private String userCookie;
+	@Value("${userfile}")
+	private String userFilePath;
 
 	@Override
 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+		logger.debug("configure");
 		PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
 		auth.inMemoryAuthentication() //
 				.passwordEncoder(encoder) //
@@ -89,23 +90,12 @@ public class WebSecurityMockConfiguration extends WebSecurityConfigurerAdapter {
 		web.ignoring().antMatchers("/", "/csrf"); // allow swagger-ui to load
 	}
 
-	// This implementation is so light it can be used during tests.
 	@Bean
-	public DashboardUserManager dashboardUserManager() throws IOException, PortalAPIException {
-		DashboardUserManager dum = new DashboardUserManager(true);
-		// Mock user for convenience in testing
-		EcompUser demo = new EcompUser();
-		demo.setLoginId("demo");
-		demo.setFirstName("Demo");
-		demo.setLastName("User");
-		demo.setActive(true);
-		EcompRole role = new EcompRole();
-		role.setName("view");
-		Set<EcompRole> roles = new HashSet<>();
-		roles.add(role);
-		demo.setRoles(roles);
-		dum.createUser(demo);
-		return dum;
+	public PortalAuthManager portalAuthManagerBean() throws Exception {
+		logger.debug("portalAuthManagerBean");
+		return new PortalAuthManager(IPortalRestCentralService.CREDENTIALS_APP,
+				IPortalRestCentralService.CREDENTIALS_USER, IPortalRestCentralService.CREDENTIALS_PASS, decryptor,
+				userCookie);
 	}
 
 }