 GeekCorner
					
					2 years ago
						GeekCorner
					
					2 years ago
					
						
							committed by
							
								 GitHub
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 4AEE18F83AFDEB23
						
					
				
			
		
		
		
	
		
			
				 3 changed files with 
4 additions and 
9 deletions
			 
			
		 
		
			
				- 
					
					
					 
					src/api/core/ciphers.rs
				
- 
					
					
					 
					src/api/core/mod.rs
				
- 
					
					
					 
					src/db/models/cipher.rs
				
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -212,8 +212,7 @@ pub struct CipherData { | 
			
		
	
		
			
				
					|  |  |  |     Login = 1, | 
			
		
	
		
			
				
					|  |  |  |     SecureNote = 2, | 
			
		
	
		
			
				
					|  |  |  |     Card = 3, | 
			
		
	
		
			
				
					|  |  |  |     Identity = 4, | 
			
		
	
		
			
				
					|  |  |  |     Fido2Key = 5 | 
			
		
	
		
			
				
					|  |  |  |     Identity = 4 | 
			
		
	
		
			
				
					|  |  |  |     */ | 
			
		
	
		
			
				
					|  |  |  |     pub Type: i32, | 
			
		
	
		
			
				
					|  |  |  |     pub Name: String, | 
			
		
	
	
		
			
				
					|  |  | @ -225,7 +224,6 @@ pub struct CipherData { | 
			
		
	
		
			
				
					|  |  |  |     SecureNote: Option<Value>, | 
			
		
	
		
			
				
					|  |  |  |     Card: Option<Value>, | 
			
		
	
		
			
				
					|  |  |  |     Identity: Option<Value>, | 
			
		
	
		
			
				
					|  |  |  |     Fido2Key: Option<Value>, | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     Favorite: Option<bool>, | 
			
		
	
		
			
				
					|  |  |  |     Reprompt: Option<i32>, | 
			
		
	
	
		
			
				
					|  |  | @ -468,7 +466,6 @@ pub async fn update_cipher_from_data( | 
			
		
	
		
			
				
					|  |  |  |         2 => data.SecureNote, | 
			
		
	
		
			
				
					|  |  |  |         3 => data.Card, | 
			
		
	
		
			
				
					|  |  |  |         4 => data.Identity, | 
			
		
	
		
			
				
					|  |  |  |         5 => data.Fido2Key, | 
			
		
	
		
			
				
					|  |  |  |         _ => err!("Invalid type"), | 
			
		
	
		
			
				
					|  |  |  |     }; | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -216,7 +216,8 @@ fn config() -> Json<Value> { | 
			
		
	
		
			
				
					|  |  |  |           // Any feature flags that we want the clients to use
 | 
			
		
	
		
			
				
					|  |  |  |           // Can check the enabled ones at:
 | 
			
		
	
		
			
				
					|  |  |  |           // https://vault.bitwarden.com/api/config
 | 
			
		
	
		
			
				
					|  |  |  |           "autofill-v2": true | 
			
		
	
		
			
				
					|  |  |  |           "autofill-v2": true, | 
			
		
	
		
			
				
					|  |  |  |           "fido2-vault-credentials": true | 
			
		
	
		
			
				
					|  |  |  |         }, | 
			
		
	
		
			
				
					|  |  |  |         "object": "config", | 
			
		
	
		
			
				
					|  |  |  |     })) | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -29,8 +29,7 @@ db_object! { | 
			
		
	
		
			
				
					|  |  |  |         Login = 1, | 
			
		
	
		
			
				
					|  |  |  |         SecureNote = 2, | 
			
		
	
		
			
				
					|  |  |  |         Card = 3, | 
			
		
	
		
			
				
					|  |  |  |         Identity = 4, | 
			
		
	
		
			
				
					|  |  |  |         Fido2key = 5 | 
			
		
	
		
			
				
					|  |  |  |         Identity = 4 | 
			
		
	
		
			
				
					|  |  |  |         */ | 
			
		
	
		
			
				
					|  |  |  |         pub atype: i32, | 
			
		
	
		
			
				
					|  |  |  |         pub name: String, | 
			
		
	
	
		
			
				
					|  |  | @ -229,7 +228,6 @@ impl Cipher { | 
			
		
	
		
			
				
					|  |  |  |             "SecureNote": null, | 
			
		
	
		
			
				
					|  |  |  |             "Card": null, | 
			
		
	
		
			
				
					|  |  |  |             "Identity": null, | 
			
		
	
		
			
				
					|  |  |  |             "Fido2Key": null, | 
			
		
	
		
			
				
					|  |  |  |         }); | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |         // These values are only needed for user/default syncs
 | 
			
		
	
	
		
			
				
					|  |  | @ -258,7 +256,6 @@ impl Cipher { | 
			
		
	
		
			
				
					|  |  |  |             2 => "SecureNote", | 
			
		
	
		
			
				
					|  |  |  |             3 => "Card", | 
			
		
	
		
			
				
					|  |  |  |             4 => "Identity", | 
			
		
	
		
			
				
					|  |  |  |             5 => "Fido2Key", | 
			
		
	
		
			
				
					|  |  |  |             _ => panic!("Wrong type"), | 
			
		
	
		
			
				
					|  |  |  |         }; | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  | 
 |