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

Fix login Facebook and Google issues #238

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix login Facebook and Google issues #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e72cc08
user agent issue when use google log in on android
nguyenduythuc Mar 13, 2019
4624a70
Merge pull request #1 from homedy-inc/patch-1
nguyenduythuc Mar 13, 2019
aed98af
Fix Facebook login issue on Android
nguyenduythuc Mar 13, 2019
43a7994
requiresMainQueueSetup
nguyenduythuc Mar 18, 2019
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
1 change: 1 addition & 0 deletions android/src/main/java/io/fullstack/oauth/OAuthManagerDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
mWebView.setVisibility(View.VISIBLE);
mWebView.getSettings().setJavaScriptEnabled(true);
mWebView.getSettings().setDomStorageEnabled(true);
mWebView.getSettings().setUserAgentString("Mozilla/5.0 (Linux; Android 4.1.1; Galaxy Nexus Build/JRO03C) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19");


LayoutParams layoutParams = this.getFullscreenLayoutParams(context);
Expand Down
7 changes: 6 additions & 1 deletion android/src/main/java/io/fullstack/oauth/OAuthManagerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,12 @@ public void authorize(
final String authVersion = (String) cfg.get("auth_version");
Activity activity = this.getCurrentActivity();
FragmentManager fragmentManager = activity.getFragmentManager();
String callbackUrl = "http://localhost/" + providerName;
String callbackUrl;
if (providerName.equals("facebook")) {
callbackUrl = "https://localhost/" + providerName;
} else {
callbackUrl = "http://localhost/" + providerName;
}

OAuthManagerOnAccessTokenListener listener = new OAuthManagerOnAccessTokenListener() {
public void onRequestTokenError(final Exception ex) {
Expand Down
5 changes: 5 additions & 0 deletions ios/OAuthManager/OAuthManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ - (dispatch_queue_t)methodQueue
return dispatch_queue_create("io.fullstack.oauth", DISPATCH_QUEUE_SERIAL);
}

+ (BOOL)requiresMainQueueSetup
{
return YES;
}

+ (instancetype)sharedManager {
dispatch_once(&onceToken, ^{
manager = [self new];
Expand Down