[READ ONLY MIRROR] Open Source TikTok alternative built on AT Protocol
github.com/sprksocial/client
flutter
atproto
video
dart
fix(auth): oauth client patch
overrides waiting for atproto.dart PR #2277
+32
-9
+6
lib/src/core/auth/data/models/account.dart
+6
lib/src/core/auth/data/models/account.dart
···
7
7
required this.refreshToken,
8
8
required this.publicKey,
9
9
required this.privateKey,
10
+
this.clientId,
10
11
this.dpopNonce,
11
12
this.expiresAt,
12
13
this.did,
···
21
22
refreshToken: json['refreshToken'] as String,
22
23
publicKey: json['publicKey'] as String,
23
24
privateKey: json['privateKey'] as String,
25
+
clientId: json['clientId'] as String?,
24
26
dpopNonce: json['dpopNonce'] as String?,
25
27
expiresAt: json['expiresAt'] as String?,
26
28
did: json['did'] as String?,
···
38
40
final String refreshToken;
39
41
final String publicKey;
40
42
final String privateKey;
43
+
final String? clientId;
41
44
final String? dpopNonce;
42
45
final String? expiresAt;
43
46
final String? did;
···
51
54
'refreshToken': refreshToken,
52
55
'publicKey': publicKey,
53
56
'privateKey': privateKey,
57
+
'clientId': clientId,
54
58
'dpopNonce': dpopNonce,
55
59
'expiresAt': expiresAt,
56
60
'did': did,
···
67
71
String? refreshToken,
68
72
String? publicKey,
69
73
String? privateKey,
74
+
String? clientId,
70
75
String? dpopNonce,
71
76
String? expiresAt,
72
77
String? did,
···
79
84
refreshToken: refreshToken ?? this.refreshToken,
80
85
publicKey: publicKey ?? this.publicKey,
81
86
privateKey: privateKey ?? this.privateKey,
87
+
clientId: clientId ?? this.clientId,
82
88
dpopNonce: dpopNonce ?? this.dpopNonce,
83
89
expiresAt: expiresAt ?? this.expiresAt,
84
90
did: did ?? this.did,
+2
lib/src/core/auth/data/repositories/auth_repository_impl.dart
+2
lib/src/core/auth/data/repositories/auth_repository_impl.dart
···
132
132
_oauthSession = restoreOAuthSession(
133
133
accessToken: account.accessToken,
134
134
refreshToken: account.refreshToken,
135
+
clientId: account.clientId ?? _clientMetadataUrl,
135
136
dPoPNonce: account.dpopNonce,
136
137
publicKey: account.publicKey,
137
138
privateKey: account.privateKey,
···
191
192
refreshToken: _oauthSession!.refreshToken,
192
193
publicKey: _oauthSession!.$publicKey,
193
194
privateKey: _oauthSession!.$privateKey,
195
+
clientId: _oauthSession!.$clientId ?? _clientMetadataUrl,
194
196
dpopNonce: _oauthSession!.$dPoPNonce,
195
197
expiresAt: _oauthSession!.expiresAt.toIso8601String(),
196
198
did: _did,
+11
-9
pubspec.lock
+11
-9
pubspec.lock
···
108
108
atproto_core:
109
109
dependency: "direct main"
110
110
description:
111
-
name: atproto_core
112
-
sha256: "76b8c6237cf0c446c2f056cd76723eb5d7993ecaf7f7cc417b1b6bf26d8f24ce"
113
-
url: "https://pub.dev"
114
-
source: hosted
111
+
path: "packages/atproto_core"
112
+
ref: oauth-client-id
113
+
resolved-ref: ae0e15b559ef6dec220ee87eedeaa29618fc543f
114
+
url: "https://github.com/knotbin/atproto.dart.git"
115
+
source: git
115
116
version: "1.2.0"
116
117
atproto_oauth:
117
-
dependency: transitive
118
+
dependency: "direct overridden"
118
119
description:
119
-
name: atproto_oauth
120
-
sha256: "42a3a98dae11eb8c2a8a83051ebda9d0a711aec998c280c4f94a1a7127ba0aed"
121
-
url: "https://pub.dev"
122
-
source: hosted
120
+
path: "packages/atproto_oauth"
121
+
ref: oauth-client-id
122
+
resolved-ref: ae0e15b559ef6dec220ee87eedeaa29618fc543f
123
+
url: "https://github.com/knotbin/atproto.dart.git"
124
+
source: git
123
125
version: "0.2.0"
124
126
audio_waveforms:
125
127
dependency: "direct main"
+13
pubspec.yaml
+13
pubspec.yaml
···
80
80
json_serializable: ^6.11.2
81
81
riverpod_generator: ^4.0.3
82
82
83
+
# Temporary overrides, waiting for https://github.com/myConsciousness/atproto.dart/pull/2277 to be merged
84
+
dependency_overrides:
85
+
atproto_core:
86
+
git:
87
+
url: https://github.com/knotbin/atproto.dart.git
88
+
path: packages/atproto_core
89
+
ref: oauth-client-id
90
+
atproto_oauth:
91
+
git:
92
+
url: https://github.com/knotbin/atproto.dart.git
93
+
path: packages/atproto_oauth
94
+
ref: oauth-client-id
95
+
83
96
flutter_launcher_icons:
84
97
android: true
85
98
ios: true