feat: configurable drupal login endpoint

ckanext/drupal_idp/plugin.py

@@ -1,11 +1,12 @@
 import logging
 
+from ckan import model
 import ckan.plugins as plugins
 import ckan.plugins.toolkit as tk
 
 from ckanext.drupal_idp.logic import action
 from ckanext.drupal_idp.logic import auth
-from ckanext.drupal_idp import helpers, utils, drupal, cli
+from ckanext.drupal_idp import helpers, utils, drupal, cli, views
 
 CONFIG_FOCE_SYNC = "ckanext.drupal_idp.synchronization.force"
 CONFIG_SKIP_STATIC = "ckanext.drupal_idp.skip_static"
@@ -24,6 +25,10 @@ class DrupalIdpPlugin(plugins.SingletonPlugin):
     plugins.implements(plugins.IActions)
     plugins.implements(plugins.IAuthFunctions)
     plugins.implements(plugins.IClick)
+    plugins.implements(plugins.IBlueprint)
+
+    def get_blueprint(self):
+        return views.get_blueprints()
 
     # IClick
 
@@ -52,7 +57,6 @@ def identify(self):
         The drupal session contains the drupal id of the logged in user.
         We need to convert this to represent the ckan user."""
 
-
         static = {
             ("static", "index"),
             ("webassets", "index"),
@@ -90,7 +94,10 @@ def identify(self):
                 )
                 return
 
-        tk.c.user = user["name"]
+        if tk.check_ckan_version("2.10"):
+            tk.login_user(model.User.get(user["name"]))
+        else:
+            tk.c.user = user["name"]
 
     # IConfigurer
 

ckanext/drupal_idp/utils.py

@@ -252,7 +252,7 @@ def synchronize(user: UserDict, details: Details, force: bool = False) -> UserDi
     if (
         force or
         userobj.email != details.email
-        or details.make_userdict()["plugin_extras"] != userobj.plugin_extras
+        or details.make_userdict()["plugin_extras"]["drupal_idp"] != userobj.plugin_extras.get("drupal_idp")
     ):
         log.info(f"Synchronizing user {details.name}")
         user = _attach_details(user["id"], details)

ckanext/drupal_idp/views.py

@@ -0,0 +1,14 @@
+from __future__ import annotations
+
+from flask import Blueprint
+import ckan.plugins.toolkit as tk
+bp = Blueprint("drupal_idp", __name__)
+
+
+def get_blueprints():
+    return [bp]
+
+@bp.route("/user/login/drupal-idp-redirect")
+def redirect_to_drupal_login():
+    login_url = tk.config.get("ckanext.drupal_idp.login_url", "/user/login")
+    return tk.redirect_to(login_url)