Skip to content

Commit 5d2bb39

Browse files
authored
Merge pull request #44 from GetStream/rename-client
2 parents 7df31fb + 168268f commit 5d2bb39

9 files changed

+34
-32
lines changed

example/lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ void main() {
99
WidgetsFlutterBinding.ensureInitialized();
1010
final _key = String.fromEnvironment('key');
1111
final _secret = String.fromEnvironment('secret');
12-
final client = StreamClient.connect(_key, secret: _secret);
12+
final client = StreamFeedClient.connect(_key, secret: _secret);
1313
runApp(
1414
MyApp(
1515
client: client,
@@ -19,7 +19,7 @@ void main() {
1919

2020
class MyApp extends StatelessWidget {
2121
const MyApp({Key? key, required this.client}) : super(key: key);
22-
final StreamClient client;
22+
final StreamFeedClient client;
2323

2424
@override
2525
Widget build(BuildContext context) {

example/lib/profile_screen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ProfileScreen extends StatefulWidget {
1717
}
1818

1919
class _ProfileScreenState extends State<ProfileScreen> {
20-
late StreamClient _client;
20+
late StreamFeedClient _client;
2121
bool _isLoading = true;
2222

2323
List<Activity> activities = <Activity>[];

example/lib/timeline_screen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class TimelineScreen extends StatefulWidget {
1414
}
1515

1616
class _TimelineScreenState extends State<TimelineScreen> {
17-
late StreamClient _client;
17+
late StreamFeedClient _client;
1818
bool _isLoading = true;
1919
List<Activity> activities = <Activity>[];
2020

example/lib/utils/utils.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class ClientProvider extends InheritedWidget {
88
required Widget child,
99
}) : super(key: key, child: child);
1010

11-
final StreamClient client;
11+
final StreamFeedClient client;
1212

1313
static ClientProvider? of(BuildContext context) {
1414
return context.dependOnInheritedWidgetOfExactType<ClientProvider>();
@@ -21,5 +21,5 @@ class ClientProvider extends InheritedWidget {
2121
}
2222

2323
extension ProviderX on BuildContext {
24-
StreamClient get client => ClientProvider.of(this)!.client;
24+
StreamFeedClient get client => ClientProvider.of(this)!.client;
2525
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export 'analytics_client.dart';
2-
export 'stream_client.dart';
2+
export 'stream_feed_client.dart';

packages/stream_feed/lib/src/client/stream_client.dart renamed to packages/stream_feed/lib/src/client/stream_feed_client.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ import 'package:stream_feed/src/core/index.dart';
1212

1313
import 'package:stream_feed/src/client/reactions_client.dart';
1414
import 'package:stream_feed/src/client/user_client.dart';
15-
import 'package:stream_feed/src/client/stream_client_impl.dart';
15+
import 'package:stream_feed/src/client/stream_feed_client_impl.dart';
1616

17-
/// Different sides on which you can run this [StreamClient] on
17+
/// Different sides on which you can run this [StreamFeedClient] on
1818
enum Runner {
19-
/// Marks the [StreamClient] that it is currently running on server-side
19+
/// Marks the [StreamFeedClient] that it is currently running on server-side
2020
server,
2121

22-
/// Marks the [StreamClient] that it is currently running on client-side
22+
/// Marks the [StreamFeedClient] that it is currently running on client-side
2323
client,
2424
}
2525

2626
/// The client class that manages API calls and authentication
2727
/// To instantiate the client you need an API key and secret.
2828
/// You can find the key and secret on the dashboard.
29-
abstract class StreamClient {
29+
abstract class StreamFeedClient {
3030
/// If you want to use the API client directly on your web/mobile app
3131
/// you need to generate a user token server-side and pass it.
3232
///
3333
///
34-
/// - Instantiate a new client (server side) with [StreamClient.connect]
34+
/// - Instantiate a new client (server side) with [StreamFeedClient.connect]
3535
/// using your api [secret] parameter and [apiKey]
3636
/// ```dart
3737
/// var client = connect('YOUR_API_KEY',secret: 'API_KEY_SECRET');
@@ -41,20 +41,20 @@ abstract class StreamClient {
4141
/// var userToken = client.frontendToken('the-user-id');
4242
/// ```
4343
/// - if you are using the SDK client side, get a userToken in your dashboard
44-
/// and pass it to [StreamClient.connect] using the [token] parameter
44+
/// and pass it to [StreamFeedClient.connect] using the [token] parameter
4545
/// and [apiKey]
4646
/// ```dart
4747
/// var client = connect('YOUR_API_KEY',token: Token('userToken'));
4848
/// ```
49-
factory StreamClient.connect(
49+
factory StreamFeedClient.connect(
5050
String apiKey, {
5151
Token? token,
5252
String? secret,
5353
String? appId,
5454
StreamHttpClientOptions? options,
5555
Runner runner = Runner.client,
5656
}) =>
57-
StreamClientImpl(
57+
StreamFeedClientImpl(
5858
apiKey,
5959
userToken: token,
6060
secret: secret,

packages/stream_feed/lib/src/client/stream_client_impl.dart renamed to packages/stream_feed/lib/src/client/stream_feed_client_impl.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import 'package:stream_feed/src/core/index.dart';
1818
import 'package:stream_feed/src/core/models/feed_id.dart';
1919

2020
import 'package:stream_feed/src/client/user_client.dart';
21-
import 'package:stream_feed/src/client/stream_client.dart';
21+
import 'package:stream_feed/src/client/stream_feed_client.dart';
2222
import 'package:stream_feed/src/core/util/extension.dart';
2323
import 'package:stream_feed/src/core/util/token_helper.dart';
2424
import 'package:logging/logging.dart';
@@ -34,9 +34,9 @@ final _levelEmojiMapper = {
3434
};
3535

3636
// ignore: public_member_api_docs
37-
class StreamClientImpl implements StreamClient {
38-
/// [StreamClientImpl] constructor
39-
StreamClientImpl(
37+
class StreamFeedClientImpl implements StreamFeedClient {
38+
/// [StreamFeedClientImpl] constructor
39+
StreamFeedClientImpl(
4040
this.apiKey, {
4141
this.secret,
4242
this.userToken,

packages/stream_feed/test/faye_client_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:io';
22

3-
import 'package:stream_feed/src/client/stream_client.dart';
4-
import 'package:stream_feed/src/client/stream_client_impl.dart';
3+
import 'package:stream_feed/src/client/stream_feed_client.dart';
4+
import 'package:stream_feed/src/client/stream_feed_client_impl.dart';
55
import 'package:stream_feed/src/core/models/feed_id.dart';
66
import 'package:stream_feed/src/core/models/realtime_message.dart';
77
import 'package:stream_feed/stream_feed.dart';
@@ -14,7 +14,7 @@ void main() async {
1414
final appId = env['appId'];
1515
final apiKey = env['apiKey'];
1616

17-
final client = StreamClient.connect(
17+
final client = StreamFeedClient.connect(
1818
apiKey!,
1919
secret: secret,
2020
appId: appId,

packages/stream_feed/test/stream_client_test.dart renamed to packages/stream_feed/test/stream_feed_client_test.dart

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:mocktail/mocktail.dart';
22
import 'package:stream_feed/src/core/util/token_helper.dart';
33
import 'package:stream_feed/stream_feed.dart';
44
import 'package:test/test.dart';
5-
import 'package:stream_feed/src/client/stream_client_impl.dart';
5+
import 'package:stream_feed/src/client/stream_feed_client_impl.dart';
66

77
import 'mock.dart';
88
import 'utils.dart';
@@ -12,7 +12,7 @@ void main() {
1212
group('throw', () {
1313
test('throws an AssertionError when no secret or token provided', () {
1414
expect(
15-
() => StreamClient.connect('apiKey'),
15+
() => StreamFeedClient.connect('apiKey'),
1616
throwsA(
1717
predicate<AssertionError>((e) =>
1818
e.message == 'At least a secret or userToken must be provided'),
@@ -25,7 +25,7 @@ void main() {
2525
'while running on client-side',
2626
() {
2727
expect(
28-
() => StreamClient.connect('apiKey', secret: 'secret'),
28+
() => StreamFeedClient.connect('apiKey', secret: 'secret'),
2929
throwsA(
3030
predicate<AssertionError>(
3131
(e) =>
@@ -42,7 +42,7 @@ void main() {
4242
'while running on server-side',
4343
() {
4444
expect(
45-
() => StreamClient.connect(
45+
() => StreamFeedClient.connect(
4646
'apiKey',
4747
token: TokenHelper.buildFrontendToken('secret', 'userId'),
4848
runner: Runner.server,
@@ -63,7 +63,7 @@ void main() {
6363
'while running on client-side',
6464
() {
6565
expect(
66-
() => StreamClient.connect(
66+
() => StreamFeedClient.connect(
6767
'apiKey',
6868
secret: 'secret',
6969
token: TokenHelper.buildFrontendToken('secret', 'userId'),
@@ -82,11 +82,12 @@ void main() {
8282
);
8383

8484
test("don't throw if secret provided while running on server-side", () {
85-
StreamClient.connect('apiKey', secret: 'secret', runner: Runner.server);
85+
StreamFeedClient.connect('apiKey',
86+
secret: 'secret', runner: Runner.server);
8687
});
8788

8889
test("don't throw if token provided while running on client-side", () {
89-
StreamClient.connect(
90+
StreamFeedClient.connect(
9091
'apiKey',
9192
token: TokenHelper.buildFrontendToken('secret', 'userId'),
9293
);
@@ -96,7 +97,7 @@ void main() {
9697
const secret = 'secret';
9798
const userId = 'userId';
9899
final client =
99-
StreamClientImpl('apiKey', secret: secret, runner: Runner.server);
100+
StreamFeedClientImpl('apiKey', secret: secret, runner: Runner.server);
100101
expect(client.collections, isNotNull);
101102
expect(client.batch, isNotNull);
102103
expect(client.aggregatedFeed('slug', 'userId'), isNotNull);
@@ -113,7 +114,8 @@ void main() {
113114
final mockApi = MockAPI();
114115
when(() => mockApi.users).thenReturn(MockUserAPI());
115116
final token = TokenHelper.buildFrontendToken('secret', 'userId');
116-
final client = StreamClientImpl('apiKey', userToken: token, api: mockApi);
117+
final client =
118+
StreamFeedClientImpl('apiKey', userToken: token, api: mockApi);
117119

118120
const targetUrl = 'targetUrl';
119121

0 commit comments

Comments
 (0)