fix security issues in pharmacy

ios/Podfile.lock

@@ -1,461 +1,25 @@
 PODS:
-  - android_intent (0.0.1):
-    - Flutter
-  - barcode_scan_fix (0.0.1):
-    - Flutter
-    - MTBBarcodeScanner
-  - connectivity (0.0.1):
-    - Flutter
-    - Reachability
-  - connectivity_for_web (0.1.0):
-    - Flutter
-  - connectivity_macos (0.0.1):
-    - Flutter
-  - device_calendar (0.0.1):
-    - Flutter
-  - device_info (0.0.1):
-    - Flutter
-  - Firebase/CoreOnly (6.33.0):
-    - FirebaseCore (= 6.10.3)
-  - Firebase/Messaging (6.33.0):
-    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 4.7.0)
-  - firebase_core (0.5.3):
-    - Firebase/CoreOnly (~> 6.33.0)
-    - Flutter
-  - firebase_core_web (0.1.0):
-    - Flutter
-  - firebase_messaging (7.0.3):
-    - Firebase/CoreOnly (~> 6.33.0)
-    - Firebase/Messaging (~> 6.33.0)
-    - firebase_core
-    - Flutter
-  - FirebaseCore (6.10.3):
-    - FirebaseCoreDiagnostics (~> 1.6)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Logger (~> 6.7)
-  - FirebaseCoreDiagnostics (1.7.0):
-    - GoogleDataTransport (~> 7.4)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Logger (~> 6.7)
-    - nanopb (~> 1.30906.0)
-  - FirebaseInstallations (1.7.0):
-    - FirebaseCore (~> 6.10)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.7)
-    - PromisesObjC (~> 1.2)
-  - FirebaseInstanceID (4.8.0):
-    - FirebaseCore (~> 6.10)
-    - FirebaseInstallations (~> 1.6)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.7)
-  - FirebaseMessaging (4.7.1):
-    - FirebaseCore (~> 6.10)
-    - FirebaseInstanceID (~> 4.7)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.7)
-    - GoogleUtilities/Environment (~> 6.7)
-    - GoogleUtilities/Reachability (~> 6.7)
-    - GoogleUtilities/UserDefaults (~> 6.7)
-    - Protobuf (>= 3.9.2, ~> 3.9)
   - Flutter (1.0.0)
-  - flutter_email_sender (0.0.1):
-    - Flutter
-  - flutter_flexible_toast (0.0.1):
-    - Flutter
-  - flutter_inappwebview (0.0.1):
-    - Flutter
-  - flutter_local_notifications (0.0.1):
-    - Flutter
-  - flutter_plugin_android_lifecycle (0.0.1):
-    - Flutter
-  - flutter_tts (0.0.1):
-    - Flutter
-  - geolocator (6.1.9):
-    - Flutter
-  - google_maps_flutter (0.0.1):
-    - Flutter
-    - GoogleMaps (< 3.10)
-  - GoogleDataTransport (7.5.1):
-    - nanopb (~> 1.30906.0)
-  - GoogleMaps (3.9.0):
-    - GoogleMaps/Maps (= 3.9.0)
-  - GoogleMaps/Base (3.9.0)
-  - GoogleMaps/Maps (3.9.0):
-    - GoogleMaps/Base
-  - GoogleUtilities/AppDelegateSwizzler (6.7.2):
-    - GoogleUtilities/Environment
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (6.7.2):
-    - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (6.7.2):
-    - GoogleUtilities/Environment
-  - GoogleUtilities/Network (6.7.2):
-    - GoogleUtilities/Logger
-    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (6.7.2)"
-  - GoogleUtilities/Reachability (6.7.2):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (6.7.2):
-    - GoogleUtilities/Logger
-  - hexcolor (0.0.1):
-    - Flutter
-  - image_cropper (0.0.3):
-    - Flutter
-    - TOCropViewController (~> 2.5.4)
-  - image_picker (0.0.1):
-    - Flutter
-  - just_audio (0.0.1):
-    - Flutter
-  - local_auth (0.0.1):
-    - Flutter
-  - location (0.0.1):
-    - Flutter
-  - manage_calendar_events (0.0.1):
-    - Flutter
-  - map_launcher (0.0.1):
-    - Flutter
-  - maps_launcher (0.0.1):
-    - Flutter
-  - MTBBarcodeScanner (5.0.11)
-  - nanopb (1.30906.0):
-    - nanopb/decode (= 1.30906.0)
-    - nanopb/encode (= 1.30906.0)
-  - nanopb/decode (1.30906.0)
-  - nanopb/encode (1.30906.0)
-  - native_device_orientation (0.0.1):
-    - Flutter
-  - native_progress_hud (0.0.1):
-    - Flutter
   - NVActivityIndicatorView (5.1.1):
     - NVActivityIndicatorView/Base (= 5.1.1)
   - NVActivityIndicatorView/Base (5.1.1)
-  - path_provider (0.0.1):
-    - Flutter
-  - path_provider_linux (0.0.1):
-    - Flutter
-  - path_provider_macos (0.0.1):
-    - Flutter
-  - path_provider_windows (0.0.1):
-    - Flutter
-  - "permission_handler (5.0.1+1)":
-    - Flutter
-  - PromisesObjC (1.2.11)
-  - Protobuf (3.13.0)
-  - Reachability (3.2)
-  - screen (0.0.1):
-    - Flutter
-  - shared_preferences (0.0.1):
-    - Flutter
-  - shared_preferences_linux (0.0.1):
-    - Flutter
-  - shared_preferences_macos (0.0.1):
-    - Flutter
-  - shared_preferences_web (0.0.1):
-    - Flutter
-  - shared_preferences_windows (0.0.1):
-    - Flutter
-  - speech_to_text (0.0.1):
-    - Flutter
-    - Try
-  - TOCropViewController (2.5.5)
-  - Try (2.1.1)
-  - "twilio_programmable_video (0.5.0+4)":
-    - Flutter
-    - TwilioVideo (~> 3.4)
-  - TwilioVideo (3.8.0)
-  - url_launcher (0.0.1):
-    - Flutter
-  - url_launcher_linux (0.0.1):
-    - Flutter
-  - url_launcher_macos (0.0.1):
-    - Flutter
-  - url_launcher_web (0.0.1):
-    - Flutter
-  - url_launcher_windows (0.0.1):
-    - Flutter
-  - vibration (1.7.3):
-    - Flutter
-  - vibration_web (1.6.2):
-    - Flutter
-  - video_player (0.0.1):
-    - Flutter
-  - video_player_web (0.0.1):
-    - Flutter
-  - wakelock (0.0.1):
-    - Flutter
-  - webview_flutter (0.0.1):
-    - Flutter
-  - wifi (0.0.1):
-    - Flutter
 
 DEPENDENCIES:
