From 59041a2948b7dcaade4bb8cc9328d06a2c25f897 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Thu, 20 Jun 2024 23:30:41 +0600 Subject: [PATCH] chore: use .value for scrobble encrypted text --- lib/models/database/database.g.dart | 67 +++++++++++++++------------ lib/provider/scrobbler/scrobbler.dart | 6 +-- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/lib/models/database/database.g.dart b/lib/models/database/database.g.dart index 6bcfbf21..6f899066 100644 --- a/lib/models/database/database.g.dart +++ b/lib/models/database/database.g.dart @@ -1763,9 +1763,12 @@ class $ScrobblerTableTable extends ScrobblerTable static const VerificationMeta _passwordHashMeta = const VerificationMeta('passwordHash'); @override - late final GeneratedColumn passwordHash = GeneratedColumn( - 'password_hash', aliasedName, false, - type: DriftSqlType.string, requiredDuringInsert: true); + late final GeneratedColumnWithTypeConverter + passwordHash = GeneratedColumn( + 'password_hash', aliasedName, false, + type: DriftSqlType.string, requiredDuringInsert: true) + .withConverter( + $ScrobblerTableTable.$converterpasswordHash); @override List get $columns => [id, createdAt, username, passwordHash]; @override @@ -1791,14 +1794,7 @@ class $ScrobblerTableTable extends ScrobblerTable } else if (isInserting) { context.missing(_usernameMeta); } - if (data.containsKey('password_hash')) { - context.handle( - _passwordHashMeta, - passwordHash.isAcceptableOrUnknown( - data['password_hash']!, _passwordHashMeta)); - } else if (isInserting) { - context.missing(_passwordHashMeta); - } + context.handle(_passwordHashMeta, const VerificationResult.success()); return context; } @@ -1814,8 +1810,9 @@ class $ScrobblerTableTable extends ScrobblerTable .read(DriftSqlType.dateTime, data['${effectivePrefix}created_at'])!, username: attachedDatabase.typeMapping .read(DriftSqlType.string, data['${effectivePrefix}username'])!, - passwordHash: attachedDatabase.typeMapping - .read(DriftSqlType.string, data['${effectivePrefix}password_hash'])!, + passwordHash: $ScrobblerTableTable.$converterpasswordHash.fromSql( + attachedDatabase.typeMapping.read( + DriftSqlType.string, data['${effectivePrefix}password_hash'])!), ); } @@ -1823,6 +1820,9 @@ class $ScrobblerTableTable extends ScrobblerTable $ScrobblerTableTable createAlias(String alias) { return $ScrobblerTableTable(attachedDatabase, alias); } + + static TypeConverter $converterpasswordHash = + EncryptedTextConverter(); } class ScrobblerTableData extends DataClass @@ -1830,7 +1830,7 @@ class ScrobblerTableData extends DataClass final int id; final DateTime createdAt; final String username; - final String passwordHash; + final DecryptedText passwordHash; const ScrobblerTableData( {required this.id, required this.createdAt, @@ -1842,7 +1842,10 @@ class ScrobblerTableData extends DataClass map['id'] = Variable(id); map['created_at'] = Variable(createdAt); map['username'] = Variable(username); - map['password_hash'] = Variable(passwordHash); + { + map['password_hash'] = Variable( + $ScrobblerTableTable.$converterpasswordHash.toSql(passwordHash)); + } return map; } @@ -1862,7 +1865,7 @@ class ScrobblerTableData extends DataClass id: serializer.fromJson(json['id']), createdAt: serializer.fromJson(json['createdAt']), username: serializer.fromJson(json['username']), - passwordHash: serializer.fromJson(json['passwordHash']), + passwordHash: serializer.fromJson(json['passwordHash']), ); } @override @@ -1872,7 +1875,7 @@ class ScrobblerTableData extends DataClass 'id': serializer.toJson(id), 'createdAt': serializer.toJson(createdAt), 'username': serializer.toJson(username), - 'passwordHash': serializer.toJson(passwordHash), + 'passwordHash': serializer.toJson(passwordHash), }; } @@ -1880,7 +1883,7 @@ class ScrobblerTableData extends DataClass {int? id, DateTime? createdAt, String? username, - String? passwordHash}) => + DecryptedText? passwordHash}) => ScrobblerTableData( id: id ?? this.id, createdAt: createdAt ?? this.createdAt, @@ -1914,7 +1917,7 @@ class ScrobblerTableCompanion extends UpdateCompanion { final Value id; final Value createdAt; final Value username; - final Value passwordHash; + final Value passwordHash; const ScrobblerTableCompanion({ this.id = const Value.absent(), this.createdAt = const Value.absent(), @@ -1925,7 +1928,7 @@ class ScrobblerTableCompanion extends UpdateCompanion { this.id = const Value.absent(), this.createdAt = const Value.absent(), required String username, - required String passwordHash, + required DecryptedText passwordHash, }) : username = Value(username), passwordHash = Value(passwordHash); static Insertable custom({ @@ -1946,7 +1949,7 @@ class ScrobblerTableCompanion extends UpdateCompanion { {Value? id, Value? createdAt, Value? username, - Value? passwordHash}) { + Value? passwordHash}) { return ScrobblerTableCompanion( id: id ?? this.id, createdAt: createdAt ?? this.createdAt, @@ -1968,7 +1971,9 @@ class ScrobblerTableCompanion extends UpdateCompanion { map['username'] = Variable(username.value); } if (passwordHash.present) { - map['password_hash'] = Variable(passwordHash.value); + map['password_hash'] = Variable($ScrobblerTableTable + .$converterpasswordHash + .toSql(passwordHash.value)); } return map; } @@ -3342,14 +3347,14 @@ typedef $$ScrobblerTableTableInsertCompanionBuilder = ScrobblerTableCompanion Value id, Value createdAt, required String username, - required String passwordHash, + required DecryptedText passwordHash, }); typedef $$ScrobblerTableTableUpdateCompanionBuilder = ScrobblerTableCompanion Function({ Value id, Value createdAt, Value username, - Value passwordHash, + Value passwordHash, }); class $$ScrobblerTableTableTableManager extends RootTableManager< @@ -3376,7 +3381,7 @@ class $$ScrobblerTableTableTableManager extends RootTableManager< Value id = const Value.absent(), Value createdAt = const Value.absent(), Value username = const Value.absent(), - Value passwordHash = const Value.absent(), + Value passwordHash = const Value.absent(), }) => ScrobblerTableCompanion( id: id, @@ -3388,7 +3393,7 @@ class $$ScrobblerTableTableTableManager extends RootTableManager< Value id = const Value.absent(), Value createdAt = const Value.absent(), required String username, - required String passwordHash, + required DecryptedText passwordHash, }) => ScrobblerTableCompanion.insert( id: id, @@ -3429,10 +3434,12 @@ class $$ScrobblerTableTableFilterComposer builder: (column, joinBuilders) => ColumnFilters(column, joinBuilders: joinBuilders)); - ColumnFilters get passwordHash => $state.composableBuilder( - column: $state.table.passwordHash, - builder: (column, joinBuilders) => - ColumnFilters(column, joinBuilders: joinBuilders)); + ColumnWithTypeConverterFilters + get passwordHash => $state.composableBuilder( + column: $state.table.passwordHash, + builder: (column, joinBuilders) => ColumnWithTypeConverterFilters( + column, + joinBuilders: joinBuilders)); } class $$ScrobblerTableTableOrderingComposer diff --git a/lib/provider/scrobbler/scrobbler.dart b/lib/provider/scrobbler/scrobbler.dart index d0b41c56..76559d69 100644 --- a/lib/provider/scrobbler/scrobbler.dart +++ b/lib/provider/scrobbler/scrobbler.dart @@ -30,7 +30,7 @@ class ScrobblerNotifier extends AsyncNotifier { apiKey: Env.lastFmApiKey, apiSecret: Env.lastFmApiSecret, username: event.first.username, - passwordHash: event.first.passwordHash, + passwordHash: event.first.passwordHash.value, ), ), ); @@ -70,7 +70,7 @@ class ScrobblerNotifier extends AsyncNotifier { apiKey: Env.lastFmApiKey, apiSecret: Env.lastFmApiSecret, username: loginInfo.username, - passwordHash: loginInfo.passwordHash, + passwordHash: loginInfo.passwordHash.value, ), ); } @@ -94,7 +94,7 @@ class ScrobblerNotifier extends AsyncNotifier { ScrobblerTableCompanion.insert( id: const Value(0), username: username, - passwordHash: lastFm.passwordHash!, + passwordHash: DecryptedText(lastFm.passwordHash!), ), ); }