From 3280fc44fa6e3f85cf0bcc3cfa502d02b7de5402 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Aug 2022 08:00:05 +0200
Subject: [PATCH] Fix get email, remove versions from deploy script

---
 caprover_deploy.sh               | 5 ++---
 server/vbv_lernwelt/sso/views.py | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/caprover_deploy.sh b/caprover_deploy.sh
index 70a9ac69..dd6c138e 100755
--- a/caprover_deploy.sh
+++ b/caprover_deploy.sh
@@ -13,10 +13,9 @@ set -ev
 npm run build
 
 # create and push new docker container
-docker buildx build --platform=linux/amd64 -f compose/django/Dockerfile -t "$TAG" -t "$LATEST" --build-arg VERSION="$VERSION" --build-arg BUILD_TIMESTAMP="$BUILD_TIMESTAMP" .
+# docker buildx build --platform=linux/amd64 -f compose/django/Dockerfile -t "$TAG" -t "$LATEST" --build-arg VERSION="$VERSION" --build-arg BUILD_TIMESTAMP="$BUILD_TIMESTAMP" .
+docker buildx build --platform=linux/amd64 -f compose/django/Dockerfile .
 docker push iterativ/vbv-lernwelt-django
-docker push "$TAG"
-docker push "$LATEST"
 
 # deploy to caprover
 caprover deploy -h https://captain.control.iterativ.ch -a vbv-lernwelt -i docker.io/iterativ/vbv-lernwelt-django
diff --git a/server/vbv_lernwelt/sso/views.py b/server/vbv_lernwelt/sso/views.py
index 21edd544..b37b41c2 100644
--- a/server/vbv_lernwelt/sso/views.py
+++ b/server/vbv_lernwelt/sso/views.py
@@ -46,5 +46,5 @@ def _user_data_from_token_data(token: dict) -> dict:
         "first_name": token.get("given_name", ""),
         "last_name": token.get("family_name", ""),
         "username": token.get("preferred_username", ""),
-        "email": token.get("emails", [])[""],
+        "email": token.get("emails", [''])[0],
     }