-  - android_intent (from `.symlinks/plugins/android_intent/ios`)
-  - barcode_scan_fix (from `.symlinks/plugins/barcode_scan_fix/ios`)
-  - connectivity (from `.symlinks/plugins/connectivity/ios`)
-  - connectivity_for_web (from `.symlinks/plugins/connectivity_for_web/ios`)
-  - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
-  - device_calendar (from `.symlinks/plugins/device_calendar/ios`)
-  - device_info (from `.symlinks/plugins/device_info/ios`)
-  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
-  - firebase_core_web (from `.symlinks/plugins/firebase_core_web/ios`)
-  - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
-  - flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`)
-  - flutter_flexible_toast (from `.symlinks/plugins/flutter_flexible_toast/ios`)
-  - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
-  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
-  - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`)
-  - flutter_tts (from `.symlinks/plugins/flutter_tts/ios`)
-  - geolocator (from `.symlinks/plugins/geolocator/ios`)
-  - google_maps_flutter (from `.symlinks/plugins/google_maps_flutter/ios`)
-  - hexcolor (from `.symlinks/plugins/hexcolor/ios`)
-  - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
-  - image_picker (from `.symlinks/plugins/image_picker/ios`)
-  - just_audio (from `.symlinks/plugins/just_audio/ios`)
-  - local_auth (from `.symlinks/plugins/local_auth/ios`)
-  - location (from `.symlinks/plugins/location/ios`)
-  - manage_calendar_events (from `.symlinks/plugins/manage_calendar_events/ios`)
-  - map_launcher (from `.symlinks/plugins/map_launcher/ios`)
-  - maps_launcher (from `.symlinks/plugins/maps_launcher/ios`)
-  - native_device_orientation (from `.symlinks/plugins/native_device_orientation/ios`)
-  - native_progress_hud (from `.symlinks/plugins/native_progress_hud/ios`)
   - NVActivityIndicatorView
-  - path_provider (from `.symlinks/plugins/path_provider/ios`)
-  - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
-  - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
-  - path_provider_windows (from `.symlinks/plugins/path_provider_windows/ios`)
-  - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
-  - screen (from `.symlinks/plugins/screen/ios`)
-  - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
-  - shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`)
-  - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
-  - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
-  - shared_preferences_windows (from `.symlinks/plugins/shared_preferences_windows/ios`)
-  - speech_to_text (from `.symlinks/plugins/speech_to_text/ios`)
-  - twilio_programmable_video (from `.symlinks/plugins/twilio_programmable_video/ios`)
-  - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
-  - url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`)
-  - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)
-  - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
-  - url_launcher_windows (from `.symlinks/plugins/url_launcher_windows/ios`)
-  - vibration (from `.symlinks/plugins/vibration/ios`)
-  - vibration_web (from `.symlinks/plugins/vibration_web/ios`)
-  - video_player (from `.symlinks/plugins/video_player/ios`)
-  - video_player_web (from `.symlinks/plugins/video_player_web/ios`)
-  - wakelock (from `.symlinks/plugins/wakelock/ios`)
-  - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
-  - wifi (from `.symlinks/plugins/wifi/ios`)
 
 SPEC REPOS:
   trunk:
-    - Firebase
-    - FirebaseCore
-    - FirebaseCoreDiagnostics
-    - FirebaseInstallations
-    - FirebaseInstanceID
-    - FirebaseMessaging
-    - GoogleDataTransport
-    - GoogleMaps
-    - GoogleUtilities
-    - MTBBarcodeScanner
-    - nanopb
     - NVActivityIndicatorView
-    - PromisesObjC
-    - Protobuf
-    - Reachability
-    - TOCropViewController
-    - Try
-    - TwilioVideo
 
 EXTERNAL SOURCES:
-  android_intent:
-    :path: ".symlinks/plugins/android_intent/ios"
-  barcode_scan_fix:
-    :path: ".symlinks/plugins/barcode_scan_fix/ios"
-  connectivity:
-    :path: ".symlinks/plugins/connectivity/ios"
-  connectivity_for_web:
-    :path: ".symlinks/plugins/connectivity_for_web/ios"
-  connectivity_macos:
-    :path: ".symlinks/plugins/connectivity_macos/ios"
-  device_calendar:
-    :path: ".symlinks/plugins/device_calendar/ios"
-  device_info:
-    :path: ".symlinks/plugins/device_info/ios"
-  firebase_core:
-    :path: ".symlinks/plugins/firebase_core/ios"
-  firebase_core_web:
-    :path: ".symlinks/plugins/firebase_core_web/ios"
-  firebase_messaging:
-    :path: ".symlinks/plugins/firebase_messaging/ios"
   Flutter:
     :path: Flutter
-  flutter_email_sender:
-    :path: ".symlinks/plugins/flutter_email_sender/ios"
-  flutter_flexible_toast:
-    :path: ".symlinks/plugins/flutter_flexible_toast/ios"
-  flutter_inappwebview:
-    :path: ".symlinks/plugins/flutter_inappwebview/ios"
-  flutter_local_notifications:
-    :path: ".symlinks/plugins/flutter_local_notifications/ios"
-  flutter_plugin_android_lifecycle:
-    :path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios"
-  flutter_tts:
-    :path: ".symlinks/plugins/flutter_tts/ios"
-  geolocator:
-    :path: ".symlinks/plugins/geolocator/ios"
-  google_maps_flutter:
-    :path: ".symlinks/plugins/google_maps_flutter/ios"
-  hexcolor:
-    :path: ".symlinks/plugins/hexcolor/ios"
-  image_cropper:
-    :path: ".symlinks/plugins/image_cropper/ios"
-  image_picker:
-    :path: ".symlinks/plugins/image_picker/ios"
-  just_audio:
-    :path: ".symlinks/plugins/just_audio/ios"
-  local_auth:
-    :path: ".symlinks/plugins/local_auth/ios"
-  location:
-    :path: ".symlinks/plugins/location/ios"
-  manage_calendar_events:
-    :path: ".symlinks/plugins/manage_calendar_events/ios"
-  map_launcher:
-    :path: ".symlinks/plugins/map_launcher/ios"
-  maps_launcher:
-    :path: ".symlinks/plugins/maps_launcher/ios"
-  native_device_orientation:
-    :path: ".symlinks/plugins/native_device_orientation/ios"
-  native_progress_hud:
-    :path: ".symlinks/plugins/native_progress_hud/ios"
-  path_provider:
-    :path: ".symlinks/plugins/path_provider/ios"
-  path_provider_linux:
-    :path: ".symlinks/plugins/path_provider_linux/ios"
-  path_provider_macos:
-    :path: ".symlinks/plugins/path_provider_macos/ios"
-  path_provider_windows:
-    :path: ".symlinks/plugins/path_provider_windows/ios"
-  permission_handler:
-    :path: ".symlinks/plugins/permission_handler/ios"
-  screen:
-    :path: ".symlinks/plugins/screen/ios"
-  shared_preferences:
-    :path: ".symlinks/plugins/shared_preferences/ios"
-  shared_preferences_linux:
-    :path: ".symlinks/plugins/shared_preferences_linux/ios"
-  shared_preferences_macos:
-    :path: ".symlinks/plugins/shared_preferences_macos/ios"
-  shared_preferences_web:
-    :path: ".symlinks/plugins/shared_preferences_web/ios"
-  shared_preferences_windows:
-    :path: ".symlinks/plugins/shared_preferences_windows/ios"
-  speech_to_text:
-    :path: ".symlinks/plugins/speech_to_text/ios"
-  twilio_programmable_video:
-    :path: ".symlinks/plugins/twilio_programmable_video/ios"
-  url_launcher:
-    :path: ".symlinks/plugins/url_launcher/ios"
-  url_launcher_linux:
-    :path: ".symlinks/plugins/url_launcher_linux/ios"
-  url_launcher_macos:
-    :path: ".symlinks/plugins/url_launcher_macos/ios"
-  url_launcher_web:
-    :path: ".symlinks/plugins/url_launcher_web/ios"
-  url_launcher_windows:
-    :path: ".symlinks/plugins/url_launcher_windows/ios"
-  vibration:
-    :path: ".symlinks/plugins/vibration/ios"
-  vibration_web:
-    :path: ".symlinks/plugins/vibration_web/ios"
-  video_player:
-    :path: ".symlinks/plugins/video_player/ios"
-  video_player_web:
-    :path: ".symlinks/plugins/video_player_web/ios"
-  wakelock:
-    :path: ".symlinks/plugins/wakelock/ios"
-  webview_flutter:
-    :path: ".symlinks/plugins/webview_flutter/ios"
-  wifi:
-    :path: ".symlinks/plugins/wifi/ios"
 
 SPEC CHECKSUMS:
-  android_intent: 367df2f1277a74e4a90e14a8ab3df3112d087052
-  barcode_scan_fix: 80dd65de55f27eec6591dd077c8b85f2b79e31f1
-  connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
-  connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b
-  connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
-  device_calendar: 23b28a5f1ab3bf77e34542fb1167e1b8b29a98f5
-  device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
-  Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
-  firebase_core: 5d6a02f3d85acd5f8321c2d6d62877626a670659
-  firebase_core_web: d501d8b946b60c8af265428ce483b0fff5ad52d1
-  firebase_messaging: 0aea2cd5885b65e19ede58ee3507f485c992cc75
-  FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
-  FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
-  FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
-  FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
-  FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
-  flutter_email_sender: f787522d0e82f50e5766c1213dbffff22fdcf009
-  flutter_flexible_toast: 0547e740cae0c33bb7c51bcd931233f4584e1143
-  flutter_inappwebview: 69dfbac46157b336ffbec19ca6dfd4638c7bf189
-  flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186
-  flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
-  flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d
-  geolocator: 057a0c63a43e9c5296d8ad845a3ac8e6df23d899
-  google_maps_flutter: c7f9c73576de1fbe152a227bfd6e6c4ae8088619
-  GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
-  GoogleMaps: 4b5346bddfe6911bb89155d43c903020170523ac
-  GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
-  hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89
-  image_cropper: c8f9b4157933c7bb965a66d1c5e6c8fd408c6eb4
-  image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
-  just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
-  local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
-  location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740
-  manage_calendar_events: 0338d505ea26cdfd20cd883279bc28afa11eca34
-  map_launcher: e325db1261d029ff33e08e03baccffe09593ffea
-  maps_launcher: eae38ee13a9c3f210fa04e04bb4c073fa4c6ed92
-  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
-  native_device_orientation: e24d00be281de72996640885d80e706142707660
-  native_progress_hud: f95f5529742b36a3c7fdecfa88dc018319e39bf9
   NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667
