family file switch back issue fixed #203

Merged
Haroon6138 merged 1 commits from dev_aamir into master 2 days ago

@ -200,8 +200,6 @@ class AuthenticationRepoImp implements AuthenticationRepo {
} }
} }
@override @override
Future<Either<Failure, GenericApiModel<dynamic>>> checkActivationCodeRepo( Future<Either<Failure, GenericApiModel<dynamic>>> checkActivationCodeRepo(
{required dynamic newRequest, // could be CheckActivationCodeReq or CheckActivationCodeRegisterReq {required dynamic newRequest, // could be CheckActivationCodeReq or CheckActivationCodeRegisterReq
@ -276,11 +274,10 @@ class AuthenticationRepoImp implements AuthenticationRepo {
newRequest.forRegisteration = newRequest.isRegister ?? false; newRequest.forRegisteration = newRequest.isRegister ?? false;
newRequest.isRegister = false; newRequest.isRegister = false;
//silent login case removed token and login token //silent login case removed token and login token
if(newRequest.logInTokenID.isEmpty && newRequest.isSilentLogin == true && (newRequest.loginType==1 || newRequest.loginType==4)) { if (newRequest.logInTokenID.isEmpty && newRequest.isSilentLogin == true && (newRequest.loginType == 1 || newRequest.loginType == 4)) {
newRequest.logInTokenID = null; newRequest.logInTokenID = null;
newRequest.deviceToken = null; newRequest.deviceToken = null;
} }
} }
Map<String, dynamic> familyRequest = {}; Map<String, dynamic> familyRequest = {};
@ -315,13 +312,9 @@ class AuthenticationRepoImp implements AuthenticationRepo {
} }
if (appState.getSuperUserID == responseID) { if (appState.getSuperUserID == responseID) {
// switchRequest['LoginType'] = 0; switchRequest['LoginType'] = loginType;
switchRequest['PatientIdentificationID'] = ""; switchRequest['PatientIdentificationID'] = "";
// switchRequest["PatientID"] = responseID; switchRequest['DeviceToken'] = newRequest.deviceToken;
// switchRequest["SuperUser"] = responseID;
// switchRequest["PatientID"] = appState.getAuthenticatedUser()?.patientId ?? 0;
// switchRequest["PatientMobileNumber"] = newRequest.patientMobileNumber?.toString().startsWith('0') == true ? newRequest.patientMobileNumber.toString() : '0${newRequest.patientMobileNumber}';
switchRequest.removeWhere((key, value) => ['NationalID', 'isDentalAllowedBackend', 'ProjectOutSA', 'ForRegisteration'].contains(key)); switchRequest.removeWhere((key, value) => ['NationalID', 'isDentalAllowedBackend', 'ProjectOutSA', 'ForRegisteration'].contains(key));
} }
} }

@ -552,16 +552,16 @@ class AuthenticationViewModel extends ChangeNotifier {
}); });
} else { } else {
final resultEither = await _authenticationRepo.checkActivationCodeRepo( final resultEither = await _authenticationRepo.checkActivationCodeRepo(
newRequest: CheckActivationCodeRegisterReq.fromJson(request), newRequest: CheckActivationCodeRegisterReq.fromJson(request),
activationCode: activationCode, activationCode: activationCode,
isRegister: false, isRegister: false,
isFormFamilyFile: isFormFamilyFile, isFormFamilyFile: isFormFamilyFile,
patientShareRequestID: patientShareRequestID, patientShareRequestID: patientShareRequestID,
responseID: responseID, responseID: responseID,
isSwitchUser: isSwitchUser, isSwitchUser: isSwitchUser,
patientID: patientID, patientID: patientID,
loginType: _appState.getSuperUserID != null ? 0 : 2, // loginType: _appState.getSuperUserID != null ? 0 : 2,
); loginType: loginTypeEnum.toInt);
resultEither.fold( resultEither.fold(
(failure) async => await _errorHandlerService.handleError( (failure) async => await _errorHandlerService.handleError(

Loading…
Cancel
Save