Jake Howard
					
					5 years ago
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 57AFB45680EDD477
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
20 additions and 
20 deletions
			 
			
		 
		
			
				- 
					
					
					 
					src/api/core/two_factor/u2f.rs
				
 
			
				- 
					
					
					 
					src/auth.rs
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -131,12 +131,12 @@ struct RegisterResponseCopy { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    pub error_code: Option<NumberOrString>, | 
					 | 
					 | 
					    pub error_code: Option<NumberOrString>, | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					} | 
					 | 
					 | 
					} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					impl Into<RegisterResponse> for RegisterResponseCopy { | 
					 | 
					 | 
					impl From<RegisterResponseCopy> for RegisterResponse { | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					    fn into(self) -> RegisterResponse { | 
					 | 
					 | 
					    fn from(r: RegisterResponseCopy) -> RegisterResponse { | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        RegisterResponse { | 
					 | 
					 | 
					        RegisterResponse { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            registration_data: self.registration_data, | 
					 | 
					 | 
					            registration_data: r.registration_data, | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            version: self.version, | 
					 | 
					 | 
					            version: r.version, | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            client_data: self.client_data, | 
					 | 
					 | 
					            client_data: r.client_data, | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					} | 
					 | 
					 | 
					} | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -450,12 +450,12 @@ impl<'a, 'r> FromRequest<'a, 'r> for AdminHeaders { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					} | 
					 | 
					 | 
					} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					impl Into<Headers> for AdminHeaders { | 
					 | 
					 | 
					impl From<AdminHeaders> for Headers { | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					    fn into(self) -> Headers { | 
					 | 
					 | 
					    fn from(h: AdminHeaders) -> Headers { | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        Headers { | 
					 | 
					 | 
					        Headers { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            host: self.host, | 
					 | 
					 | 
					            host: h.host, | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            device: self.device, | 
					 | 
					 | 
					            device: h.device, | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            user: self.user, | 
					 | 
					 | 
					            user: h.user, | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					} | 
					 | 
					 | 
					} | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -529,12 +529,12 @@ impl<'a, 'r> FromRequest<'a, 'r> for ManagerHeaders { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					} | 
					 | 
					 | 
					} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					impl Into<Headers> for ManagerHeaders { | 
					 | 
					 | 
					impl From<ManagerHeaders> for Headers { | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					    fn into(self) -> Headers { | 
					 | 
					 | 
					    fn from(h: ManagerHeaders) -> Headers { | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        Headers { | 
					 | 
					 | 
					        Headers { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            host: self.host, | 
					 | 
					 | 
					            host: h.host, | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            device: self.device, | 
					 | 
					 | 
					            device: h.device, | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            user: self.user, | 
					 | 
					 | 
					            user: h.user, | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					} | 
					 | 
					 | 
					} | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -571,12 +571,12 @@ impl<'a, 'r> FromRequest<'a, 'r> for ManagerHeadersLoose { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					} | 
					 | 
					 | 
					} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					impl Into<Headers> for ManagerHeadersLoose { | 
					 | 
					 | 
					impl From<ManagerHeadersLoose> for Headers { | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					    fn into(self) -> Headers { | 
					 | 
					 | 
					    fn from(h: ManagerHeadersLoose) -> Headers { | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        Headers { | 
					 | 
					 | 
					        Headers { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            host: self.host, | 
					 | 
					 | 
					            host: h.host, | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            device: self.device, | 
					 | 
					 | 
					            device: h.device, | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					            user: self.user, | 
					 | 
					 | 
					            user: h.user, | 
				
			
			
				
				
			
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					} | 
					 | 
					 | 
					} | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |