commit commit

src/main/java/com/example/afrishop_v3/controllers/AuthController.java

@@ -228,7 +228,6 @@ public class AuthController extends Controller {
 //            "token":"token",
 //        }
 
-        try {
             // Check if firebase token is valid
             boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken());
 
@@ -313,10 +312,10 @@ public class AuthController extends Controller {
                 String very = gotFromOld ? user.getPassword() : null;
                 // generate token codes has been moved downwards from if condition of checking if user doesn't exist in database, because even if
                 // user exist we have to generate token also
-                //if (user.getPassword() == null || gotFromOld) {
+                if (user.getPassword() == null || gotFromOld) {
                     user.setFirebaseUid(firebaseUid);// Assign user from database to the user we have to return back to request
                     user.setPassword(encoder.encode(firebaseUid));// Assign user from database to the user we have to return back to request
-                ///}
+                }
 
 
                 fixCode(user);
@@ -337,11 +336,7 @@ public class AuthController extends Controller {
             } else {
                 return new Result<>(ResultCodeEnum.ILLEGAL_ARGUMENT.getCode(), ResultCodeEnum.ILLEGAL_ARGUMENT.getDesc());
             }
-        }catch (Exception e){
-            System.out.println(e.getMessage());
-            return new Result<>(ResultCodeEnum.ILLEGAL_ARGUMENT.getCode(), e.getMessage());
 
-        }
 
     }