Skip to content

Commit abffd1b

Browse files
committed
Merge branch 'develop'
2 parents efe3d51 + 1f425b8 commit abffd1b

6 files changed

Lines changed: 975 additions & 147 deletions

File tree

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: push
44

55
jobs:
66
docker:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-22.04
88
steps:
99
- uses: actions/checkout@v2
1010
- name: JS tests

backend/src/Controller/UsersController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,9 +334,9 @@ public function oauth2Callback() {
334334

335335
$authuser = [
336336
'username' => $uid,
337-
'givenname' => $data['given_name'],
338-
'surname' => $data['family_name'],
339-
'name' => $data['given_name'] . ' ' . $data['family_name'],
337+
'givenname' => $data['given_name'] ?? explode(' ', $data['name'], 2)[0],
338+
'surname' => $data['family_name'] ?? (strpos($data['name'], ' ') !== false ? explode(' ', $data['name'], 2)[1] : ''),
339+
'name' => $data['name'] . ' ' . ($data['family_name'] ?? ''),
340340
'number' => $number,
341341
'admin' => false,
342342
'email' => $data['email']

docker/docker-compose-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ services:
3737
container_name: caps-db
3838
env_file:
3939
- caps.env
40-
command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
40+
# command: --default-authentication-plugin=mysql_native_password
4141
volumes:
4242
- ./database:/var/lib/mysql
4343
cap_add:

0 commit comments

Comments
 (0)