Skip to content

Commit 1a2449c

Browse files
committed
fix go tests and revert dart
1 parent c24136c commit 1a2449c

File tree

3 files changed

+2
-58
lines changed

3 files changed

+2
-58
lines changed

templates/dart/lib/src/client_io.dart.twig

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import 'dart:io';
22
import 'dart:math';
33
import 'package:http/http.dart' as http;
4-
import 'package:package_info_plus/package_info_plus.dart';
5-
import 'package:device_info_plus/device_info_plus.dart';
64
import 'package:http/io_client.dart';
75
import 'client_mixin.dart';
86
import 'client_base.dart';
@@ -90,59 +88,6 @@ class ClientIO extends ClientBase with ClientMixin {
9088
_headers![key] = value;
9189
return this;
9290
}
93-
94-
Future init() async {
95-
if (_initProgress) return;
96-
_initProgress = true;
97-
final Directory cookieDir = await _getCookiePath();
98-
_cookieJar = PersistCookieJar(storage: FileStorage(cookieDir.path));
99-
_interceptors.add(CookieManager(_cookieJar));
100-
101-
var device = '';
102-
try {
103-
PackageInfo packageInfo = await PackageInfo.fromPlatform();
104-
addHeader(
105-
'Origin',
106-
'{{spec.title | caseLower}}-${Platform.operatingSystem}://${packageInfo.packageName}',
107-
);
108-
109-
//creating custom user agent
110-
DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
111-
if (Platform.isAndroid) {
112-
final andinfo = await deviceInfoPlugin.androidInfo;
113-
device =
114-
'(Linux; U; Android ${andinfo.version.release}; ${andinfo.brand} ${andinfo.model})';
115-
}
116-
if (Platform.isIOS) {
117-
final iosinfo = await deviceInfoPlugin.iosInfo;
118-
device = '${iosinfo.utsname.machine} iOS/${iosinfo.systemVersion}';
119-
}
120-
if (Platform.isLinux) {
121-
final lininfo = await deviceInfoPlugin.linuxInfo;
122-
device = '(Linux; U; ${lininfo.id} ${lininfo.version})';
123-
}
124-
if (Platform.isWindows) {
125-
final wininfo = await deviceInfoPlugin.windowsInfo;
126-
device =
127-
'(Windows NT; ${wininfo.computerName})'; //can't seem to get much info here
128-
}
129-
if (Platform.isMacOS) {
130-
final macinfo = await deviceInfoPlugin.macOsInfo;
131-
device = '(Macintosh; ${macinfo.model})';
132-
}
133-
addHeader(
134-
'user-agent',
135-
'${packageInfo.packageName}/${packageInfo.version} $device',
136-
);
137-
} catch (e) {
138-
debugPrint('Error getting device info: $e');
139-
device = Platform.operatingSystem;
140-
addHeader('user-agent', '$device');
141-
}
142-
143-
_initialized = true;
144-
_initProgress = false;
145-
}
14691

14792
@override
14893
Future<Response> chunkedUpload({

templates/dart/pubspec.yaml.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ environment:
99
sdk: '>=2.17.0 <3.0.0'
1010
dependencies:
1111
http: ^0.13.5
12-
device_info_plus: ^8.1.0
13-
package_info_plus: ^3.0.3
12+
1413
1514
dev_dependencies:
1615
lints: ^2.0.1

templates/go/client.go.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func NewClient() Client {
6666
headers := map[string]string{
6767
{% for key,header in spec.global.defaultHeaders %}
6868
"{{key}}" : "{{header}}",
69-
"user-agent" : "{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/ (${runtime.GOOS}; ${runtime.GOARCH})",
69+
"user-agent" : "{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/ ({{runtime.GOOS}} ; {{runtime.GOARCH}})",
7070
"x-sdk-name": "{{ sdk.name }}",
7171
"x-sdk-platform": "{{ sdk.platform }}",
7272
"x-sdk-language": "{{ language.name | caseLower }}",

0 commit comments

Comments
 (0)