Merge remote-tracking branch 'origin/master'

wayne

2021-11-29 83fdf8582cd37b0603dba3f4d0a869453722e292

 pamapi/src/main/java/com/pollex/pam/security/SecurityUtils.java

@@ -5,6 +5,8 @@
import java.util.Optional;
import java.util.stream.Stream;

import com.pollex.pam.enums.ConsultantDetailEnum;
import com.pollex.pam.enums.CustomerDetailEnum;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContext;
@@ -99,18 +101,17 @@
    private static Stream<String> getAuthorities(Authentication authentication) {
        return authentication.getAuthorities().stream().map(GrantedAuthority::getAuthority);
    }
    

    public static String getAgentNo() {
       return getCurrentUserLogin().orElseGet(null);
        Map<String, String> userDetails = getCurrentUserDetails();
        return userDetails.get(ConsultantDetailEnum.AGENT_NO.getValue());
    }
    
    // todo , should get id from user details

    public static Long getCustomerId() {
//       Map<String, String> userDetails = getCurrentUserDetails();
//       return Long.parseLong(userDetails.get("id"));
       return Long.parseLong("2");
       Map<String, String> userDetails = getCurrentUserDetails();
       return Long.parseLong(userDetails.get(CustomerDetailEnum.ID.getValue()));
    }
    

    public static Map<String, String> getCurrentUserDetails() {
       SecurityContext securityContext = SecurityContextHolder.getContext();
       if(securityContext.getAuthentication()==null ||