new configuration version
This commit is contained in:
		
							parent
							
								
									83f5723260
								
							
						
					
					
						commit
						16260c53a1
					
				| 
						 | 
					@ -45,7 +45,7 @@ spec:
 | 
				
			||||||
  podDisruptionBudget:
 | 
					  podDisruptionBudget:
 | 
				
			||||||
    maxUnavailable: "50%"
 | 
					    maxUnavailable: "50%"
 | 
				
			||||||
  git:
 | 
					  git:
 | 
				
			||||||
    tag: "r-1c0759acd254c4baf2150c38f915cea9af509d6d"
 | 
					    tag: "r-d19a190ffad492ab91a9ed98a565105e0bd12bf5"
 | 
				
			||||||
    dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth"
 | 
					    dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/auth"
 | 
				
			||||||
    credentials: "git-credentials"
 | 
					    credentials: "git-credentials"
 | 
				
			||||||
  keystores:
 | 
					  keystores:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -30,14 +30,22 @@ String endPoint = "${parameters.get('utility-service.baseUrl')}/api/v1/recovery/
 | 
				
			||||||
def userDto = new XmlSlurper().parseText(session.get('ch.adnovum.nevisidm.userDto'))
 | 
					def userDto = new XmlSlurper().parseText(session.get('ch.adnovum.nevisidm.userDto'))
 | 
				
			||||||
def recoveryCredential = userDto.'**'.find {node -> node.name() == 'credentials' && node.type.text() == 'CONTEXT_PASSWORD' && node.context.text() == 'RECOVERY'}
 | 
					def recoveryCredential = userDto.'**'.find {node -> node.name() == 'credentials' && node.type.text() == 'CONTEXT_PASSWORD' && node.context.text() == 'RECOVERY'}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// 1a) check if user has a credential
 | 
					// Only for aq 100, skip for the rest
 | 
				
			||||||
 | 
					if (Arrays.stream(response.getActualRoles()).filter( r -> r.matches('^.*AGOV-Loi\\.level[2345]00.*$')).findAny().isPresent()) {
 | 
				
			||||||
 | 
						LOG.debug("Account '${user}' has a higher AQ-level than 100, no need to check code")
 | 
				
			||||||
 | 
						response.setResult('done')
 | 
				
			||||||
 | 
						return
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// 1b) check if user has a credential
 | 
				
			||||||
if ( recoveryCredential != null ) {
 | 
					if ( recoveryCredential != null ) {
 | 
				
			||||||
	LOG.debug("Account '${user}' has an active recovery code, no need to create new code")
 | 
						LOG.debug("Account '${user}' has an active recovery code, no need to create new code")
 | 
				
			||||||
	response.setResult('done')
 | 
						response.setResult('done')
 | 
				
			||||||
	return
 | 
						return
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// 1b) check if a recovery is ongoing (nothing to do)
 | 
					// 1c) check if a recovery is ongoing (nothing to do)
 | 
				
			||||||
if (Arrays.stream(response.getActualRoles()).filter( r -> r.contains('AGOV-AccountStatus.recovery')).findAny().isPresent()) {
 | 
					if (Arrays.stream(response.getActualRoles()).filter( r -> r.contains('AGOV-AccountStatus.recovery')).findAny().isPresent()) {
 | 
				
			||||||
	LOG.debug("Account '${user}' is in recovery, no need to create new code")
 | 
						LOG.debug("Account '${user}' is in recovery, no need to create new code")
 | 
				
			||||||
	response.setResult('done')
 | 
						response.setResult('done')
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue