Skip to content

[gis_web] Migrate to package:web. #5581

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
auto-submit merged 22 commits into from
Dec 7, 2023
Merged

[gis_web] Migrate to package:web. #5581

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8585b59
[gis_web] Remove bespoke dom.dart files
ditman Dec 5, 2023
cf6438c
Update package deps.
ditman Dec 5, 2023
4ebef20
Add a file with tweaks to package web.
ditman Dec 5, 2023
95c665c
Migrate js_loader and its related js-interop.
ditman Dec 5, 2023
85d9ce2
Migrate accounts.id to package:web.
ditman Dec 5, 2023
d2c16e9
Migrate oauth2 lib.
ditman Dec 5, 2023
2e10ba1
Update example apps
ditman Dec 5, 2023
5c3fb76
Migrate dart test tests.
ditman Dec 5, 2023
f9446db
Migrate integration tests to new APIs
ditman Dec 6, 2023
f6969c4
Update changelog and pubspec. v0.3.0.
ditman Dec 6, 2023
a1feea0
Specify deps identically to other package:web migrations.
ditman Dec 6, 2023
7c2059e
CHANGELOG style
ditman Dec 6, 2023
949ba0c
Fix example app dep on package:web.
ditman Dec 6, 2023
6aaf828
Don't lie on some comments.
ditman Dec 6, 2023
4037074
Add ignores for downgraded analysis.
ditman Dec 6, 2023
5a66e9d
Remove test client ids.
ditman Dec 6, 2023
a2e3974
Exclude from all_packages_app, until google_sign_in_web takes the lat…
ditman Dec 6, 2023
f88491f
Make not optional, and assert it is not empty.
ditman Dec 7, 2023
0c1e1c3
Make scope required again, otherwise the SDK crashes at init.
ditman Dec 7, 2023
046662b
Address some more PR comments.
ditman Dec 7, 2023
329a098
Unify deps. Use http compatible with wasm.
ditman Dec 7, 2023
114601a
Specify minimum flutter version.
ditman Dec 7, 2023
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
Prev Previous commit
Next Next commit
Update example apps
  • Loading branch information
@ditman
ditman committed Dec 7, 2023
commit 2e10ba13ffcc627601514702110bd8427ec6b75a
8 changes: 4 additions & 4 deletions packages/google_identity_services_web/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import 'package:google_identity_services_web/id.dart';
// #docregion use-loader
import 'package:google_identity_services_web/loader.dart' as gis;
// #enddocregion use-loader
import 'package:js/js.dart' show allowInterop;

import 'src/jwt.dart' as jwt;

Expand All @@ -20,13 +19,14 @@ void main() async {
id.setLogLevel('debug');

final IdConfiguration config = IdConfiguration(
client_id: 'your-client_id.apps.googleusercontent.com',
callback: allowInterop(onCredentialResponse),
client_id:
'451137223537-t8qp8tl992tgqj5focnc6mh8cp2psn8g.apps.googleusercontent.com',
callback: onCredentialResponse,
use_fedcm_for_prompt: true,
);

id.initialize(config);
id.prompt(allowInterop(onPromptMoment));
id.prompt(onPromptMoment);
// #docregion use-loader
}
// #enddocregion use-loader
Expand Down
22 changes: 10 additions & 12 deletions packages/google_identity_services_web/example/lib/main_oauth.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import 'package:google_identity_services_web/id.dart';
import 'package:google_identity_services_web/loader.dart' as gis;
import 'package:google_identity_services_web/oauth2.dart';
import 'package:http/http.dart' as http;
import 'package:js/js.dart' show allowInterop;
import 'package:js/js_util.dart' show getProperty;

/// People API to return my profile info...
const String MY_PROFILE =
Expand All @@ -38,15 +36,16 @@ void main() async {
id.setLogLevel('debug');

final TokenClientConfig config = TokenClientConfig(
client_id: 'your-client_id.apps.googleusercontent.com',
scope: scopes.join(' '),
callback: allowInterop(onTokenResponse),
error_callback: allowInterop(onError),
client_id:
'451137223537-t8qp8tl992tgqj5focnc6mh8cp2psn8g.apps.googleusercontent.com',
scope: scopes,
callback: onTokenResponse,
error_callback: onError,
);

final OverridableTokenClientConfig overridableCfg =
OverridableTokenClientConfig(
scope: (scopes + myConnectionsScopes).join(' '),
scope: scopes + myConnectionsScopes,
);

final TokenClient client = oauth2.initTokenClient(config);
Expand All @@ -59,8 +58,8 @@ void main() async {
///
/// We cannot use the proper type for `error` here yet, because of:
/// https://github.com/dart-lang/sdk/issues/50899
Future<void> onError(Object? error) async {
print('Error! ${getProperty(error!, "type")}');
Future<void> onError(GoogleIdentityServicesError? error) async {
print('Error! ${error?.type} (${error?.message})');
}

/// Handles the returned (auth) token response.
Expand Down Expand Up @@ -88,12 +87,11 @@ Future<void> onTokenResponse(TokenResponse token) async {
print(contacts);

print('Revoking token...');
oauth2.revoke(token.access_token,
allowInterop((TokenRevocationResponse response) {
oauth2.revoke(token.access_token!, (TokenRevocationResponse response) {
print(response.successful);
print(response.error);
print(response.error_description);
}));
});
}

/// Gets from [url] with an authorization header defined by [token].
Expand Down
1 change: 0 additions & 1 deletion packages/google_identity_services_web/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ dependencies:
google_identity_services_web:
path: ../
http: ">=0.13.0 <2.0.0"
js: ^0.6.4

dev_dependencies:
build_runner: ^2.1.10 # To extract README excerpts only.
Expand Down