Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[No QA] Use Ping endpoint for internet reachability instead of API root #18460

Merged
merged 6 commits into from
May 15, 2023
Merged

[No QA] Use Ping endpoint for internet reachability instead of API root #18460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76912ff
Use Ping endpoint for internet reachability instead of API root
roryabraham May 4, 2023
508cad7
Update Podfile.lock
roryabraham May 5, 2023
736f33b
Merge branch 'main' into Rory-PingAuth
roryabraham May 9, 2023
9078026
Fix prettier
roryabraham May 9, 2023
76cc420
Merge branch 'main' into Rory-PingAuth
roryabraham May 12, 2023
1882ba3
Merge branch 'main' into Rory-PingAuth
roryabraham May 13, 2023
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
4 changes: 2 additions & 2 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ PODS:
- React-Core
- react-native-key-command (1.0.0):
- React-Core
- react-native-netinfo (8.3.1):
- react-native-netinfo (9.3.9):
- React-Core
- react-native-pdf (6.6.2):
- React-Core
Expand Down Expand Up @@ -1080,7 +1080,7 @@ SPEC CHECKSUMS:
react-native-image-manipulator: c48f64221cfcd46e9eec53619c4c0374f3328a56
react-native-image-picker: c33d4e79f0a14a2b66e5065e14946ae63749660b
react-native-key-command: 0b3aa7c9f5c052116413e81dce33a3b2153a6c5d
react-native-netinfo: 1a6035d3b9780221d407c277ebfb5722ace00658
react-native-netinfo: 22c082970cbd99071a4e5aa7a612ac20d66b08f0
react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa
react-native-performance: 224bd53e6a835fda4353302cf891d088a0af7406
react-native-plaid-link-sdk: 9eb0f71dad94b3bdde649c7a384cba93024af46c
Expand Down
11 changes: 7 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@react-native-camera-roll/camera-roll": "5.4.0",
"@react-native-community/clipboard": "^1.5.1",
"@react-native-community/datetimepicker": "^3.5.2",
"@react-native-community/netinfo": "^8.3.0",
"@react-native-community/netinfo": "^9.3.9",
"@react-native-community/progress-bar-android": "^1.0.4",
"@react-native-community/progress-view": "^1.2.3",
"@react-native-firebase/analytics": "^12.3.0",
Expand Down
11 changes: 10 additions & 1 deletion src/libs/NetworkConnection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,16 @@ function subscribeToNetInfo() {
// When App is served locally (or from Electron) this address is always reachable - even offline
// Using the API url ensures reachability is tested over internet
reachabilityUrl: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn this have the Ping command in the ULR?

reachabilityTest: (response) => Promise.resolve(response.status === 200),
reachabilityMethod: 'GET',
reachabilityTest: (response) => {
if (!response.ok) {
return Promise.resolve(false);
}
return response
.json()
.then((json) => Promise.resolve(json.jsonCode === 200))
.catch(() => Promise.resolve(false));
},

// If a check is taking longer than this time we're considered offline
reachabilityRequestTimeout: CONST.NETWORK.MAX_PENDING_TIME_MS,
Expand Down