Merge branch 'develop' of github.com:Unipisa/caps into develop

Author: paolini

.github/workflows/docker.yml

@@ -4,7 +4,7 @@ on: push
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: JS tests

README.md

@@ -7,4 +7,3 @@ presso il Dipartimento di Matematica, Università di Pisa.
 Per informazioni sullo sviluppo di CAPS, si veda [DEVELOP.md](DEVELOP.md). È possibile provare 
 ad utilizzare CAPS anche tramite le immagini [Docker](https://github.com/unipisa/caps/pkg/container/caps), 
 per cui sono disponibile [istruzioni specifiche](https://github.com/Unipisa/caps/blob/develop/docker/README.md). 
-

backend/src/Controller/UsersController.php

@@ -131,19 +131,35 @@ private function login_user($authuser) {
             $user = $this->Users->newEmptyEntity();
         }
 
-        // We save the user data no matter what, just in case it has changed
-        // since the last update.
-        $user = $this->Users->patchEntity($user, [
-            'name' => ucwords(strtolower($authuser['name'])),
+        $patchData = [
+            // 'name' => ucwords(strtolower($authuser['name'])),
             'username' => $authuser['username'],
             'number' => $authuser['number'],
-            'surname' => $authuser['surname'],
-            'givenname' => $authuser['givenname'],
+            // 'surname' => $authuser['surname'],
+            // 'givenname' => $authuser['givenname'],
             'email' => $authuser['email'],
             'admin' => $user ? $user['admin'] : $authuser['admin'] // We only use the database admin flag
                 // if the user is not found; otherwise a user might have been granted admin privileges
                 // locally and we respect that.
-        ]);
+        ];
+
+        // If we get new data for givenname, surname, name, overwrite what we have in the database.
+        if (isset($authuser['surname']) || isset($authuser['givenname']) || $user->isNew()) {
+            $patchData['name'] = ucwords(strtolower($authuser['givenname'] . ' ' . $authuser['surname']));
+        }
+        if (isset($authuser['surname']) || $user->isNew()) {
+            $patchData['surname'] = $authuser['surname'];
+        }
+        if (isset($authuser['givenname']) || $user->isNew()) {
+            $patchData['givenname'] = $authuser['givenname'];
+        }
+        if (isset($authuser['number']) || $user->isNew()) {
+            $patchData['number'] = $authuser['number'];
+        }
+
+        // We save the user data no matter what, just in case it has changed
+        // since the last update.
+        $user = $this->Users->patchEntity($user, $patchData);
 
         if ($this->Users->save($user)) {
             $this->Authentication->setIdentity($user);
@@ -330,7 +346,10 @@ public function oauth2Callback() {
 
             // Make sure that if we have no information on the user id
             // in the system, we fall back to using the user id.
-            $number = $number == "" ? $uid : $number;
+            $number = $number == "" ? null : $number;
+
+
+            $given_name = $data['given_name'] ?? '';
 
             $authuser = [ 
                 'username' => $uid,

docker/docker-compose-dev.yml

@@ -37,7 +37,7 @@ services:
     container_name: caps-db
     env_file:
       - caps.env
-    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    # command: --default-authentication-plugin=mysql_native_password
     volumes: 
       - ./database:/var/lib/mysql
     cap_add: