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

Fixes subdomain logging for rewards #1030

Merged
merged 2 commits into from
Dec 18, 2018
Merged

Fixes subdomain logging for rewards #1030

merged 2 commits into from
Dec 18, 2018

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Dec 6, 2018 •
edited
Loading

Resolves brave/brave-browser#2073

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

  • enable rewards
  • visit regular site (like clifton.io), wait 10s
  • go to settings page and make sure that favicon is there and if you click on it clifton.io is opened
  • visit stats.brave.com, wait 10s
  • go to settings page and make sure that favicon is not there and if you click on it brave.com is opened
  • visit brave.com, wait 10s
  • go to settings page and make sure that favicon is now there

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@NejcZdovc NejcZdovc self-assigned this Dec 6, 2018
NejcZdovc
NejcZdovc commented Dec 17, 2018
View reviewed changes
components/brave_rewards/browser/rewards_service_impl.cc
@@ -379,6 +379,8 @@ void RewardsServiceImpl::OnLoad(SessionID tab_id, const GURL& url) {
if (baseDomain == "")
return;

const std::string publisher_url = origin.scheme() + "://" + baseDomain + "/";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

an actual fix

Copy link
Member

Choose a reason for hiding this comment

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

note that this would return http:/// / https:/// for all IP address URLs

@NejcZdovc NejcZdovc force-pushed the sub-domains branch 4 times, most recently from 2062cd0 to 5056851 Compare December 17, 2018 19:40
ryanml
ryanml approved these changes Dec 18, 2018
View reviewed changes
Copy link
Contributor

@ryanml ryanml left a comment

Choose a reason for hiding this comment

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

++

@NejcZdovc NejcZdovc merged commit 7682910 into master Dec 18, 2018
@NejcZdovc NejcZdovc deleted the sub-domains branch December 18, 2018 08:48
@NejcZdovc
Copy link
Contributor Author

master (0.61) 7682910
0.60 0d62df6

NejcZdovc added a commit that referenced this pull request Dec 18, 2018
@NejcZdovc
Merge pull request #1030 from brave/sub-domains
0d62df6 
Fixes subdomain logging for rewards
@bbondy bbondy added this to the 0.60.x - Dev milestone Jan 14, 2019
@LaurenWags LaurenWags mentioned this pull request Feb 6, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@diracdeltas diracdeltas diracdeltas left review comments

@ryanml ryanml ryanml approved these changes

@bbondy bbondy Awaiting requested review from bbondy

@jasonrsadler jasonrsadler Awaiting requested review from jasonrsadler

Assignees

@NejcZdovc NejcZdovc

Labels
feature/rewards
Projects
None yet
Milestone
0.60.x - Release
Development

Successfully merging this pull request may close these issues.

Brave Rewards panel can have a mismatch for icon and URL
4 participants
@NejcZdovc @diracdeltas @ryanml @bbondy