<p dir="auto">Implements proposal discussed in <a href="https://github.com/openstreetmap/openstreetmap-website/issues/4128" data-hovercard-type="issue" data-hovercard-url="/openstreetmap/openstreetmap-website/issues/4128/hovercard">Issue 4128</a>.</p>
<ul dir="auto">
<li>
<p dir="auto">Merge Signup screen and Terms screen during signup process.</p>
</li>
<li>
<p dir="auto">Use links to Contributor terms and Terms of use instead of in-place edit box.</p>
</li>
<li>
<p dir="auto">Terms screen used for accepting the new terms left unchanged.</p>
</li>
<li>
<p dir="auto">Re-arranged signup and login screens to feel like two tabs as in <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="1828864000" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/4128" data-hovercard-type="issue" data-hovercard-url="/openstreetmap/openstreetmap-website/issues/4128/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/issues/4128">#4128</a>.</p>
</li>
<li>
<p dir="auto">Add <code class="notranslate">preferred_auth_provider</code> parameter to signup and login screens, as well as the authorization request.<br>
This allows 3rd party apps to initiate authorization by adding <code class="notranslate">preferred_auth_provider</code></p>
<p dir="auto">Screenshots in dev environment:</p>
</li>
</ul>
<p dir="auto"><a href="https://github.com/openstreetmap/openstreetmap-website/assets/99971018/0743bde6-90e6-4bd8-aacc-f9516499024c">image.png (view on web)</a></p>
<p dir="auto"><a href="https://github.com/openstreetmap/openstreetmap-website/assets/99971018/6547e215-8e15-4e72-bd80-8157b503efa6">image.png (view on web)</a></p>
<p dir="auto"><a href="https://github.com/openstreetmap/openstreetmap-website/assets/99971018/6d14af71-5197-40c6-a361-394ab4c087c0">image.png (view on web)</a></p>
<p dir="auto"><a href="https://github.com/openstreetmap/openstreetmap-website/assets/99971018/ca0b6fcd-b691-4f47-9b9b-44ad256d39d8">image.png (view on web)</a></p>
<p dir="auto"><a href="https://github.com/openstreetmap/openstreetmap-website/assets/99971018/82c2263e-f5ef-46c3-ab70-bcf3fdb7cc59">image.png (view on web)</a></p>
<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/openstreetmap/openstreetmap-website/pull/4455'>https://github.com/openstreetmap/openstreetmap-website/pull/4455</a></p>
<h4>Commit Summary</h4>
<ul>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/commits/d734cb50298df3024c97768204807d2085d73cab" class="commit-link">d734cb5</a> Merge login and terms screens</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/commits/225a91b60d65ad2b10ead6e3f8ad9aa3de55c589" class="commit-link">225a91b</a> users_controller: Assume TOU and contirbutor terms are accepted on /user/new form</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/commits/d92d02dcc1a899b743301c0e045679455c9d7f56" class="commit-link">d92d02d</a> Remove email confirmation field in signup form</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/commits/b378781563832c3260a697d8bb494064b8f3e9f2" class="commit-link">b378781</a> One column signup, remove .about.paragraph_2</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/commits/1a44b0b820b0c515f742da86edb9af838f16fc48" class="commit-link">1a44b0b</a> Login/Signup tabs, separate page for creating association between 3rd party login and OSM account</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/commits/6d9bebd421a982cb6c2b390c0b7d024848649414" class="commit-link">6d9bebd</a> Remove the globe from /users/new and /users/new_association</li>
<li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/commits/560b8c234762e84b1717f19d4ba8adc33b15bb3a" class="commit-link">560b8c2</a> Add preferred provider to login and signup pages</li>
</ul>
<h4 style="display: inline-block">File Changes </h4> <p style="display: inline-block">(<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files">23 files</a>)</p>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-29beaabe278fd17493296745cecb67919f0906b47b8246ab770f5517615d9ef7">.rubocop_todo.yml</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-debf59904131dc89a88ab44cbb1d6deaaa5a7d70c0507f674080df62f7c8e41f">app/abilities/ability.rb</a>
(2)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-4218c327342777c9de158b4e68cf4c6ef8e5b10cbb8f6aaf4944705d221821ab">app/assets/javascripts/auth_providers.js</a>
(22)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-45b32fb630c4dedc980d452167de5634dfad0500a1bec34bc843e018954c6876">app/assets/javascripts/login.js</a>
(21)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-e86a39e6d0b163f152db8843fc7d647a3f5d648de4a74f1732bef4474b6e5bc8">app/assets/stylesheets/common.scss</a>
(72)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-766c34fd6533171eaf54300c153f89d6002c35c02cfc9c5b219251f85180ad07">app/controllers/application_controller.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-cdec550eeeb8fc63be2b5687170f594651a8d0b7f0465c9d807baef392639b6e">app/controllers/sessions_controller.rb</a>
(3)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-cfdccd0a9d5df5a43aaad2a35d36ebbe187c52ad5fdc9846fa189d04537adb6e">app/controllers/users_controller.rb</a>
(175)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-b4fc005393d27baeb208c32dfc3bd576364fa35e6d76a69ea8b99da62616f80e">app/helpers/user_helper.rb</a>
(16)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-9802ca3c9c4cf89904fd44bc114e35ebdf2c5dd3d5b645491e2b253e1afef29b">app/models/user.rb</a>
(2)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-5a9b0e7aa9d3862ba8103db51b8b44b6e392cb43f22bba850bf95e0be7b53e4f">app/views/application/_auth_providers.html.erb</a>
(38)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-5654cfc158c888a40321c1e90f9ea3a0208ae80616b15ff0fa5e939b8f795e87">app/views/sessions/new.html.erb</a>
(63)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-8dd599ea27028815c7fa912755a38dd05e4a768470cc792840b85fd1e486d69a">app/views/users/new.html.erb</a>
(76)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-615b54e6063580211c09ff174ee43b75546ca1ea9efd0ac67f48e2d9c1cee049">app/views/users/new_association.erb</a>
(52)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-44438ce218f5287c58d0017f965d888715635d94280669896f75841fbd7b4cd7">config/locales/en.yml</a>
(102)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-959bc9abc46a55332bb64d5155a79323afa75a50ec1a2137ddd22d926f62c6c5">config/routes.rb</a>
(2)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-0d2e03e45f001516dac5c734d8c0cdbff7a73028598ed5d2f9f8623e52c6099e">test/controllers/confirmations_controller_test.rb</a>
(29)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-0ebf4c65ae927de1d02650f4caa7f2810e14eb64201b7570cb30939f0ee38719">test/controllers/sessions_controller_test.rb</a>
(1)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-2719d3c650da3c587f727ca3c105e6bc93a7113f85717bb15983543cf4f85ae5">test/controllers/users_controller_test.rb</a>
(130)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-19aa16b7c7e0598a9b16e64733cafc53ac88bc34c658524342c0a0bffde8affc">test/integration/user_creation_test.rb</a>
(451)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-c01b7ed27f3565249b8271e0cadf4f76775b4dfe17d692da655e838150f5c497">test/integration/user_login_test.rb</a>
(12)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-6a9ebe0fb9027782384e3e1db9e38d6e050d8e4b4be87a3b3c2cfae599541028">test/system/confirmation_resend_test.rb</a>
(5)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455/files#diff-18d5b788986f58ce72b0d22695d761f641291806f2abd7e076552194de3bf74b">test/system/user_signup_test.rb</a>
(29)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/4455.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/4455.patch</a></li>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/4455.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/4455.diff</a></li>
</ul>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/4455">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLI3AOKKY7PWJDKPIODYMVNXFAVCNFSM6AAAAABBLOL2OWVHI2DSMVQWIX3LMV43ASLTON2WKOZSGA3DIMBVG43TOMY">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLOPNDMB2HDM5UYUDCTYMVNXFA5CNFSM6AAAAABBLOL2OWWGG33NNVSW45C7OR4XAZNFJFZXG5LFVJRW63LNMVXHIX3JMTHHWBYFVU.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/4455</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/4455",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/4455",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>