Skip to content

Fix flutter desktop with package info plus #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 10, 2021
Merged

Fix flutter desktop with package info plus #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68c1102
fix string addition causing error
lohanidamodar Feb 10, 2021
4599d82
arranging dependency in alphabetical order
lohanidamodar Feb 10, 2021
aad91b4
for linux packageName is empty so using appName
lohanidamodar Feb 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/dart/pubspec.yaml.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ documentation: {{ spec.contactURL }}
environment:
sdk: '>=2.6.0 <3.0.0'
dependencies:
meta: ^1.1.8
dio: ^3.0.10
meta: ^1.1.8

dev_dependencies:
test:
14 changes: 2 additions & 12 deletions templates/flutter/lib/client.dart.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,8 @@ class Client {
final Directory cookieDir = await _getCookiePath();
cookieJar = new PersistCookieJar(dir:cookieDir.path);
this.http.interceptors.add(CookieManager(cookieJar));
if(Platform.isAndroid || Platform.isIOS) {
PackageInfo packageInfo = await PackageInfo.fromPlatform();
addHeader('Origin', 'appwrite-' + type + '://' + packageInfo.packageName);
} else if(Platform.isLinux) {
addHeader('Origin', 'appwrite-linux://');
} else if(Platform.isMacOS) {
addHeader('Origin', 'appwrite-macos://');
} else if(Platform.isWindows) {
addHeader('Origin', 'appwrite-windows://');
} else if(Platform.isFuchsia) {
addHeader('Origin', 'appwrite-fuchsia://');
}
PackageInfo packageInfo = await PackageInfo.fromPlatform();
addHeader('Origin', 'appwrite-$type://${packageInfo.packageName ?? packageInfo.appName}');
}else{
// if web set httpClientAdapter as BrowserHttpClientAdapter with withCredentials true to make cookies work
this.http.options.extra['withCredentials'] = true;
Expand Down
12 changes: 6 additions & 6 deletions templates/flutter/pubspec.yaml.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ documentation: {{ spec.contactURL }}
environment:
sdk: '>=2.6.0 <3.0.0'
dependencies:
meta: ^1.1.8
path_provider: ^1.6.14
package_info_plus: ^0.6.3
dio: ^3.0.10
flutter:
sdk: flutter
cookie_jar: ^1.0.1
dio: ^3.0.10
dio_cookie_manager: ^1.0.0
flutter_web_auth: ^0.2.4
meta: ^1.1.8
package_info_plus: ^0.6.3
path_provider: ^1.6.14
universal_html: ^1.2.3
flutter:
sdk: flutter

dev_dependencies:
flutter_test:
Expand Down