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.

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

logo data uri encoding #1527

Merged
merged 2 commits into from
Feb 27, 2018
Merged

logo data uri encoding #1527

merged 2 commits into from
Feb 27, 2018

Conversation

RedSparr0w
Copy link
Member

@RedSparr0w RedSparr0w commented Feb 26, 2018

currently you need to replace any base64 logos + characters with %2B in order for the logo to show correctly:

Examples:

using +:

data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IlRyYWNlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDIwNSAyMDUiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDIwNSAyMDU7IiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDB7ZmlsbDojRTY5MzBCO30uc3Qxe2ZpbGw6I0ZFRkRGQzt9LnN0MntmaWxsOiNEQjczMDM7fS5zdDN7ZmlsbDojRjhCNjJCO30uc3Q0e2ZpbGw6I0ZGMDAwMDt9PC9zdHlsZT48cGF0aCBjbGFzcz0ic3QwIiBkPSJNMTUuMywxMDIuNmMtMC43LTQ3LjksNDAuNS04OC4xLDg4LjYtODcuOWM0NSwwLjIsODkuOCwzOC41LDg3LjUsOTIuN2MtMS45LDQ0LjQtMzkuNiw4NC41LTg5LjksODMuNkM1NCwxOTAsMTQuNSwxNTAuMiwxNS4zLDEwMi42eiBNMzIuMyw5NS41YzAuMiwzLjMsMC42LDYuNSwzLjksNy44YzMuNCwxLjMsNS0xLjcsNi44LTMuOGMxLjEtMS4yLDEuOS0yLjcsMi44LTQuMUM1Mi44LDgzLDU5LjksNzAuNiw2Ni45LDU4LjFjMS41LTIuNywyLjctNS43LDMuOS04LjZjMC43LTEuOCwxLjctNC4yLDAuMS01LjZjLTItMS44LTQsMC4yLTUuOCwxLjJjLTEwLjEsNS43LTE3LjMsMTQuNS0yMy4yLDI0LjJDMzYuOSw3Ny4zLDMzLjUsODYuMiwzMi4zLDk1LjV6IE04Ny4yLDI3LjRjLTQuMi0wLjEtNy43LDMuNC03LjYsNy42YzAuMSwzLjksMy40LDcuMiw3LjQsNy4zYzQuMSwwLjEsNy4zLTMsNy41LTcuMUM5NC43LDMwLjgsOTEuNSwyNy41LDg3LjIsMjcuNHoiLz48cGF0aCBjbGFzcz0ic3QxIiBkPSJNMzIuMyw5NS41YzEuMS05LjQsNC42LTE4LjIsOS41LTI2LjNjNS45LTkuNywxMy4xLTE4LjQsMjMuMi0yNC4yYzEuOC0xLDMuOC0zLDUuOC0xLjJjMS42LDEuNSwwLjYsMy44LTAuMSw1LjZjLTEuMiwyLjktMi4zLDUuOS0zLjksOC42Yy03LDEyLjUtMTQuMSwyNC44LTIxLjEsMzcuMmMtMC44LDEuNC0xLjcsMi45LTIuOCw0LjFjLTEuOCwyLjEtMy40LDUuMS02LjgsMy44QzMzLDEwMiwzMi42LDk4LjgsMzIuMyw5NS41eiIvPjxlbGxpcHNlIHRyYW5zZm9ybT0ibWF0cml4KDAuNzU5NyAtMC42NTAzIDAuNjUwMyAwLjc1OTcgLTU2LjU0NjYgMTI1LjY5NjEpIiBjbGFzcz0ic3QyIiBjeD0iMTQxLjgiIGN5PSIxMzkuNCIgcng9IjYyLjUiIHJ5PSI0MS41Ii8+PHBhdGggY2xhc3M9InN0MyIgZD0iTTg2LjMsMjAxLjFjLTQwLjQtNy4zLTcyLjgtMzcuNC04MS42LTc3LjNjLTAuOC0zLjctMi41LTE4LjMtMi41LTIxLjljMC0zLjMsMS4zLTE0LDEuNy0xNmM4LjktNDIuNiwzNC41LTY5LjIsNzYuNC04MC40YzMuMy0wLjksNi45LTEuNiwxMC45LTIuNmM0LjktMC42LDkuMS0wLjgsMTIuNS0wLjdjNy42LDAuMiwxMS41LDAuNiwxMi4yLDAuN2M0NS40LDcsNzUuNSwzNy4yLDg0LjYsNzcuN2MwLjksNC4xLDMuOCwyNi40LDEsMzkuM2MtNywzOS44LTM2LjYsNzEuMS03NS45LDgwLjJDMTIxLjUsMjAxLDEwMS4zLDIwMy45LDg2LjMsMjAxLjF6IE0xNS4zLDEwMi42Yy0wLjgsNDcuNiwzOC43LDg3LjQsODYuMiw4OC40YzUwLjMsMSw4OC4xLTM5LjIsODkuOS04My42YzIuMy01NC4yLTQyLjQtOTIuNi04Ny41LTkyLjdDNTUuOCwxNC41LDE0LjUsNTQuNiwxNS4zLDEwMi42eiIvPjxwYXRoIGNsYXNzPSJzdDEiIGQ9Ik04Ny4yLDI3LjRjNC4zLDAuMSw3LjQsMy40LDcuMiw3LjhjLTAuMiw0LjEtMy40LDcuMS03LjUsNy4xYy00LDAtNy4zLTMuNC03LjQtNy4zQzc5LjUsMzAuOCw4My4xLDI3LjMsODcuMiwyNy40eiIvPjxwb2x5Z29uIGNsYXNzPSJzdDQiIHBvaW50cz0iMTExLjIsMTIwLjMgOTkuMywxMTEuMSA4NSwxMTUuNiA5MC4xLDEwMS41IDgxLjQsODkuMyA5Ni40LDg5LjggMTA1LjQsNzcuNyAxMDkuNSw5Mi4xIDEyMy43LDk2LjkgMTExLjMsMTA1LjMgIi8+PC9zdmc+

+%2B:

data:image/svg%2bxml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IlRyYWNlIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDIwNSAyMDUiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDIwNSAyMDU7IiB4bWw6c3BhY2U9InByZXNlcnZlIj48c3R5bGUgdHlwZT0idGV4dC9jc3MiPi5zdDB7ZmlsbDojRTY5MzBCO30uc3Qxe2ZpbGw6I0ZFRkRGQzt9LnN0MntmaWxsOiNEQjczMDM7fS5zdDN7ZmlsbDojRjhCNjJCO30uc3Q0e2ZpbGw6I0ZGMDAwMDt9PC9zdHlsZT48cGF0aCBjbGFzcz0ic3QwIiBkPSJNMTUuMywxMDIuNmMtMC43LTQ3LjksNDAuNS04OC4xLDg4LjYtODcuOWM0NSwwLjIsODkuOCwzOC41LDg3LjUsOTIuN2MtMS45LDQ0LjQtMzkuNiw4NC41LTg5LjksODMuNkM1NCwxOTAsMTQuNSwxNTAuMiwxNS4zLDEwMi42eiBNMzIuMyw5NS41YzAuMiwzLjMsMC42LDYuNSwzLjksNy44YzMuNCwxLjMsNS0xLjcsNi44LTMuOGMxLjEtMS4yLDEuOS0yLjcsMi44LTQuMUM1Mi44LDgzLDU5LjksNzAuNiw2Ni45LDU4LjFjMS41LTIuNywyLjctNS43LDMuOS04LjZjMC43LTEuOCwxLjctNC4yLDAuMS01LjZjLTItMS44LTQsMC4yLTUuOCwxLjJjLTEwLjEsNS43LTE3LjMsMTQuNS0yMy4yLDI0LjJDMzYuOSw3Ny4zLDMzLjUsODYuMiwzMi4zLDk1LjV6IE04Ny4yLDI3LjRjLTQuMi0wLjEtNy43LDMuNC03LjYsNy42YzAuMSwzLjksMy40LDcuMiw3LjQsNy4zYzQuMSwwLjEsNy4zLTMsNy41LTcuMUM5NC43LDMwLjgsOTEuNSwyNy41LDg3LjIsMjcuNHoiLz48cGF0aCBjbGFzcz0ic3QxIiBkPSJNMzIuMyw5NS41YzEuMS05LjQsNC42LTE4LjIsOS41LTI2LjNjNS45LTkuNywxMy4xLTE4LjQsMjMuMi0yNC4yYzEuOC0xLDMuOC0zLDUuOC0xLjJjMS42LDEuNSwwLjYsMy44LTAuMSw1LjZjLTEuMiwyLjktMi4zLDUuOS0zLjksOC42Yy03LDEyLjUtMTQuMSwyNC44LTIxLjEsMzcuMmMtMC44LDEuNC0xLjcsMi45LTIuOCw0LjFjLTEuOCwyLjEtMy40LDUuMS02LjgsMy44QzMzLDEwMiwzMi42LDk4LjgsMzIuMyw5NS41eiIvPjxlbGxpcHNlIHRyYW5zZm9ybT0ibWF0cml4KDAuNzU5NyAtMC42NTAzIDAuNjUwMyAwLjc1OTcgLTU2LjU0NjYgMTI1LjY5NjEpIiBjbGFzcz0ic3QyIiBjeD0iMTQxLjgiIGN5PSIxMzkuNCIgcng9IjYyLjUiIHJ5PSI0MS41Ii8%2bPHBhdGggY2xhc3M9InN0MyIgZD0iTTg2LjMsMjAxLjFjLTQwLjQtNy4zLTcyLjgtMzcuNC04MS42LTc3LjNjLTAuOC0zLjctMi41LTE4LjMtMi41LTIxLjljMC0zLjMsMS4zLTE0LDEuNy0xNmM4LjktNDIuNiwzNC41LTY5LjIsNzYuNC04MC40YzMuMy0wLjksNi45LTEuNiwxMC45LTIuNmM0LjktMC42LDkuMS0wLjgsMTIuNS0wLjdjNy42LDAuMiwxMS41LDAuNiwxMi4yLDAuN2M0NS40LDcsNzUuNSwzNy4yLDg0LjYsNzcuN2MwLjksNC4xLDMuOCwyNi40LDEsMzkuM2MtNywzOS44LTM2LjYsNzEuMS03NS45LDgwLjJDMTIxLjUsMjAxLDEwMS4zLDIwMy45LDg2LjMsMjAxLjF6IE0xNS4zLDEwMi42Yy0wLjgsNDcuNiwzOC43LDg3LjQsODYuMiw4OC40YzUwLjMsMSw4OC4xLTM5LjIsODkuOS04My42YzIuMy01NC4yLTQyLjQtOTIuNi04Ny41LTkyLjdDNTUuOCwxNC41LDE0LjUsNTQuNiwxNS4zLDEwMi42eiIvPjxwYXRoIGNsYXNzPSJzdDEiIGQ9Ik04Ny4yLDI3LjRjNC4zLDAuMSw3LjQsMy40LDcuMiw3LjhjLTAuMiw0LjEtMy40LDcuMS03LjUsNy4xYy00LDAtNy4zLTMuNC03LjQtNy4zQzc5LjUsMzAuOCw4My4xLDI3LjMsODcuMiwyNy40eiIvPjxwb2x5Z29uIGNsYXNzPSJzdDQiIHBvaW50cz0iMTExLjIsMTIwLjMgOTkuMywxMTEuMSA4NSwxMTUuNiA5MC4xLDEwMS41IDgxLjQsODkuMyA5Ni40LDg5LjggMTA1LjQsNzcuNyAxMDkuNSw5Mi4xIDEyMy43LDk2LjkgMTExLjMsMTA1LjMgIi8%2bPC9zdmc%2b

