Skip to content

Commit d75c72c

Browse files
Fix documentation for Wikimedia SSO (#511)
* Update document * Update document of social login settings * Add back dynamic domain + sub_path
1 parent 22ef419 commit d75c72c

File tree

2 files changed

+34
-11
lines changed

2 files changed

+34
-11
lines changed

src/pretix/plugins/socialauth/templates/socialauth/social_auth_settings.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,23 @@ <h1>{% trans "Social login settings" %}</h1>
5050
<td colspan="2">
5151
<div class="form-group">
5252
<label class="col-sm-3 control-label">
53-
{% trans "Client ID (Consumer token)" %}
53+
{% if provider == "mediawiki" %}
54+
{% trans "Client Application Key" %}
55+
{% else %}
56+
{% trans "Client ID" %}
57+
{% endif %}
5458
</label>
5559
<div class="col-sm-9">
5660
<input type="text" class="form-control" name="{{ provider }}_client_id" value="{{ settings.client_id }}">
5761
</div>
5862
</div>
5963
<div class="form-group">
6064
<label class="col-sm-3 control-label">
61-
{% trans "Secret (Consumer secret)" %}
65+
{% if provider == "mediawiki" %}
66+
{% trans "Client Application Secret" %}
67+
{% else %}
68+
{% trans "Secret" %}
69+
{% endif %}
6270
</label>
6371
<div class="col-sm-9">
6472
<input type="password" class="form-control" name="{{ provider }}_secret" value="{{ settings.secret }}">

src/pretix/plugins/socialauth/templates/socialauth/social_setup.html

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,34 @@ <h4><strong>{% trans "III. MediaWiki OAuth Application" %}</strong></h4>
6565
<li>{% trans "Register your OAuth application at:" %}
6666
<a href="https://meta.wikimedia.org/wiki/Special:OAuthConsumerRegistration/propose">MediaWiki OAuth Consumer Registration</a>
6767
</li>
68-
<li>{% trans "Set the callback URL to:" %}
69-
{% with callback_url=tickets_domain|add:"/accounts/mediawiki/login/callback/" %}
70-
<code>{{ callback_url }}</code>
71-
{% endwith %}
68+
<li>{% trans 'Click "Propose new OAuth 2.0 client"' %}</li>
69+
<li>
70+
{% trans "On the form enter" %}
71+
<ol type="a">
72+
<li>{% trans "an application name" %}</li>
73+
<li>{% trans "an description description" %}</li>
74+
<li>
75+
{% trans 'Set Oauth "callback" URL to:' %}
76+
{% with callback_url=tickets_domain|add:"/accounts/mediawiki/login/callback/" %}
77+
<code>{{ callback_url }}</code>
78+
{% endwith %}
79+
</li>
80+
<li>{% trans "Contact Email address" %}</li>
81+
<li>{% trans 'Tick "Client is confidential"' %}</li>
82+
<li>{% trans 'Tick "Authorization code"' %}</li>
83+
<li>{% trans 'Tick "Refresh token"' %}</li>
84+
<li>{% trans 'Choose "Request authorization for specific permissions."' %}</li>
85+
<li>{% trans 'In the section "Applicable grants" select "Basic Rights" and "Access private information"' %}</li>
86+
<li>{% trans "Finally tick the box to accept the terms and submit." %}</li>
87+
</ol>
7288
</li>
73-
<li>{% trans "Carefully read and follow the instructions on the registration page. Tick option: access private information." %}</li>
74-
<li>{% trans "The registered application will return:" %}
89+
<li>{% trans "On the next page copy the registered application will return the OAuth access information:" %}
7590
<ul>
76-
<li>{% trans "One consumer token (client id)" %}</li>
77-
<li>{% trans "One consumer secret" %}</li>
91+
<li>{% trans "Client application key" %}</li>
92+
<li>{% trans "Client application secret" %}</li>
7893
</ul>
7994
</li>
80-
<li>{% trans "Add the consumer key and consumer secret to your Eventyay admin settings" %}</li>
95+
<li>{% trans "Add the client application key and client application secret to your Eventyay social auth settings" %}</li>
8196
</ol>
8297

8398
<strong>{% trans "After Approval" %}</strong>

0 commit comments

Comments
 (0)