[services] tidy up our identity service code
ClosedPublic
Actions

	use base64::{engine::general_purpose, DecodeError, Engine as _};			use base64::{engine::general_purpose, DecodeError, Engine as _};
	use clap::{Parser, Subcommand};			use clap::{Parser, Subcommand};
	use once_cell::sync::Lazy;			use once_cell::sync::Lazy;
	use std::{collections::HashSet, env, fmt, fs, io, path};			use std::{env, fmt, fs, io, path};
	use tracing::{error, info};			use tracing::{error, info};

	use crate::constants::{			use crate::constants::{
	DEFAULT_OPENSEARCH_ENDPOINT, DEFAULT_TUNNELBROKER_ENDPOINT,			DEFAULT_OPENSEARCH_ENDPOINT, DEFAULT_TUNNELBROKER_ENDPOINT,
	KEYSERVER_PUBLIC_KEY, LOCALSTACK_ENDPOINT, OPAQUE_SERVER_SETUP,			KEYSERVER_PUBLIC_KEY, LOCALSTACK_ENDPOINT, OPAQUE_SERVER_SETUP,
	OPENSEARCH_ENDPOINT, SECRETS_DIRECTORY, SECRETS_SETUP_FILE,			OPENSEARCH_ENDPOINT, SECRETS_DIRECTORY, SECRETS_SETUP_FILE,
	TUNNELBROKER_GRPC_ENDPOINT,			TUNNELBROKER_GRPC_ENDPOINT,
	};			};
	▲ Show 20 Lines • Show All 148 Lines • Show Last 20 Lines

services/identity/src/database/device_list.rs

Show First 20 Lines • Show All 1,149 Lines • ▼ Show 20 Lines	mobile_devices.sort_by(\|a, b\| {
b.login_time.cmp(&a.login_time)		b.login_time.cmp(&a.login_time)
} else {		} else {
code_version_cmp		code_version_cmp
}		}
});		});
mobile_devices.first().cloned()		mobile_devices.first().cloned()
}		}

		#[cfg(test)]
mod tests {		mod tests {
use super::*;		use super::*;
use chrono::Duration;		use chrono::Duration;

#[test]		#[test]
fn reorder_skips_no_devices() {		fn reorder_skips_no_devices() {
let mut list = vec![];		let mut list = vec![];
reorder_device_list("", &mut list, &[]);		reorder_device_list("", &mut list, &[]);
▲ Show 20 Lines • Show All 179 Lines • Show Last 20 Lines

Show All 26 Lines	pub struct AccessTokenData {
pub signing_public_key: String,		pub signing_public_key: String,
pub access_token: String,		pub access_token: String,
pub created: DateTime<Utc>,		pub created: DateTime<Utc>,
pub auth_type: AuthType,		pub auth_type: AuthType,
pub valid: bool,		pub valid: bool,
}		}

impl AccessTokenData {		impl AccessTokenData {
pub fn new(
user_id: String,
signing_public_key: String,
auth_type: AuthType,
rng: &mut (impl Rng + CryptoRng),
) -> Self {
AccessTokenData {
user_id,
signing_public_key,
access_token: Alphanumeric.sample_string(rng, ACCESS_TOKEN_LENGTH),
created: Utc::now(),
auth_type,
valid: true,
}
}

pub fn with_created_time(		pub fn with_created_time(
user_id: String,		user_id: String,
signing_public_key: String,		signing_public_key: String,
creation_time: DateTime<Utc>,		creation_time: DateTime<Utc>,
auth_type: AuthType,		auth_type: AuthType,
rng: &mut (impl Rng + CryptoRng),		rng: &mut (impl Rng + CryptoRng),
) -> Self {		) -> Self {
AccessTokenData {		AccessTokenData {
Show All 13 Lines

	use tracing::error;

	pub type BoxedError = Box<dyn std::error::Error + Send + Sync + 'static>;			pub type BoxedError = Box<dyn std::error::Error + Send + Sync + 'static>;

	#[derive(			#[derive(
	Debug, derive_more::Display, derive_more::From, derive_more::Error,			Debug, derive_more::Display, derive_more::From, derive_more::Error,
	)]			)]
	pub enum WebsocketError {			pub enum WebsocketError {
	InvalidMessage,			InvalidMessage,
	InvalidSearchQuery,
	UnauthorizedDevice,			UnauthorizedDevice,
	SendError,
	SearchError,			SearchError,
	AuthError,			AuthError,
	SerializationError,			SerializationError,
	}			}

	impl From<serde_json::Error> for WebsocketError {			impl From<serde_json::Error> for WebsocketError {
	fn from(err: serde_json::Error) -> Self {			fn from(err: serde_json::Error) -> Self {
	tracing::error!("Error serializing: {}", err);			tracing::error!("Error serializing: {}", err);
	Show All 10 Lines