Skip to content
Draft
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: 6 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="@string/app_deep_link" android:host="mobilepay_purchase" />
</intent-filter>
<intent-filter android:autoVerify="false">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="@string/app_deep_link" android:host="auth" />
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ class AccountRemoteDataSource {
);
}

Future<Either<Failure, Unit>> sendMagicLink(
String email,
) {
return executor.executeAndDiscard(() =>
apiV2.apiV2AccountLoginPost(body: UserLoginRequest(email: email, loginType: 'Shifty')));
}

Future<Either<Failure, User>> getUser() {
return executor.execute(apiV2.apiV2AccountGet).map(UserModel.fromResponse);
}
Expand Down
6 changes: 2 additions & 4 deletions lib/features/login/domain/usecases/login_user.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:coffeecard/core/errors/failures.dart';
import 'package:coffeecard/features/authentication/domain/entities/authenticated_user.dart';
import 'package:coffeecard/features/login/data/datasources/account_remote_data_source.dart';
import 'package:fpdart/fpdart.dart';

Expand All @@ -8,10 +7,9 @@ class LoginUser {

LoginUser({required this.remoteDataSource});

Future<Either<Failure, AuthenticatedUser>> call({
Future<Either<Failure, Unit>> call({
required String email,
required String encodedPasscode,
}) {
return remoteDataSource.login(email, encodedPasscode);
return remoteDataSource.sendMagicLink(email);
}
}
20 changes: 5 additions & 15 deletions lib/features/login/presentation/cubit/login_cubit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
part 'login_state.dart';

class LoginCubit extends Cubit<LoginState> {
final String email;
final AuthenticationCubit authenticationCubit;
final LoginUser loginUser;
final ResendEmail resendEmail;

LoginCubit({
required this.email,
required this.authenticationCubit,
required this.loginUser,
required this.resendEmail,
Expand All @@ -29,7 +27,7 @@ class LoginCubit extends Cubit<LoginState> {

emit(LoginTypingPasscode(newPasscode));

if (newPasscode.length == 4) _loginRequested();
// if (newPasscode.length == 4) _loginRequested();
}

Future<void> resendVerificationEmail(String email) async {
Expand All @@ -45,15 +43,11 @@ class LoginCubit extends Cubit<LoginState> {
emit(const LoginTypingPasscode(''));
}

Future<void> _loginRequested() async {
final passcode = (state as LoginTypingPasscode).passcode;
final encodedPasscode = encodePasscode(passcode);

Future<void> loginRequested(String email) async {
emit(const LoginLoading());

final either = await loginUser(
email: email,
encodedPasscode: encodedPasscode,
email: email
);

either.fold(
Expand All @@ -65,12 +59,8 @@ class LoginCubit extends Cubit<LoginState> {

emit(LoginError(error.reason));
},
(user) {
authenticationCubit.authenticated(
user.email,
encodedPasscode,
user.token,
);
(_) {
// snackbar "check mail"
},
);
}
Expand Down
30 changes: 0 additions & 30 deletions lib/features/login/presentation/pages/forgot_passcode_page.dart

This file was deleted.

16 changes: 11 additions & 5 deletions lib/features/login/presentation/pages/login_page_email.dart
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import 'package:coffeecard/core/strings.dart';
import 'package:coffeecard/core/validator/email_is_valid.dart';
import 'package:coffeecard/core/widgets/fast_slide_transition.dart';
import 'package:coffeecard/features/login/presentation/cubit/login_cubit.dart';
import 'package:coffeecard/features/login/presentation/pages/login_page_base.dart';
import 'package:coffeecard/features/login/presentation/pages/login_page_passcode.dart';
import 'package:coffeecard/features/login/presentation/widgets/login_cta.dart';
import 'package:coffeecard/features/login/presentation/widgets/login_email_text_field.dart';
import 'package:coffeecard/features/register/presentation/pages/register_flow.dart';
import 'package:coffeecard/service_locator.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';

class LoginPageEmail extends StatefulWidget {
const LoginPageEmail({this.transitionDuration = Duration.zero});
Expand Down Expand Up @@ -53,8 +55,7 @@ class _LoginPageEmailState extends State<LoginPageEmail>
} else if (!emailIsValid(email)) {
error = Strings.loginInvalidEmailError;
} else {
final _ =
Navigator.push(context, LoginPagePasscode.routeWith(email: email));
final _ = context.read<LoginCubit>().loginRequested(email);
}
}

Expand Down Expand Up @@ -84,7 +85,12 @@ class _LoginPageEmailState extends State<LoginPageEmail>
Widget build(BuildContext context) {
final _ = _controller.forward();

return FadeTransition(
return BlocProvider(
create: (_) => LoginCubit(
loginUser: sl(),
resendEmail: sl(),
authenticationCubit: sl(),
), child: FadeTransition(
opacity: _animation,
child: LoginPageBase(
resizeToAvoidBottomInset: false,
Expand All @@ -100,6 +106,6 @@ class _LoginPageEmailState extends State<LoginPageEmail>
LoginCTA(text: Strings.loginCreateAccount, onPressed: _register),
],
),
);
));
}
}
100 changes: 0 additions & 100 deletions lib/features/login/presentation/pages/login_page_passcode.dart

This file was deleted.

117 changes: 0 additions & 117 deletions lib/features/login/presentation/widgets/numpad/numpad.dart

This file was deleted.

Loading
Loading