JWT expiration error

dscnitrourkela · Apr 25, 2020 · df01545 · df01545
1 parent b5cdc73
commit df01545
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/gogrocy/lib/core/services/api.dart b/gogrocy/lib/core/services/api.dart
@@ -48,6 +48,7 @@ class Apis {
       "state": "Odisha",
       "country": "India",
     };
+    print(body);
     http.Response result = await http.post(addAddress,
         headers: {HttpHeaders.authorizationHeader: "Bearer $jwt"}, body: body);
     print(result.body);
@@ -171,8 +172,9 @@ class Apis {
   Future<bool> verifyUserApi(String jwt) async {
     http.Response result = await http.post(verifyUser,
         headers: {HttpHeaders.authorizationHeader: "Bearer $jwt"});
-    if ((json.decode(result.body))["success"])
-      return true;
+    if ((json.decode(result.body))["success"]){
+      print("VERIFIED USER");
+      return true;}
     else
       return false;
   }

diff --git a/gogrocy/lib/core/services/authentication_service.dart b/gogrocy/lib/core/services/authentication_service.dart
@@ -1,5 +1,6 @@
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:gogrocy/core/services/navigation_service.dart';
 import 'package:gogrocy/core/services/shared_prefs.dart';
 import 'package:gogrocy/service_locator.dart';
 
@@ -8,12 +9,18 @@ class AuthenticationService {
   String verificationId;
 
   final SharedPrefsService _sharedPrefsService = locator<SharedPrefsService>();
+  final NavigationService _navigationService = locator<NavigationService>();
 
-  Future verifyPhoneNumber(BuildContext context, String phoneNumber) async {
+  Future verifyPhoneNumber(BuildContext context, String phoneNumber, String countryCode) async {
     final PhoneVerificationCompleted verificationCompleted =
-        (AuthCredential credential) {
+        (AuthCredential credential) async {
       print('Verification Complete');
-      signInWithNumber(context, credential);
+      await signInWithNumber(context, credential);
+      print("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF");
+      _navigationService.navigateTo('awesome', arguments:{
+        "phoneNumber": phoneNumber,
+        "countryCode": countryCode
+      });
     };
 
     final PhoneVerificationFailed verificationFailed =
@@ -34,8 +41,8 @@ class AuthenticationService {
 
     try {
       await firebaseInstance.verifyPhoneNumber(
-          phoneNumber: phoneNumber,
-          timeout: Duration(seconds: 60),
+          phoneNumber: countryCode + " " + phoneNumber,
+          timeout: Duration(seconds: 10),
           verificationCompleted: verificationCompleted,
           verificationFailed: verificationFailed,
           codeSent: phoneCodeSent,
@@ -49,7 +56,7 @@ class AuthenticationService {
     }
   }
 
-  signInWithNumber(BuildContext context, AuthCredential credential) async {
+  Future signInWithNumber(BuildContext context, AuthCredential credential) async {
     try {
       FirebaseUser user =
           (await firebaseInstance.signInWithCredential(credential)).user;
@@ -75,6 +82,7 @@ class AuthenticationService {
 
   Future<bool> isUserLoggedIn() async {
     var loggedIn = await _sharedPrefsService.hasUser();
+    print(loggedIn);
     if(loggedIn){
       return true;
     }else{

diff --git a/gogrocy/lib/core/viewModels/login_model.dart b/gogrocy/lib/core/viewModels/login_model.dart
@@ -42,7 +42,7 @@ class LoginModel extends BaseModel {
     var finalNumber = countryCode + " " + phoneNumber;
 
     var result =
-        await authenticationService.verifyPhoneNumber(context, finalNumber);
+        await authenticationService.verifyPhoneNumber(context, phoneNumber, countryCode);
 
     setState(ViewState.Idle);
 
@@ -111,7 +111,7 @@ class LoginModel extends BaseModel {
       print('Login With Password successful');
       FireStoreService.addUser(
           phoneNumber: phoneNumber, countryCode: countryCode);
-      _sharedPrefsService.setLoggedIn(true);
+      print(_sharedPrefsService.setLoggedIn(true));
       navigationService.navigateTo('home');
     } else {
       print(user.message);