-  path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
-  path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
-  path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
-  path_provider_windows: a2b81600c677ac1959367280991971cb9a1edb3b
-  permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
-  PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
-  Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
-  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  screen: abd91ca7bf3426e1cc3646d27e9b2358d6bf07b0
-  shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
-  shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78
-  shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
-  shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
-  shared_preferences_windows: 36b76d6f54e76ead957e60b49e2f124b4cd3e6ae
-  speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe
-  TOCropViewController: da59f531f8ac8a94ef6d6c0fc34009350f9e8bfe
-  Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96
-  twilio_programmable_video: 6a41593640f3d86af60b22541fd457b22deaae7f
-  TwilioVideo: c13a51ceca375e91620eb7578d2573c90cf53b46
-  url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
-  url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
-  url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
-  url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
-  url_launcher_windows: 683d7c283894db8d1914d3ab2223b20cc1ad95d5
-  vibration: b5a33e764c3f609a975b9dca73dce20fdde627dc
-  vibration_web: 0ba303d92469ba34d71c612a228b315908d7fcd9
-  video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
-  video_player_web: da8cadb8274ed4f8dbee8d7171b420dedd437ce7
-  wakelock: 0d4a70faf8950410735e3f61fb15d517c8a6efc4
-  webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
-  wifi: d7d77c94109e36c4175d845f0a5964eadba71060
 
-PODFILE CHECKSUM: 5a17be3f8af73a757fa4439c77cf6ab2db29a6e7
+PODFILE CHECKSUM: d94bd40f28772938199c67fcced06ffe96096c14
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1

ios/Runner.xcodeproj/project.pbxproj

