Skip to content
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.

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

Fix SignIn method #489

Merged
merged 8 commits into from
Jan 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions lib/domain/home/home_page.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:pilll/analytics.dart';
import 'package:pilll/entity/diary.dart';
import 'package:pilll/service/auth.dart';
import 'package:pilll/domain/calendar/calendar_page.dart';
import 'package:pilll/domain/menstruation/menstruation_page.dart';
import 'package:pilll/domain/record/record_page.dart';
Expand Down Expand Up @@ -43,9 +42,8 @@ class _HomePageState extends State<HomePage>
vsync: this,
initialIndex: _selectedIndex);
_tabController.addListener(_handleTabSelection);
signIn().then((user) {
requestNotificationPermissions();
});

requestNotificationPermissions();
}

@override
Expand Down
2 changes: 1 addition & 1 deletion lib/domain/root/root.dart
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class RootState extends State<Root> {
screenType = ScreenType.forceUpdate;
});
} else {
signIn().then((firebaseUser) {
cachedUserOrSignInAnonymously().then((firebaseUser) {
unawaited(
FirebaseCrashlytics.instance.setUserIdentifier(firebaseUser.uid));
unawaited(firebaseAnalytics.setUserId(id: firebaseUser.uid));
Expand Down
8 changes: 6 additions & 2 deletions lib/global_method_channel.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter_app_badger/flutter_app_badger.dart';
import 'package:pilll/analytics.dart';
import 'package:pilll/database/batch.dart';
Expand All @@ -9,7 +10,6 @@ import 'package:pilll/service/pill_sheet_modified_history.dart';
import 'package:pilll/util/datetime/day.dart';
import 'package:flutter/services.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:pilll/service/auth.dart';

final _channel = MethodChannel("method.channel.MizukiOhashi.Pilll");
definedChannel() {
Expand All @@ -27,7 +27,11 @@ definedChannel() {
}

Future<void> recordPill() async {
final firebaseUser = await signIn();
final firebaseUser = FirebaseAuth.instance.currentUser;
if (firebaseUser == null) {
return;
}

final database = DatabaseConnection(firebaseUser.uid);
final pillSheetService = PillSheetService(database);
final pillSheetModifiedHistoryService =
Expand Down
9 changes: 4 additions & 5 deletions lib/inquiry/inquiry.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:firebase_auth/firebase_auth.dart';
import 'package:pilll/entity/pill_sheet_group.dart';
import 'package:pilll/service/auth.dart';
import 'package:pilll/database/database.dart';
import 'package:pilll/entity/menstruation.dart';
import 'package:pilll/entity/setting.dart';
Expand All @@ -20,12 +20,11 @@ inquiry() {
}

Future<String> debugInfo(String separator) async {
String userID;
try {
userID = (await signIn()).uid;
} catch (error) {
final userID = FirebaseAuth.instance.currentUser?.uid;
if (userID == null) {
return Future.value("DEBUG INFO user is not found");
}

DatabaseConnection databaseConnection = DatabaseConnection(userID);

PillSheetGroup? pillSheetGroup;
Expand Down
2 changes: 1 addition & 1 deletion lib/service/auth.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Stream<User?> _userAuthStateChanges() {

// Obtain the latest users form FirebaseAuth.
// If it is not exists, return result of signin anonymous;
Future<User> signIn() async {
Future<User> cachedUserOrSignInAnonymously() async {
analytics.logEvent(name: "call_sign_in");
final currentUser = FirebaseAuth.instance.currentUser;

Expand Down
20 changes: 12 additions & 8 deletions lib/service/push_notification.dart
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
import 'dart:async';
import 'dart:io';

import 'package:firebase_auth/firebase_auth.dart';
import 'package:pilll/analytics.dart';
import 'package:pilll/service/auth.dart';
import 'package:pilll/database/database.dart';
import 'package:pilll/service/user.dart';
import 'package:firebase_messaging/firebase_messaging.dart';

Future<void> requestNotificationPermissions() async {
final firebaseUser = FirebaseAuth.instance.currentUser;
if (firebaseUser == null) {
assert(false);
return;
}

await FirebaseMessaging.instance.requestPermission();
if (Platform.isIOS) {
await FirebaseMessaging.instance
.setForegroundNotificationPresentationOptions(
alert: true, badge: true, sound: true);
}
callRegisterRemoteNotification();
// ignore: unawaited_futures
signIn().then((firebaseUser) {
final userService = UserService(DatabaseConnection(firebaseUser.uid));
userService.fetch().then((_) async {
final token = await FirebaseMessaging.instance.getToken();
await userService.registerRemoteNotificationToken(token);
});

final userService = UserService(DatabaseConnection(firebaseUser.uid));
userService.fetch().then((_) async {
final token = await FirebaseMessaging.instance.getToken();
await userService.registerRemoteNotificationToken(token);
});
return Future.value();
}
Expand Down