Skip to content

Workaround: Authenticated wpcom url by using unmapped url #5742

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

Merged
merged 5 commits into from
May 24, 2017
Merged

Workaround: Authenticated wpcom url by using unmapped url #5742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03c4a18
Use unmapped url in reader detail page's browse menu
oguzkocer Apr 25, 2017
b033035
Add a workaround for custom domains in WPWebViewActivity level
oguzkocer Apr 25, 2017
6b84cda
Use unmapped url for all wpcom sites
oguzkocer May 11, 2017
aa40160
Remove now unnecessary unmapped url checks from other places
oguzkocer May 11, 2017
cb6442b
Don't go through unmapped url change if the address is not custom domain
oguzkocer May 24, 2017
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: 0 additions & 4 deletions WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,6 @@ public static void browsePostOrPage(Context context, SiteModel site, PostModel p
String shareableUrl = post.getLink();
String shareSubject = post.getTitle();
if (site.isWPCom()) {
if (!TextUtils.isEmpty(site.getUnmappedUrl())) {
// Custom domains are not properly authenticated due to a server side(?) issue, so this gets around that
url = url.replace(site.getUrl(), site.getUnmappedUrl());
}
WPWebViewActivity.openPostUrlByUsingGlobalWPCOMCredentials(context, url, shareableUrl, shareSubject);
} else if (site.isJetpackConnected()) {
WPWebViewActivity.openJetpackBlogPostPreview(context, url, shareableUrl, shareSubject, site.getFrameNonce());
Expand Down
21 changes: 18 additions & 3 deletions WordPress/src/main/java/org/wordpress/android/ui/WPWebViewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.inject.Inject;
Expand Down Expand Up @@ -275,15 +276,29 @@ protected void loadContent() {
String username = extras.getString(AUTHENTICATION_USER, "");
String password = extras.getString(AUTHENTICATION_PASSWD, "");
String authURL = extras.getString(AUTHENTICATION_URL);
if (extras.getBoolean(USE_GLOBAL_WPCOM_USER, false)) {
username = mAccountStore.getAccount().getUserName();
}

if (TextUtils.isEmpty(addressToLoad) || !UrlUtils.isValidUrlAndHostNotNull(addressToLoad)) {
AppLog.e(AppLog.T.UTILS, "Empty or null or invalid URL passed to WPWebViewActivity");
Toast.makeText(this, getText(R.string.invalid_site_url_message),
Toast.LENGTH_SHORT).show();
finish();
return;
}

if (extras.getBoolean(USE_GLOBAL_WPCOM_USER, false)) {
username = mAccountStore.getAccount().getUserName();

// Custom domains are not properly authenticated due to a server side(?) issue, so this gets around that
if (!addressToLoad.contains(".wordpress.com")) {
List<SiteModel> wpComSites = mSiteStore.getWPComSites();
for (SiteModel siteModel : wpComSites) {
// Only replace the url if we know the unmapped url and if it's a custom domain
if (!TextUtils.isEmpty(siteModel.getUnmappedUrl())
&& !siteModel.getUrl().contains(".wordpress.com")) {
addressToLoad = addressToLoad.replace(siteModel.getUrl(), siteModel.getUnmappedUrl());
}
}
}
}

if (TextUtils.isEmpty(authURL) && TextUtils.isEmpty(username) && TextUtils.isEmpty(password)) {
Expand Down