This PR removes that extra step by replacing any whitespace \s with a + character.
As any + characters in the query param get replaced with a space.

no longer need to replace `+` with `%2B`
@shields-ci
Copy link

shields-ci commented Feb 26, 2018

Messages
📖

✨ Thanks for your contribution to Shields, @RedSparr0w!

Generated by 🚫 dangerJS

Copy link
Member

@PyvesB PyvesB left a comment

Choose a reason for hiding this comment

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

This change looks good to me! Two observations though:

  • would a short comment be useful? I can foresee some head scratching when I look at this piece of code again in six months time! 😄
  • could you add an additional case in the existing test function to make sure this change is actually covered?

@RedSparr0w
Copy link
Member Author

Good idea!
Not quite sure how to test this correctly,
As it already tests when given a logo string including a +, but because its given directly, the + doesn't get converted to a (space).
So i have just added a test which uses a (space) in place of the +.
Do you think that works okay @PyvesB?

    makeLogo()
      when given 'gratipay' and {"logo":"image/svg+xml;base64,PHN2ZyB4bWxu"}
        ✓ should return 'data:image/svg+xml;base64,PHN2ZyB4bWxu'
      when given 'gratipay' and {"logo":"data:image/svg+xml;base64,PHN2ZyB4bWxu"}
        ✓ should return 'data:image/svg+xml;base64,PHN2ZyB4bWxu'
      when given 'gratipay' and {"logo":"data:image/svg xml;base64,PHN2ZyB4bWxu"}
        ✓ should return 'data:image/svg+xml;base64,PHN2ZyB4bWxu'

Copy link
Member

@PyvesB PyvesB left a comment

Choose a reason for hiding this comment

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

I had a similar test in mind, it should do the trick! The comment is helpful as well. Well done! 😉

@RedSparr0w
Copy link
Member Author

Thanks for reviewing @PyvesB 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants