mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-31 02:28:09 +00:00 
			
		
		
		
	backport of UI: handle control group error on SSH (#23033)
Co-authored-by: Chelsea Shaw <82459713+hashishaw@users.noreply.github.com>
This commit is contained in:
		 hc-github-team-secure-vault-core
					hc-github-team-secure-vault-core
				
			
				
					committed by
					
						 GitHub
						GitHub
					
				
			
			
				
	
			
			
			 GitHub
						GitHub
					
				
			
						parent
						
							2b81921e7b
						
					
				
				
					commit
					7a0f9fe25f
				
			
							
								
								
									
										3
									
								
								changelog/23025.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								changelog/23025.txt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | ```release-note:bug | ||||||
|  | ui (enterprise): Fix error message when generating SSH credential with control group | ||||||
|  | ``` | ||||||
| @@ -26,6 +26,7 @@ const MODEL_TYPES = { | |||||||
| }; | }; | ||||||
|  |  | ||||||
| export default Component.extend({ | export default Component.extend({ | ||||||
|  |   controlGroup: service(), | ||||||
|   store: service(), |   store: service(), | ||||||
|   router: service(), |   router: service(), | ||||||
|   // set on the component |   // set on the component | ||||||
| @@ -90,10 +91,23 @@ export default Component.extend({ | |||||||
|     create() { |     create() { | ||||||
|       const model = this.model; |       const model = this.model; | ||||||
|       this.set('loading', true); |       this.set('loading', true); | ||||||
|       this.model.save().finally(() => { |       this.model | ||||||
|         model.set('hasGenerated', true); |         .save() | ||||||
|         this.set('loading', false); |         .then(() => { | ||||||
|       }); |           model.set('hasGenerated', true); | ||||||
|  |         }) | ||||||
|  |         .catch((error) => { | ||||||
|  |           // Handle control group AdapterError | ||||||
|  |           if (error.message === 'Control Group encountered') { | ||||||
|  |             this.controlGroup.saveTokenFromError(error); | ||||||
|  |             const err = this.controlGroup.logFromError(error); | ||||||
|  |             error.errors = [err.content]; | ||||||
|  |           } | ||||||
|  |           throw error; | ||||||
|  |         }) | ||||||
|  |         .finally(() => { | ||||||
|  |           this.set('loading', false); | ||||||
|  |         }); | ||||||
|     }, |     }, | ||||||
|  |  | ||||||
|     codemirrorUpdated(attr, val, codemirror) { |     codemirrorUpdated(attr, val, codemirror) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user