From ebe431c1af09527c7347193f4350db4328519ba4 Mon Sep 17 00:00:00 2001
From: Josh <195121232+partizipation@users.noreply.github.com>
Date: Thu, 12 Jun 2025 16:15:55 +0200
Subject: [PATCH 1/3] templates: add next param for github oauth sso

---
 .../socialaccount/snippets/provider_list.html        | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/adhocracy-plus/templates/socialaccount/snippets/provider_list.html b/adhocracy-plus/templates/socialaccount/snippets/provider_list.html
index 56808dd6e..fdb9576cd 100644
--- a/adhocracy-plus/templates/socialaccount/snippets/provider_list.html
+++ b/adhocracy-plus/templates/socialaccount/snippets/provider_list.html
@@ -11,10 +11,14 @@ <h4>{% translate "Login with social media account" %}</h4>
                 {% if provider.id == "openid" %}
                 {% for brand in provider.get_brands %}
                 <div class="col-lg-6 pb-3">
-                    <a title="{{ brand.name }}"
-                       class="socialaccount-provider {{ provider.id }} {{ brand.id }}"
-                       href="{% provider_login_url provider.id openid=brand.openid_url process=process %}"
-                    >{{ brand.name }}</a>
+                    <a 
+                        title="{{ brand.name }}"
+                        class="socialaccount-provider {{ provider.id }} {{ brand.id }}"
+                        href="{% provider_login_url provider.id openid=brand.openid_url process=process %}
+                            {% if provider.id == 'github' %}?next=/accounts/3rdparty/signup/{% endif %}"
+                    >
+                        {{ brand.id }}
+                    </a>
                 </div>
                 {% endfor %}
                 {% endif %}

From c5b0db3502ae95316a65818b5e5371cd1c92ebb4 Mon Sep 17 00:00:00 2001
From: Josh <195121232+partizipation@users.noreply.github.com>
Date: Thu, 12 Jun 2025 16:54:09 +0200
Subject: [PATCH 2/3] add better github next param conditional

---
 .../templates/socialaccount/snippets/provider_list.html  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/adhocracy-plus/templates/socialaccount/snippets/provider_list.html b/adhocracy-plus/templates/socialaccount/snippets/provider_list.html
index fdb9576cd..2e67ae83d 100644
--- a/adhocracy-plus/templates/socialaccount/snippets/provider_list.html
+++ b/adhocracy-plus/templates/socialaccount/snippets/provider_list.html
@@ -14,8 +14,13 @@ <h4>{% translate "Login with social media account" %}</h4>
                     <a 
                         title="{{ brand.name }}"
                         class="socialaccount-provider {{ provider.id }} {{ brand.id }}"
-                        href="{% provider_login_url provider.id openid=brand.openid_url process=process %}
-                            {% if provider.id == 'github' %}?next=/accounts/3rdparty/signup/{% endif %}"
+                        href="
+                            {% if provider.id == 'github' %}
+                                {% provider_login_url provider.id openid=brand.openid_url process=process next='/accounts/3rdparty/signup/' %}
+                            {% else %}
+                                {% provider_login_url provider.id openid=brand.openid_url process=process %}
+                            {% endif %}
+                        "
                     >
                         {{ brand.id }}
                     </a>

From 05fde8810bfd9e1f92c8644fbc26874926b918e9 Mon Sep 17 00:00:00 2001
From: Josh <195121232+partizipation@users.noreply.github.com>
Date: Thu, 31 Jul 2025 12:24:44 +0200
Subject: [PATCH 3/3] Add apple conditional

---
 .../templates/socialaccount/snippets/provider_list.html         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/adhocracy-plus/templates/socialaccount/snippets/provider_list.html b/adhocracy-plus/templates/socialaccount/snippets/provider_list.html
index 2e67ae83d..f11563ee2 100644
--- a/adhocracy-plus/templates/socialaccount/snippets/provider_list.html
+++ b/adhocracy-plus/templates/socialaccount/snippets/provider_list.html
@@ -17,6 +17,8 @@ <h4>{% translate "Login with social media account" %}</h4>
                         href="
                             {% if provider.id == 'github' %}
                                 {% provider_login_url provider.id openid=brand.openid_url process=process next='/accounts/3rdparty/signup/' %}
+                            {% elif provider.id == 'apple' %}
+                                {% provider_login_url provider.id openid=brand.openid_url process=process next='/accounts/apple/callback/' %}
                             {% else %}
                                 {% provider_login_url provider.id openid=brand.openid_url process=process %}
                             {% endif %}