LnB API changed: /redirect instead of /user/link

classes/fetch/institution.php

@@ -62,12 +62,30 @@ class institution extends moodlefetcher
         return self::OK;
     }
 
-    public function getBindingToken($returnUrl) : string {
-        return $this->fetcher->encodeJwtToken('/v1/user/link', ['url' => $returnUrl]);
+    /**
+     * Return a JWT token for the redirection page of LnB, so that the user ends on the user-binding page.
+     *
+     * @param string $returnUrl Full URL, including protocol.
+     * @param string $role "learner" | "teacher"
+     * @return string JWT
+     * @throws \moodle_exception
+     */
+    public function getBindingTokenForRedirect(string $returnUrl, string $role) : string {
+        if ($role !== 'learner' && $role !== 'teacher') {
+            throw new \moodle_exception("Invalid role value in fetch.institution.getBindingToken()");
+        }
+        $payload = [
+            'path' => "/user/bind",
+            'forward' => [
+                'role_ext' => $role,
+                'return_to' => $returnUrl,
+            ],
+        ];
+        return $this->fetcher->encodeJwtToken('/v1/redirect', $payload);
     }
 
-    public function getLoginUrl() : string {
+    public function getRedirectUrl() : string {
         global $CFG;
-        return rtrim($CFG->labnbook_api_url, '/') . '/v1/user/link';
+        return rtrim($CFG->labnbook_api_url, '/') . '/v1/redirect';
     }
 }

user-binding.php

@@ -22,13 +22,14 @@ require_login($course);
 
 $fetchInstitution = new fetch\institution();
 $context = context_course::instance($courseid);
+$isTeacher = has_capability('mod/labnbook:addinstance', $context);
 if ($create && !fetch\user::isAuthenticated()) {
     global $USER;
-    $isTeacher = has_capability('mod/labnbook:addinstance', $context);
     if (createUser($USER, $isTeacher)) {
         redirect($returnUrl);
     }
 }
+$role = ($isTeacher ? 'teacher' : 'learner');
 
 /* @var $PAGE moodle_page */
 global $PAGE;
@@ -49,8 +50,8 @@ echo $OUTPUT->header();
 <div class="container-fluid">
     <div class="row">
         <div class="col" style="text-align: center">
-            <form action="<?= $fetchInstitution->getLoginUrl() ?>" method="GET">
-                <input type="hidden" name="token" value="<?= $fetchInstitution->getBindingToken($CFG->wwwroot . $returnUrl) ?>" />
+            <form action="<?= $fetchInstitution->getRedirectUrl() ?>" method="GET">
+                <input type="hidden" name="token" value="<?= $fetchInstitution->getBindingTokenForRedirect($CFG->wwwroot . $returnUrl, $role) ?>" />
                 <button type="submit" class="btn btn-primary">Se connecter à LabNbook</button>
             </form>
             <div>Si vous possédez déjà un compte dans LabNbook, ce lien permettra de vous authentifier dans LabNbook et de mettre à jour votre compte Moodle.</div>