Subversion Repositories SmartDukaan

Rev

Rev 37127 | Rev 37205 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 37127 Rev 37201
Line 12... Line 12...
12
import com.spice.profitmandi.dao.entity.dtr.UserRole;
12
import com.spice.profitmandi.dao.entity.dtr.UserRole;
13
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
13
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
14
import com.spice.profitmandi.dao.repository.cs.PartnerPositionRepository;
14
import com.spice.profitmandi.dao.repository.cs.PartnerPositionRepository;
15
import com.spice.profitmandi.dao.repository.cs.PositionRepository;
15
import com.spice.profitmandi.dao.repository.cs.PositionRepository;
16
import com.spice.profitmandi.dao.repository.dtr.RoleRepository;
16
import com.spice.profitmandi.dao.repository.dtr.RoleRepository;
-
 
17
import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
17
import com.spice.profitmandi.dao.repository.dtr.UserRepository;
18
import com.spice.profitmandi.dao.repository.dtr.UserRepository;
18
import com.spice.profitmandi.dao.repository.dtr.UserRoleRepository;
19
import com.spice.profitmandi.dao.repository.dtr.UserRoleRepository;
19
import com.spice.profitmandi.dao.repository.devtools.PasswordOverrideRepository;
20
import com.spice.profitmandi.dao.repository.devtools.PasswordOverrideRepository;
20
import com.spice.profitmandi.service.AuthService;
21
import com.spice.profitmandi.service.AuthService;
21
import com.spice.profitmandi.service.user.UserService;
22
import com.spice.profitmandi.service.user.UserService;
Line 61... Line 62...
61
	private UserService userService;
62
	private UserService userService;
62
 
63
 
63
	@Autowired
64
	@Autowired
64
	private PasswordOverrideRepository passwordOverrideRepository;
65
	private PasswordOverrideRepository passwordOverrideRepository;
65
 
66
 
-
 
67
	@Autowired
-
 
68
	private FofoStoreRepository fofoStoreRepository;
-
 
69
 
66
	@Value("${prod}")
70
	@Value("${prod}")
67
	private boolean isProd;
71
	private boolean isProd;
68
 
72
 
69
	@Autowired
73
	@Autowired
70
	private AuthRepository authRepository;
74
	private AuthRepository authRepository;
Line 269... Line 273...
269
		if ("PARTNER".equalsIgnoreCase(type)) {
273
		if ("PARTNER".equalsIgnoreCase(type)) {
270
			if (retailerId <= 0) {
274
			if (retailerId <= 0) {
271
				throw new ProfitMandiBusinessException("Partner", "retailerId", "Please select a partner");
275
				throw new ProfitMandiBusinessException("Partner", "retailerId", "Please select a partner");
272
			}
276
			}
273
			String stored = userService.resetPasswordById(retailerId, newPassword);
277
			String stored = userService.resetPasswordById(retailerId, newPassword);
-
 
278
			// Partner identifier is mandatorily the store code (resolved server-side, not from input).
274
			passwordOverrideRepository.upsert("PARTNER", 0, retailerId,
279
			String storeCode = fofoStoreRepository.selectByRetailerId(retailerId).getCode();
275
					identifier == null ? "" : identifier.trim(), stored, newPassword, setBy);
280
			passwordOverrideRepository.upsert("PARTNER", 0, retailerId, storeCode, stored, newPassword, setBy);
276
			LOGGER.info("Password override for partner retailerId={} by {}", retailerId, setBy);
281
			LOGGER.info("Password override for partner retailerId={} storeCode={} by {}", retailerId, storeCode, setBy);
277
		} else {
282
		} else {
278
			if (identifier == null || identifier.trim().isEmpty()) {
283
			if (identifier == null || identifier.trim().isEmpty()) {
279
				throw new ProfitMandiBusinessException("Auth User", "identifier", "Please enter an email or mobile");
284
				throw new ProfitMandiBusinessException("Auth User", "identifier", "Please enter an email or mobile");
280
			}
285
			}
281
			authService.resetPassword(identifier.trim(), newPassword);
286
			authService.resetPassword(identifier.trim(), newPassword);