Browse Source
			
			
			Merge branch 'BlackDex-fix-sync-desktop-client' into main
			
			
				pull/1945/head
			
			
		 
		
			
				
					
						
						Daniel García
					
					4 years ago
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: FC8A7D14C3CD543A
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
6 additions and 
1 deletions
			 
			
		 
		
			
				- 
					
					
					 
					src/db/models/organization.rs
				
 
			
				- 
					
					
					 
					src/db/models/user.rs
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -290,6 +290,8 @@ impl UserOrganization { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            // For now they still have that code also in the web-vault, but they will remove it at some point.
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            // https://github.com/bitwarden/server/tree/master/bitwarden_license/src/
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "UseBusinessPortal": false, // Disable BusinessPortal Button
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "ProviderId": null, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "ProviderName": null, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            // TODO: Add support for Custom User Roles
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            // See: https://bitwarden.com/help/article/user-types-access-control/#custom-role
 | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -210,7 +210,10 @@ impl User { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "PrivateKey": self.private_key, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "SecurityStamp": self.security_stamp, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "Organizations": orgs_json, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "Object": "profile" | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "Providers": [], | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "ProviderOrganizations": [], | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "ForcePasswordReset": false, | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					            "Object": "profile", | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					        }) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    } | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |