Merge branch 'QAT-5177' into Rel2.95

Author: dolly-chhabriya-altius

src/main/java/cc/altius/FASP/jwt/JWTWebSecurityConfig.java

@@ -29,7 +29,7 @@
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 @Configuration
-@EnableWebSecurity(debug = true)
+@EnableWebSecurity
 @Order(1000)
 public class JWTWebSecurityConfig {
 

src/main/java/cc/altius/FASP/service/impl/ProgramServiceImpl.java

@@ -163,7 +163,7 @@ public int addProgram(ProgramInitialize p, CustomUserDetails curUser) throws Acc
     public int updateProgram(ProgramInitialize p, CustomUserDetails curUser) throws AccessControlFailedException {
         if (p.getProgramId() != 0) {
             try {
-                this.programCommonDao.getSimpleProgramById(p.getProgramId(), GlobalConstants.PROGRAM_TYPE_SUPPLY_PLAN, curUser);
+                this.programCommonDao.getSimpleProgramById(p.getProgramId(), p.getProgramTypeId(), curUser);
             } catch (EmptyResultDataAccessException e) {
                 throw new AccessControlFailedException();
             }

src/main/resources/application.properties

@@ -26,8 +26,6 @@ jwt.token.expiration.in.seconds=21600
 session.expiry.time=1800
 syncExpiresOn=15
 
-logging.level.org.springframework.security=TRACE
-
 info.app.name=QAT
 info.app.description=Quantification Analytics Tool
 info.app.version=2.94[5233]