@@ -219,8 +219,7 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				125A739F71A29FBAE7B4D5AC /* [CP] Embed Pods Frameworks */,
-				CBB18A5CEEEB971DCFC36E00 /* [CP] Copy Pods Resources */,
+				EFDAD5E1235DCA1DB6187148 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -284,23 +283,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		125A739F71A29FBAE7B4D5AC /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		299B8FE131E5BAE7FA7E2FC9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -351,21 +333,21 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		CBB18A5CEEEB971DCFC36E00 /* [CP] Copy Pods Resources */ = {
+		EFDAD5E1235DCA1DB6187148 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -496,7 +478,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
+				PRODUCT_BUNDLE_IDENTIFIER = com.hmg.smartphone;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -635,7 +617,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
+				PRODUCT_BUNDLE_IDENTIFIER = com.hmg.smartphone;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -668,7 +650,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
+				PRODUCT_BUNDLE_IDENTIFIER = com.hmg.smartphone;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

lib/config/config.dart

@@ -321,16 +321,17 @@ const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals";
 // const GET_WISHLIST = "http://swd-pharapp-01:7200/api/shopping_cart_items/";
 
 // pharmacy
-const PHARMACY_VERIFY_CUSTOMER = "epharmacy/api/VerifyCustomer";
-const PHARMACY_GET_COUNTRY = "epharmacy/api/countries";
+const PHARMACY_AUTORZIE_CUSTOMER = "epharmacy/api/AutorizeCustomer";
+const PHARMACY_VERIFY_CUSTOMER = "VerifyCustomer";
+const PHARMACY_GET_COUNTRY = "countries";
 const PHARMACY_CREATE_CUSTOMER = "epharmacy/api/CreateCustomer";
-const GET_PHARMACY_BANNER = "epharmacy/api/promotionbanners";
-const GET_PHARMACY_TOP_MANUFACTURER = "epharmacy/api/topmanufacturer";
-const GET_PHARMACY_BEST_SELLER_PRODUCT = "epharmacy/api/bestsellerproducts";
-const GET_PHARMACY_PRODUCTs_BY_IDS = "epharmacy/api/productsbyids/";
-const GET_PHARMACY_PRODUCTs_BY_SKU = "epharmacy/api/productbysku/";
-const GET_CUSTOMERS_ADDRESSES = "epharmacy/api/Customers/";
-const SUBSCRIBE_PRODUCT = "epharmacy/api/subscribe?";
+const GET_PHARMACY_BANNER = "promotionbanners";
+const GET_PHARMACY_TOP_MANUFACTURER = "topmanufacturer";
+const GET_PHARMACY_BEST_SELLER_PRODUCT = "bestsellerproducts";
+const GET_PHARMACY_PRODUCTs_BY_IDS = "productsbyids/";
+const GET_PHARMACY_PRODUCTs_BY_SKU = "productbysku/";
+const GET_CUSTOMERS_ADDRESSES = "Customers/";
+const SUBSCRIBE_PRODUCT = "subscribe?";
 const GET_ORDER = "orders?";
 const GET_ORDER_DETAILS = "orders/";
 const ADD_CUSTOMER_ADDRESS = "epharmacy/api/addcustomeraddress";
@@ -339,10 +340,10 @@ const DELETE_CUSTOMER_ADDRESS = "epharmacy/api/deletecustomeraddress";
 const GET_ADDRESS = "Customers/";
 const GET_Cancel_ORDER = "cancelorder/";
 const WRITE_REVIEW = "Content-Type" + "text/plain; charset=utf-8";
-const GET_SHOPPING_CART = "epharmacy/api/shopping_cart_items/";
-const GET_SHIPPING_OPTIONS = "epharmacy/api/get_shipping_option/";
+const GET_SHOPPING_CART = "shopping_cart_items/";
+const GET_SHIPPING_OPTIONS = "get_shipping_option/";
 const DELETE_SHOPPING_CART = "epharmacy/api/delete_shopping_cart_items/";
-const DELETE_SHOPPING_CART_ALL = "epharmacy/api/delete_shopping_cart_item_by_customer/";
+const DELETE_SHOPPING_CART_ALL = "delete_shopping_cart_item_by_customer/";
 const ORDER_SHOPPING_CART = "epharmacy/api/orders";
 const GET_LACUM_ACCOUNT_INFORMATION = "Services/Patients.svc/REST/GetLakumAccountInformation";
 const GET_LACUM_GROUP_INFORMATION = "Services/Patients.svc/REST/GetlakumInQueryInfoGrouping";
@@ -386,26 +387,26 @@ const GET_CUSTOMER_INFO = "https://mdlaboratories.com/exacartapi/api/VerifyCusto
 
 //Pharmacy
 
-const GET_PHARMACY_CATEGORISE = 'epharmacy/api/categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=0';
-const GET_OFFERS_CATEGORISE = 'epharmacy/api/discountcategories';
-const GET_OFFERS_PRODUCTS = 'epharmacy/api/offerproducts/';
-const GET_CATEGORISE_PARENT = 'epharmacy/api/categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
-const GET_PARENT_PRODUCTS = 'epharmacy/api/products?categoryid=';
-const GET_SUB_CATEGORISE = 'epharmacy/api/categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
-const GET_SUB_PRODUCTS = 'epharmacy/api/products?categoryid=';
+const GET_PHARMACY_CATEGORISE = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=0';
+const GET_OFFERS_CATEGORISE = 'discountcategories';
+const GET_OFFERS_PRODUCTS = 'offerproducts/';
+const GET_CATEGORISE_PARENT = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
+const GET_PARENT_PRODUCTS = 'products?categoryid=';
+const GET_SUB_CATEGORISE = 'categories?fields=id,name,namen,description,image,localized_names,display_order,parent_category_id,is_leaf&parent_id=';
+const GET_SUB_PRODUCTS = 'products?categoryid=';
 const GET_FINAL_PRODUCTS =
-    'epharmacy/api/products?fields=id,reviews,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage&CategoryId=';
+    'products?fields=id,reviews,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage&CategoryId=';
 
 const TIMER_MIN = 10;
 
 const GOOGLE_API_KEY = "AIzaSyCmevVlr2Bh-c8W1VUzo8gt8JRY7n5PANw";
 
-const GET_BRANDS_LIST = 'epharmacy/api/categoryManufacturer?categoryids=';
+const GET_BRANDS_LIST = 'categoryManufacturer?categoryids=';
 
 const GET_SEARCH_PRODUCTS =
-    'epharmacy/api/searchproducts?fields=id,discount_ids,reviews,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage&search_key=';
+    'searchproducts?fields=id,discount_ids,reviews,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage&search_key=';
 
-const SCAN_QR_CODE = 'epharmacy/api/productbysku/';
+const SCAN_QR_CODE = 'productbysku/';
 
 class AppGlobal {
   static var context;

lib/config/shared_pref_kay.dart

@@ -26,3 +26,4 @@ const WEATHER = 'weather';
 const BLOOD_TYPE = 'blood-type';
 const NOTIFICATION_COUNT = 'notification-count';
 const PHARMACY_SELECTED_ADDRESS = 'selected-address';
+const PHARMACY_AUTORZIE_TOKEN = 'PHARMACY_AUTORZIE_TOKEN';

lib/core/service/AlHabibMedicalService/customer_addresses_service.dart

@@ -43,7 +43,7 @@ class CustomerAddressesService extends BaseService {
       'fields':'addresses'
     };
     hasError = false;
-    await baseAppClient.get("$GET_CUSTOMER_ADDRESSES${customerInfo.customerId}",
+    await baseAppClient.getPharmacy("$GET_CUSTOMER_ADDRESSES${customerInfo.customerId}",
         onSuccess: (dynamic response, int statusCode) {
           addressesList.clear();
           response["customers"][0]["addresses"].forEach((data) {
@@ -63,7 +63,7 @@ class CustomerAddressesService extends BaseService {
     };
 
     hasError = false;
-    await baseAppClient.get(GET_CUSTOMER_INFO,
+    await baseAppClient.getPharmacy(GET_CUSTOMER_INFO,
         onSuccess: (dynamic response, int statusCode) {
           customerInfo= CustomerInfo.fromJson(response);
         }, onFailure: (String error, int statusCode) {

lib/core/service/client/base_app_client.dart

@@ -195,7 +195,7 @@ class BaseAppClient {
   get(String endPoint,
       {Function(dynamic response, int statusCode) onSuccess,
         Function(String error, int statusCode) onFailure,
-        Map<String, String> queryParams,
+        Map<String, dynamic> queryParams,
         bool isExternal = false}) async {
     String url;
     if (isExternal) {
@@ -236,19 +236,41 @@ class BaseAppClient {
       {Function(dynamic response, int statusCode) onSuccess,
         Function(String error, int statusCode) onFailure,
         bool isAllowAny = false,
-        Map<String, String> queryParams}) async {
-    String url = PHARMACY_BASE_URL + endPoint;
+        bool isExternal = false,
+        Map<String, dynamic> queryParams}) async {
+
+    String url;
+    if (isExternal) {
+      url = endPoint;
+    } else {
+      url = PHARMACY_BASE_URL + endPoint;
+    }
     if (queryParams != null) {
       String queryString = Uri(queryParameters: queryParams).query;
       url += '?' + queryString;
     }
 
     print("URL : $url");
+    var token = await sharedPref.getString(PHARMACY_AUTORZIE_TOKEN);
+    var user = await sharedPref.getObject(USER_PROFILE);
+
+    Map test =  {
+    'Content-Type': 'application/json',
+    'Accept': 'application/json',
+    'Authorization': token,
+    'Mobilenumber': user['MobileNumber'].toString(),
+    'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
+    'Username': user['PatientID'].toString(),
+    };
 
     if (await Utils.checkConnection()) {
       final response = await http.get(url.trim(), headers: {
         'Content-Type': 'application/json',
-        'Accept': 'application/json'
+        'Accept': 'application/json',
+        'Authorization': token,
+        'Mobilenumber': user['MobileNumber'].toString(),
+        'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9',
+        'Username': user['PatientID'].toString(),
       });
       final int statusCode = response.statusCode;
       print("statusCode :$statusCode");

lib/core/service/offers_service.dart

@@ -21,7 +21,7 @@ class OffersCategoriseService extends BaseService {
   Future getOffersCategorise() async {
     hasError = false;
     _offersList.clear();
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       GET_OFFERS_CATEGORISE,
       onSuccess: (dynamic response, int statusCode) {
         response['categories'].forEach((item) {
@@ -40,7 +40,7 @@ class OffersCategoriseService extends BaseService {
     _offerProducts.clear();
     String endPoint =
         id != null ? GET_OFFERS_PRODUCTS + "$id" : GET_OFFERS_PRODUCTS + "1";
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       endPoint,
       onSuccess: (dynamic response, int statusCode) {
         response['products'].forEach((item) {

lib/core/service/parmacyModule/order-preview-service.dart

@@ -21,7 +21,7 @@ class OrderPreviewService extends BaseService {
     Map<String, String> queryParams = {'fields': 'addresses'};
     hasError = false;
     try {
-      await baseAppClient.get("$GET_CUSTOMERS_ADDRESSES$customerId",
+      await baseAppClient.getPharmacy("$GET_CUSTOMERS_ADDRESSES$customerId",
           onSuccess: (dynamic response, int statusCode) {
         addresses.clear();
         response['customers'][0]['addresses'].forEach((item) {
@@ -42,7 +42,7 @@ class OrderPreviewService extends BaseService {
     dynamic localRes;
     hasError = false;
     try {
-      await baseAppClient.get("$GET_SHIPPING_OPTIONS$customerId/${selectedAddress.id}",
+      await baseAppClient.getPharmacy("$GET_SHIPPING_OPTIONS$customerId/${selectedAddress.id}",
           onSuccess: (dynamic response, int statusCode) {
             localRes = response['shipping_option'][0];
           }, onFailure: (String error, int statusCode) {
@@ -61,7 +61,7 @@ class OrderPreviewService extends BaseService {
     dynamic localRes;
     hasError = false;
     try {
-      await baseAppClient.get("$GET_SHOPPING_CART$customerId",
+      await baseAppClient.getPharmacy("$GET_SHOPPING_CART$customerId",
           onSuccess: (dynamic response, int statusCode) {
         localRes = response;
       }, onFailure: (String error, int statusCode) {
@@ -125,7 +125,7 @@ class OrderPreviewService extends BaseService {
     super.error = "";
     dynamic localRes;
 
-    await baseAppClient.get("$DELETE_SHOPPING_CART_ALL$customerId/ShoppingCart",
+    await baseAppClient.getPharmacy("$DELETE_SHOPPING_CART_ALL$customerId/ShoppingCart",
         onSuccess: (response, statusCode) async {
       localRes = response;
     }, onFailure: (String error, int statusCode) {

lib/core/service/parmacyModule/parmacy_module_service.dart

@@ -22,7 +22,7 @@ class PharmacyModuleService extends BaseService {
     Map<String, String> queryParams = {'FileNumber': data['PatientID'].toString()};
     hasError = false;
     try {
-      await baseAppClient.get(PHARMACY_VERIFY_CUSTOMER, onSuccess: (dynamic response, int statusCode) {
+      await baseAppClient.getPharmacy(PHARMACY_VERIFY_CUSTOMER, onSuccess: (dynamic response, int statusCode) {
         if (response['UserName'] != null) {
           sharedPref.setString(PHARMACY_CUSTOMER_ID, response['CustomerId'].toString());
           print(response);
@@ -54,8 +54,29 @@ class PharmacyModuleService extends BaseService {
     };
     hasError = false;
     try {
-      await baseAppClient.get(PHARMACY_CREATE_CUSTOMER, onSuccess: (dynamic response, int statusCode) {
+      await baseAppClient.get(PHARMACY_CREATE_CUSTOMER, onSuccess: (dynamic response, int statusCode) async{
         if (!response['IsRegistered']) {}
+        await generatePharmacyToken();
+      }, onFailure: (String error, int statusCode) {
+        hasError = true;
+        super.error = error;
+      }, queryParams: queryParams);
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  Future generatePharmacyToken() async {
+    Map<String, String> queryParams = {
+      'Filenumber':user.patientID.toString(),
+      'MobileNumber':user.mobileNumber,
+    };
+    hasError = false;
+    try {
+      await baseAppClient.get(PHARMACY_AUTORZIE_CUSTOMER, onSuccess: (dynamic response, int statusCode) async{
+        if (response['Status'] == 200) {
+        await sharedPref.setString(PHARMACY_AUTORZIE_TOKEN, response['token'].toString());
+        }
       }, onFailure: (String error, int statusCode) {
         hasError = true;
         super.error = error;
@@ -68,7 +89,7 @@ class PharmacyModuleService extends BaseService {
   Future getBannerListList() async {
     hasError = false;
     try {
-      await baseAppClient.get(GET_PHARMACY_BANNER, onSuccess: (dynamic response, int statusCode) {
+      await baseAppClient.getPharmacy(GET_PHARMACY_BANNER, onSuccess: (dynamic response, int statusCode) {
         bannerItems.clear();
         response['images'].forEach((item) {
           bannerItems.add(PharmacyImageObject.fromJson(item));
@@ -85,7 +106,7 @@ class PharmacyModuleService extends BaseService {
   Future getTopManufacturerList() async {
     Map<String, String> queryParams = {'page': '1', 'limit': '8'};
     try {
-      await baseAppClient.get(GET_PHARMACY_TOP_MANUFACTURER, onSuccess: (dynamic response, int statusCode) {
+      await baseAppClient.getPharmacy(GET_PHARMACY_TOP_MANUFACTURER, onSuccess: (dynamic response, int statusCode) {
         manufacturerList.clear();
         response['manufacturer'].forEach((item) {
           Manufacturer manufacturer = Manufacturer.fromJson(item);
@@ -108,7 +129,7 @@ class PharmacyModuleService extends BaseService {
           'id,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage,reviews',
     };
     try {
-      await baseAppClient.get(GET_PHARMACY_BEST_SELLER_PRODUCT, onSuccess: (dynamic response, int statusCode) {
+      await baseAppClient.getPharmacy(GET_PHARMACY_BEST_SELLER_PRODUCT, onSuccess: (dynamic response, int statusCode) {
         bestSellerProducts.clear();
         response['products'].forEach((item) {
           bestSellerProducts.add(PharmacyProduct.fromJson(item));
@@ -127,7 +148,7 @@ class PharmacyModuleService extends BaseService {
     if (await this.sharedPref.getString(PHARMACY_LAST_VISITED_PRODUCTS) != null) {
       lastVisited = await this.sharedPref.getString(PHARMACY_LAST_VISITED_PRODUCTS);
       try {
-        await baseAppClient.get("$GET_PHARMACY_PRODUCTs_BY_IDS$lastVisited", onSuccess: (dynamic response, int statusCode) {
+        await baseAppClient.getPharmacy("$GET_PHARMACY_PRODUCTs_BY_IDS$lastVisited", onSuccess: (dynamic response, int statusCode) {
           lastVisitedProducts.clear();
           response['products'].forEach((item) {
             lastVisitedProducts.add(PharmacyProduct.fromJson(item));

lib/core/service/parmacyModule/prescription_service.dart

@@ -21,7 +21,7 @@ class PrescriptionService extends BaseService {
     hasError = false;
     url = PRESCRIPTION;
     print("Print PRESCRIPTION url" + url);
-    await baseAppClient.get(url,
+    await baseAppClient.post(url,
         onSuccess: (dynamic response, int statusCode) {
           _prescriptionsList.clear();
           response['PatientPrescriptionList'].forEach((item) {

lib/core/service/pharmacy_categorise_service.dart

@@ -56,7 +56,7 @@ class PharmacyCategoriseService extends BaseService {
   Future getCategorise() async {
     hasError = false;
     _categoriseList.clear();
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       GET_PHARMACY_CATEGORISE,
       onSuccess: (dynamic response, int statusCode) {
         response['categories'].forEach((item) {
@@ -74,7 +74,7 @@ class PharmacyCategoriseService extends BaseService {
     hasError = false;
     _scanList.clear();
     String endPoint = id != null ? SCAN_QR_CODE + "$id" : SCAN_QR_CODE + "";
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       endPoint,
       onSuccess: (dynamic response, int statusCode) {
         response['products'].forEach((item) {
@@ -94,7 +94,7 @@ class PharmacyCategoriseService extends BaseService {
     String endPoint = productName != null
         ? GET_SEARCH_PRODUCTS + "$productName" + '&language_id=1'
         : GET_SEARCH_PRODUCTS + "";
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       endPoint,
       onSuccess: (dynamic response, int statusCode) {
         response['products'].forEach((item) {
@@ -111,7 +111,7 @@ class PharmacyCategoriseService extends BaseService {
   Future getBrands() async {
     hasError = false;
     _brandsList.clear();
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       GET_BRANDS_LIST,
       onSuccess: (dynamic response, int statusCode) {
         response['manufacturer'].forEach((item) {
@@ -130,7 +130,7 @@ class PharmacyCategoriseService extends BaseService {
     _parentCategoriseList.clear();
     String endPoint =
         id != null ? GET_CATEGORISE_PARENT + "$id" : GET_CATEGORISE_PARENT + "";
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       endPoint,
       onSuccess: (dynamic response, int statusCode) {
         response['categories'].forEach((item) {
@@ -150,7 +150,7 @@ class PharmacyCategoriseService extends BaseService {
     String endPoint = id != null
         ? GET_PARENT_PRODUCTS + "$id" + '&page=1&limit=50'
         : GET_PARENT_PRODUCTS + "";
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       endPoint,
       onSuccess: (dynamic response, int statusCode) {
         response['products'].forEach((item) {
@@ -170,7 +170,7 @@ class PharmacyCategoriseService extends BaseService {
 
     String endPoint =
         id != null ? GET_SUB_CATEGORISE + "$id" : GET_SUB_CATEGORISE + "";
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       endPoint,
       onSuccess: (dynamic response, int statusCode) {
         response['categories'].forEach((item) {
@@ -190,7 +190,7 @@ class PharmacyCategoriseService extends BaseService {
     String endPoint = id != null
         ? GET_SUB_PRODUCTS + "$id" + '&page=1&limit=50'
         : GET_SUB_PRODUCTS + "";
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       endPoint,
       onSuccess: (dynamic response, int statusCode) {
         response['products'].forEach((item) {
@@ -209,7 +209,7 @@ class PharmacyCategoriseService extends BaseService {
     _finalProducts.clear();
     String endPoint =
         id != null ? GET_FINAL_PRODUCTS + "$id" : GET_FINAL_PRODUCTS + "";
-    await baseAppClient.get(
+    await baseAppClient.getPharmacy(
       endPoint,
       onSuccess: (dynamic response, int statusCode) {
         response['products'].forEach((item) {

lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart

@@ -51,6 +51,27 @@ class PharmacyModuleViewModel extends BaseViewModel {
     }
   }
 
+  Future createUser() async {
+    setState(ViewState.Busy);
+    await _pharmacyService.createUser();
+    if (_pharmacyService.hasError) {
+      error = _pharmacyService.error;
+      setState(ViewState.ErrorLocal);
+    } else {
+      setState(ViewState.Idle);
+    }
+  }
+  Future generatePharmacyToken() async {
+    setState(ViewState.Busy);
+    await _pharmacyService.generatePharmacyToken();
+    if (_pharmacyService.hasError) {
+      error = _pharmacyService.error;
+      setState(ViewState.ErrorLocal);
+    } else {
+      setState(ViewState.Idle);
+    }
+  }
+
   Future getBannerList() async {
     setState(ViewState.Busy);
     await _pharmacyService.getBannerListList();

lib/pages/DrawerPages/family/my-family.dart

@@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
 import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart';
 import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/locator.dart';
 import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
@@ -58,6 +59,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
   ProjectViewModel projectViewModel;
   AuthenticatedUser user;
   VitalSignService _vitalSignService = locator<VitalSignService>();
+  PharmacyModuleViewModel pharmacyModuleViewModel = locator<PharmacyModuleViewModel>();
+
   var isVaiable = false;
   @override
   void initState() {
@@ -728,6 +731,12 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
         authenticatedUserObject.user;
     Provider.of<ProjectViewModel>(context, listen: false)
         .setUser(authenticatedUserObject.user);
+
+   await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
+      if(pharmacyModuleViewModel.error.isNotEmpty)
+        await pharmacyModuleViewModel.createUser();
+    });
+
     appointmentRateViewModel
         .getIsLastAppointmentRatedList()
         .then((value) => {

lib/pages/landing/landing_page_pharmcy.dart

@@ -180,7 +180,7 @@ class _LandingPagePharmacyState extends State<LandingPagePharmacy> {
       try {
         String barcode = result;
         GifLoaderDialogUtils.showMyDialog(context);
-        await BaseAppClient().get("$GET_PHARMACY_PRODUCTs_BY_SKU$barcode",
+        await BaseAppClient().getPharmacy("$GET_PHARMACY_PRODUCTs_BY_SKU$barcode",
             onSuccess: (dynamic response, int statusCode) {
           print(response);
           var product = PharmacyProduct.fromJson(response["products"][0]);

lib/pages/login/confirm-login.dart

@@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/config/size_config.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
 import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/locator.dart';
 import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
@@ -45,6 +46,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
   var sharedPref = new AppSharedPreferences();
   bool authenticated;
   final authService = new AuthProvider();
+  PharmacyModuleViewModel pharmacyModuleViewModel = locator<PharmacyModuleViewModel>();
   int mobileNumber;
   String errorMsg = '';
   SelectDeviceIMEIRES user;
@@ -592,6 +594,13 @@ class _ConfirmLogin extends State<ConfirmLogin> {
     Provider.of<ProjectViewModel>(context, listen: false)
         .setUser(authenticatedUserObject.user);
     getToDoCount();
+
+   await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
+      if(pharmacyModuleViewModel.error.isNotEmpty)
+        await pharmacyModuleViewModel.createUser();
+    });
+
+
     appointmentRateViewModel
         .getIsLastAppointmentRatedList()
         .then((value) => {

lib/pages/login/login.dart

@@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/config/size_config.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
 import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/locator.dart';
 import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
@@ -48,6 +49,7 @@ class _Login extends State<Login> {
   var sharedPref = new AppSharedPreferences();
   bool isLoading = false;
   AppointmentRateViewModel appointmentRateViewModel = locator<AppointmentRateViewModel>();
+  PharmacyModuleViewModel pharmacyModuleViewModel = locator<PharmacyModuleViewModel>();
 
   AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>();
 
@@ -256,6 +258,12 @@ class _Login extends State<Login> {
       appointmentRateViewModel.isLogin = true;
       projectViewModel.isLogin = true;
       projectViewModel.user = authenticatedUserObject.user;
+
+     await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
+        if(pharmacyModuleViewModel.error.isNotEmpty)
+         await pharmacyModuleViewModel.createUser();
+      });
+
       appointmentRateViewModel
           .getIsLastAppointmentRatedList()
           .then((value) => {

lib/services/pharmacy_services/pharmacyAddress_service.dart

@@ -16,7 +16,7 @@ class PharmacyAddressService extends BaseService {
     hasError = false;
     Addresses selectedAddress;
     try {
-      await baseAppClient.get("$GET_CUSTOMERS_ADDRESSES$customerId",
+      await baseAppClient.getPharmacy("$GET_CUSTOMERS_ADDRESSES$customerId",
           onSuccess: (dynamic response, int statusCode) async {
         addresses.clear();
         var savedAddress =
@@ -45,7 +45,7 @@ class PharmacyAddressService extends BaseService {
   Future getCountries(String countryName) async {
     hasError = false;
     try {
-      await baseAppClient.get("$PHARMACY_GET_COUNTRY",
+      await baseAppClient.getPharmacy("$PHARMACY_GET_COUNTRY",
           onSuccess: (dynamic response, int statusCode) {
         // countries.clear();
         response['countries'].forEach((item) {

lib/services/pharmacy_services/product_detail_service.dart

@@ -104,7 +104,7 @@ class ProductDetailService extends BaseService {
 
   Future notifyMe(customerId, itemID) async {
     hasError = false;
-    await baseAppClient.get(SUBSCRIBE_PRODUCT + "SinceId=$customerId&ProductId=$itemID", onSuccess: (dynamic response, int statusCode) {
+    await baseAppClient.getPharmacy(SUBSCRIBE_PRODUCT + "SinceId=$customerId&ProductId=$itemID", onSuccess: (dynamic response, int statusCode) {
       AppToast.showSuccessToast(message: 'You will be notified when product available');
     }, onFailure: (String error, int statusCode) {
       hasError = true;

lib/widgets/drawer/app_drawer_widget.dart

@@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
 import 'package:diplomaticquarterapp/core/service/medical/vital_sign_service.dart';
 import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart';
 import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
 import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
@@ -43,6 +44,7 @@ class _AppDrawerState extends State<AppDrawer> {
   ProjectViewModel projectProvider;
   var sharedPref = new AppSharedPreferences();
   var familyFileProvider = FamilyFilesProvider();
+  PharmacyModuleViewModel pharmacyModuleViewModel = locator<PharmacyModuleViewModel>();
   AuthenticatedUser user;
   AuthenticatedUser mainUser;
   AuthenticatedUserObject authenticatedUserObject =
@@ -593,6 +595,11 @@ class _AppDrawerState extends State<AppDrawer> {
         authenticatedUserObject.user;
     Provider.of<ProjectViewModel>(context, listen: false)
         .setUser(authenticatedUserObject.user);
+   await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
+      if(pharmacyModuleViewModel.error.isNotEmpty)
+        await pharmacyModuleViewModel.createUser();
+    });
+
     appointmentRateViewModel
         .getIsLastAppointmentRatedList()
         .then((value) => {