Add nonce support
This commit is contained in:
parent
43ad7937f9
commit
05e1a4aab1
4 changed files with 37 additions and 23 deletions
|
@ -41,7 +41,14 @@ class ApiHelper {
|
||||||
|
|
||||||
ref
|
ref
|
||||||
.read(AuthCodeController.provider.notifier)
|
.read(AuthCodeController.provider.notifier)
|
||||||
.set(code, MatrixUser(userId: userId, matrixToken: accessToken));
|
.set(
|
||||||
|
code,
|
||||||
|
MatrixUser(
|
||||||
|
userId: userId,
|
||||||
|
matrixToken: accessToken,
|
||||||
|
nonce: data["nonce"],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
final uri = Uri.parse(redirectUri);
|
final uri = Uri.parse(redirectUri);
|
||||||
|
|
||||||
|
@ -108,6 +115,7 @@ class ApiHelper {
|
||||||
1000,
|
1000,
|
||||||
"email": "$name@federated.nexus",
|
"email": "$name@federated.nexus",
|
||||||
"name": name,
|
"name": name,
|
||||||
|
"nonce": user.nonce,
|
||||||
"iat": DateTime.now().millisecondsSinceEpoch ~/ 1000,
|
"iat": DateTime.now().millisecondsSinceEpoch ~/ 1000,
|
||||||
},
|
},
|
||||||
subject: user.userId,
|
subject: user.userId,
|
||||||
|
|
|
@ -8,6 +8,7 @@ abstract class MatrixUser with _$MatrixUser {
|
||||||
const factory MatrixUser({
|
const factory MatrixUser({
|
||||||
required String userId,
|
required String userId,
|
||||||
required String matrixToken,
|
required String matrixToken,
|
||||||
|
required String? nonce,
|
||||||
}) = _MatrixUser;
|
}) = _MatrixUser;
|
||||||
|
|
||||||
factory MatrixUser.fromJson(Map<String, dynamic> json) =>
|
factory MatrixUser.fromJson(Map<String, dynamic> json) =>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
// ignore_for_file: type=lint
|
// ignore_for_file: type=lint
|
||||||
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
|
// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
|
||||||
|
|
||||||
part of "matrix_user.dart";
|
part of 'matrix_user.dart';
|
||||||
|
|
||||||
// **************************************************************************
|
// **************************************************************************
|
||||||
// FreezedGenerator
|
// FreezedGenerator
|
||||||
|
@ -16,11 +16,11 @@ T _$identity<T>(T value) => value;
|
||||||
/// @nodoc
|
/// @nodoc
|
||||||
mixin _$MatrixUser {
|
mixin _$MatrixUser {
|
||||||
|
|
||||||
String get userId; String get matrixToken;
|
String get userId; String get matrixToken; String? get nonce;
|
||||||
/// Create a copy of MatrixUser
|
/// Create a copy of MatrixUser
|
||||||
/// with the given fields replaced by the non-null parameter values.
|
/// with the given fields replaced by the non-null parameter values.
|
||||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||||
@pragma("vm:prefer-inline")
|
@pragma('vm:prefer-inline')
|
||||||
$MatrixUserCopyWith<MatrixUser> get copyWith => _$MatrixUserCopyWithImpl<MatrixUser>(this as MatrixUser, _$identity);
|
$MatrixUserCopyWith<MatrixUser> get copyWith => _$MatrixUserCopyWithImpl<MatrixUser>(this as MatrixUser, _$identity);
|
||||||
|
|
||||||
/// Serializes this MatrixUser to a JSON map.
|
/// Serializes this MatrixUser to a JSON map.
|
||||||
|
@ -29,16 +29,16 @@ $MatrixUserCopyWith<MatrixUser> get copyWith => _$MatrixUserCopyWithImpl<MatrixU
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool operator ==(Object other) {
|
bool operator ==(Object other) {
|
||||||
return identical(this, other) || (other.runtimeType == runtimeType&&other is MatrixUser&&(identical(other.userId, userId) || other.userId == userId)&&(identical(other.matrixToken, matrixToken) || other.matrixToken == matrixToken));
|
return identical(this, other) || (other.runtimeType == runtimeType&&other is MatrixUser&&(identical(other.userId, userId) || other.userId == userId)&&(identical(other.matrixToken, matrixToken) || other.matrixToken == matrixToken)&&(identical(other.nonce, nonce) || other.nonce == nonce));
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||||
@override
|
@override
|
||||||
int get hashCode => Object.hash(runtimeType,userId,matrixToken);
|
int get hashCode => Object.hash(runtimeType,userId,matrixToken,nonce);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String toString() {
|
String toString() {
|
||||||
return "MatrixUser(userId: $userId, matrixToken: $matrixToken)";
|
return 'MatrixUser(userId: $userId, matrixToken: $matrixToken, nonce: $nonce)';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ abstract mixin class $MatrixUserCopyWith<$Res> {
|
||||||
factory $MatrixUserCopyWith(MatrixUser value, $Res Function(MatrixUser) _then) = _$MatrixUserCopyWithImpl;
|
factory $MatrixUserCopyWith(MatrixUser value, $Res Function(MatrixUser) _then) = _$MatrixUserCopyWithImpl;
|
||||||
@useResult
|
@useResult
|
||||||
$Res call({
|
$Res call({
|
||||||
String userId, String matrixToken
|
String userId, String matrixToken, String? nonce
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -66,11 +66,12 @@ class _$MatrixUserCopyWithImpl<$Res>
|
||||||
|
|
||||||
/// Create a copy of MatrixUser
|
/// Create a copy of MatrixUser
|
||||||
/// with the given fields replaced by the non-null parameter values.
|
/// with the given fields replaced by the non-null parameter values.
|
||||||
@pragma("vm:prefer-inline") @override $Res call({Object? userId = null,Object? matrixToken = null,}) {
|
@pragma('vm:prefer-inline') @override $Res call({Object? userId = null,Object? matrixToken = null,Object? nonce = freezed,}) {
|
||||||
return _then(_self.copyWith(
|
return _then(_self.copyWith(
|
||||||
userId: null == userId ? _self.userId : userId // ignore: cast_nullable_to_non_nullable
|
userId: null == userId ? _self.userId : userId // ignore: cast_nullable_to_non_nullable
|
||||||
as String,matrixToken: null == matrixToken ? _self.matrixToken : matrixToken // ignore: cast_nullable_to_non_nullable
|
as String,matrixToken: null == matrixToken ? _self.matrixToken : matrixToken // ignore: cast_nullable_to_non_nullable
|
||||||
as String,
|
as String,nonce: freezed == nonce ? _self.nonce : nonce // ignore: cast_nullable_to_non_nullable
|
||||||
|
as String?,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,16 +82,17 @@ as String,
|
||||||
@JsonSerializable()
|
@JsonSerializable()
|
||||||
|
|
||||||
class _MatrixUser implements MatrixUser {
|
class _MatrixUser implements MatrixUser {
|
||||||
const _MatrixUser({required this.userId, required this.matrixToken});
|
const _MatrixUser({required this.userId, required this.matrixToken, required this.nonce});
|
||||||
factory _MatrixUser.fromJson(Map<String, dynamic> json) => _$MatrixUserFromJson(json);
|
factory _MatrixUser.fromJson(Map<String, dynamic> json) => _$MatrixUserFromJson(json);
|
||||||
|
|
||||||
@override final String userId;
|
@override final String userId;
|
||||||
@override final String matrixToken;
|
@override final String matrixToken;
|
||||||
|
@override final String? nonce;
|
||||||
|
|
||||||
/// Create a copy of MatrixUser
|
/// Create a copy of MatrixUser
|
||||||
/// with the given fields replaced by the non-null parameter values.
|
/// with the given fields replaced by the non-null parameter values.
|
||||||
@override @JsonKey(includeFromJson: false, includeToJson: false)
|
@override @JsonKey(includeFromJson: false, includeToJson: false)
|
||||||
@pragma("vm:prefer-inline")
|
@pragma('vm:prefer-inline')
|
||||||
_$MatrixUserCopyWith<_MatrixUser> get copyWith => __$MatrixUserCopyWithImpl<_MatrixUser>(this, _$identity);
|
_$MatrixUserCopyWith<_MatrixUser> get copyWith => __$MatrixUserCopyWithImpl<_MatrixUser>(this, _$identity);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
@ -100,16 +102,16 @@ Map<String, dynamic> toJson() {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool operator ==(Object other) {
|
bool operator ==(Object other) {
|
||||||
return identical(this, other) || (other.runtimeType == runtimeType&&other is _MatrixUser&&(identical(other.userId, userId) || other.userId == userId)&&(identical(other.matrixToken, matrixToken) || other.matrixToken == matrixToken));
|
return identical(this, other) || (other.runtimeType == runtimeType&&other is _MatrixUser&&(identical(other.userId, userId) || other.userId == userId)&&(identical(other.matrixToken, matrixToken) || other.matrixToken == matrixToken)&&(identical(other.nonce, nonce) || other.nonce == nonce));
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonKey(includeFromJson: false, includeToJson: false)
|
@JsonKey(includeFromJson: false, includeToJson: false)
|
||||||
@override
|
@override
|
||||||
int get hashCode => Object.hash(runtimeType,userId,matrixToken);
|
int get hashCode => Object.hash(runtimeType,userId,matrixToken,nonce);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String toString() {
|
String toString() {
|
||||||
return "MatrixUser(userId: $userId, matrixToken: $matrixToken)";
|
return 'MatrixUser(userId: $userId, matrixToken: $matrixToken, nonce: $nonce)';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -120,7 +122,7 @@ abstract mixin class _$MatrixUserCopyWith<$Res> implements $MatrixUserCopyWith<$
|
||||||
factory _$MatrixUserCopyWith(_MatrixUser value, $Res Function(_MatrixUser) _then) = __$MatrixUserCopyWithImpl;
|
factory _$MatrixUserCopyWith(_MatrixUser value, $Res Function(_MatrixUser) _then) = __$MatrixUserCopyWithImpl;
|
||||||
@override @useResult
|
@override @useResult
|
||||||
$Res call({
|
$Res call({
|
||||||
String userId, String matrixToken
|
String userId, String matrixToken, String? nonce
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -137,11 +139,12 @@ class __$MatrixUserCopyWithImpl<$Res>
|
||||||
|
|
||||||
/// Create a copy of MatrixUser
|
/// Create a copy of MatrixUser
|
||||||
/// with the given fields replaced by the non-null parameter values.
|
/// with the given fields replaced by the non-null parameter values.
|
||||||
@override @pragma("vm:prefer-inline") $Res call({Object? userId = null,Object? matrixToken = null,}) {
|
@override @pragma('vm:prefer-inline') $Res call({Object? userId = null,Object? matrixToken = null,Object? nonce = freezed,}) {
|
||||||
return _then(_MatrixUser(
|
return _then(_MatrixUser(
|
||||||
userId: null == userId ? _self.userId : userId // ignore: cast_nullable_to_non_nullable
|
userId: null == userId ? _self.userId : userId // ignore: cast_nullable_to_non_nullable
|
||||||
as String,matrixToken: null == matrixToken ? _self.matrixToken : matrixToken // ignore: cast_nullable_to_non_nullable
|
as String,matrixToken: null == matrixToken ? _self.matrixToken : matrixToken // ignore: cast_nullable_to_non_nullable
|
||||||
as String,
|
as String,nonce: freezed == nonce ? _self.nonce : nonce // ignore: cast_nullable_to_non_nullable
|
||||||
|
as String?,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,18 +1,20 @@
|
||||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||||
|
|
||||||
part of "matrix_user.dart";
|
part of 'matrix_user.dart';
|
||||||
|
|
||||||
// **************************************************************************
|
// **************************************************************************
|
||||||
// JsonSerializableGenerator
|
// JsonSerializableGenerator
|
||||||
// **************************************************************************
|
// **************************************************************************
|
||||||
|
|
||||||
_MatrixUser _$MatrixUserFromJson(Map<String, dynamic> json) => _MatrixUser(
|
_MatrixUser _$MatrixUserFromJson(Map<String, dynamic> json) => _MatrixUser(
|
||||||
userId: json["userId"] as String,
|
userId: json['userId'] as String,
|
||||||
matrixToken: json["matrixToken"] as String,
|
matrixToken: json['matrixToken'] as String,
|
||||||
|
nonce: json['nonce'] as String?,
|
||||||
);
|
);
|
||||||
|
|
||||||
Map<String, dynamic> _$MatrixUserToJson(_MatrixUser instance) =>
|
Map<String, dynamic> _$MatrixUserToJson(_MatrixUser instance) =>
|
||||||
<String, dynamic>{
|
<String, dynamic>{
|
||||||
"userId": instance.userId,
|
'userId': instance.userId,
|
||||||
"matrixToken": instance.matrixToken,
|
'matrixToken': instance.matrixToken,
|
||||||
|
'nonce': instance.nonce,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue