Browse Source
			
			
			Merge pull request #256 from mprasil/fix_accepted_sync
			
				Prevent accepted user from seeing ciphers until confirmed (fixes #196)
			
			
				pull/258/head
			
			
		 
		
			
				
					
						
						Daniel García
					
					7 years ago
					
						
							committed by
							
								
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 4AEE18F83AFDEB23
						
					
				
			
		
		
		
	
		
			
				 1 changed files with 
3 additions and 
1 deletions
			 
			
		 
		
			
				- 
					
					
					 
					src/db/models/cipher.rs
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -318,7 +318,9 @@ impl Cipher { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        .filter(ciphers::user_uuid.eq(user_uuid).or( // Cipher owner
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            users_organizations::access_all.eq(true).or( // access_all in Organization
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                users_organizations::type_.le(UserOrgType::Admin as i32).or( // Org admin or owner
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    users_collections::user_uuid.eq(user_uuid) // Access to Collection
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    users_collections::user_uuid.eq(user_uuid).and( // Access to Collection
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                        users_organizations::status.eq(UserOrgStatus::Confirmed as i32) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                    ) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					                ) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            ) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        )) | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |