This commit is contained in:
Christien Rioux 2023-07-21 21:25:27 -04:00
parent 9d8b609844
commit bc3ed79cc2
23 changed files with 458 additions and 275 deletions

View file

@ -11,7 +11,7 @@ part 'user_login.g.dart';
@freezed
class UserLogin with _$UserLogin {
const factory UserLogin({
// Master public key for the user used to index the local accounts table
// Master record key for the user used to index the local accounts table
required TypedKey accountMasterKey,
// The identity secret as unlocked from the local accounts table
required TypedSecret secretKey,
@ -30,7 +30,7 @@ class ActiveLogins with _$ActiveLogins {
const factory ActiveLogins({
// The list of current logged in accounts
required IList<UserLogin> userLogins,
// The current selected account indexed by master key
// The current selected account indexed by master record key
TypedKey? activeUserLogin,
}) = _ActiveLogins;

View file

@ -20,8 +20,8 @@ UserLogin _$UserLoginFromJson(Map<String, dynamic> json) {
/// @nodoc
mixin _$UserLogin {
// Master public key for the user used to index the local accounts table
Typed<FixedEncodedString43> get accountMasterKey =>
// Master record key for the user used to index the local accounts table
Typed<FixedEncodedString43> get accountMasterRecordKey =>
throw _privateConstructorUsedError; // The identity secret as unlocked from the local accounts table
Typed<FixedEncodedString43> get secretKey =>
throw _privateConstructorUsedError; // The time this login was most recently used
@ -63,7 +63,7 @@ class _$UserLoginCopyWithImpl<$Res, $Val extends UserLogin>
}) {
return _then(_value.copyWith(
accountMasterKey: null == accountMasterKey
? _value.accountMasterKey
? _value.accountMasterRecordKey
: accountMasterKey // ignore: cast_nullable_to_non_nullable
as Typed<FixedEncodedString43>,
secretKey: null == secretKey
@ -107,8 +107,8 @@ class __$$_UserLoginCopyWithImpl<$Res>
Object? lastActive = null,
}) {
return _then(_$_UserLogin(
accountMasterKey: null == accountMasterKey
? _value.accountMasterKey
accountMasterRecordKey: null == accountMasterKey
? _value.accountMasterRecordKey
: accountMasterKey // ignore: cast_nullable_to_non_nullable
as Typed<FixedEncodedString43>,
secretKey: null == secretKey
@ -127,16 +127,16 @@ class __$$_UserLoginCopyWithImpl<$Res>
@JsonSerializable()
class _$_UserLogin implements _UserLogin {
const _$_UserLogin(
{required this.accountMasterKey,
{required this.accountMasterRecordKey,
required this.secretKey,
required this.lastActive});
factory _$_UserLogin.fromJson(Map<String, dynamic> json) =>
_$$_UserLoginFromJson(json);
// Master public key for the user used to index the local accounts table
// Master record key for the user used to index the local accounts table
@override
final Typed<FixedEncodedString43> accountMasterKey;
final Typed<FixedEncodedString43> accountMasterRecordKey;
// The identity secret as unlocked from the local accounts table
@override
final Typed<FixedEncodedString43> secretKey;
@ -146,7 +146,7 @@ class _$_UserLogin implements _UserLogin {
@override
String toString() {
return 'UserLogin(accountMasterKey: $accountMasterKey, secretKey: $secretKey, lastActive: $lastActive)';
return 'UserLogin(accountMasterKey: $accountMasterRecordKey, secretKey: $secretKey, lastActive: $lastActive)';
}
@override
@ -154,8 +154,8 @@ class _$_UserLogin implements _UserLogin {
return identical(this, other) ||
(other.runtimeType == runtimeType &&
other is _$_UserLogin &&
(identical(other.accountMasterKey, accountMasterKey) ||
other.accountMasterKey == accountMasterKey) &&
(identical(other.accountMasterRecordKey, accountMasterRecordKey) ||
other.accountMasterRecordKey == accountMasterRecordKey) &&
(identical(other.secretKey, secretKey) ||
other.secretKey == secretKey) &&
(identical(other.lastActive, lastActive) ||
@ -165,7 +165,7 @@ class _$_UserLogin implements _UserLogin {
@JsonKey(ignore: true)
@override
int get hashCode =>
Object.hash(runtimeType, accountMasterKey, secretKey, lastActive);
Object.hash(runtimeType, accountMasterRecordKey, secretKey, lastActive);
@JsonKey(ignore: true)
@override
@ -190,8 +190,8 @@ abstract class _UserLogin implements UserLogin {
factory _UserLogin.fromJson(Map<String, dynamic> json) =
_$_UserLogin.fromJson;
@override // Master public key for the user used to index the local accounts table
Typed<FixedEncodedString43> get accountMasterKey;
@override // Master record key for the user used to index the local accounts table
Typed<FixedEncodedString43> get accountMasterRecordKey;
@override // The identity secret as unlocked from the local accounts table
Typed<FixedEncodedString43> get secretKey;
@override // The time this login was most recently used
@ -210,7 +210,7 @@ ActiveLogins _$ActiveLoginsFromJson(Map<String, dynamic> json) {
mixin _$ActiveLogins {
// The list of current logged in accounts
IList<UserLogin> get userLogins =>
throw _privateConstructorUsedError; // The current selected account indexed by master key
throw _privateConstructorUsedError; // The current selected account indexed by master record key
Typed<FixedEncodedString43>? get activeUserLogin =>
throw _privateConstructorUsedError;
@ -311,7 +311,7 @@ class _$_ActiveLogins implements _ActiveLogins {
// The list of current logged in accounts
@override
final IList<UserLogin> userLogins;
// The current selected account indexed by master key
// The current selected account indexed by master record key
@override
final Typed<FixedEncodedString43>? activeUserLogin;
@ -360,7 +360,7 @@ abstract class _ActiveLogins implements ActiveLogins {
@override // The list of current logged in accounts
IList<UserLogin> get userLogins;
@override // The current selected account indexed by master key
@override // The current selected account indexed by master record key
Typed<FixedEncodedString43>? get activeUserLogin;
@override
@JsonKey(ignore: true)

View file

@ -7,7 +7,7 @@ part of 'user_login.dart';
// **************************************************************************
_$_UserLogin _$$_UserLoginFromJson(Map<String, dynamic> json) => _$_UserLogin(
accountMasterKey:
accountMasterRecordKey:
Typed<FixedEncodedString43>.fromJson(json['account_master_key']),
secretKey: Typed<FixedEncodedString43>.fromJson(json['secret_key']),
lastActive: Timestamp.fromJson(json['last_active']),
@ -15,7 +15,7 @@ _$_UserLogin _$$_UserLoginFromJson(Map<String, dynamic> json) => _$_UserLogin(
Map<String, dynamic> _$$_UserLoginToJson(_$_UserLogin instance) =>
<String, dynamic>{
'account_master_key': instance.accountMasterKey.toJson(),
'account_master_key': instance.accountMasterRecordKey.toJson(),
'secret_key': instance.secretKey.toJson(),
'last_active': instance.lastActive.toJson(),
};