Update python, fix login bug

agdsn · Mar 16, 2024 · 13fd222 · 13fd222
1 parent 714a371
commit 13fd222
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/buld.yml b/.github/workflows/buld.yml
@@ -27,10 +27,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      - name: Set correct permissions
-        working-directory: ./backend
-        run: sudo chmod -R a+rw .
-
       - name: Build the Docker image
         working-directory: ./backend
         run: docker build -f docker/prod-app.Dockerfile -t ghcr.io/agdsn/keywi:${GITHUB_REF_NAME} .

diff --git a/backend/docker/dev-app.Dockerfile b/backend/docker/dev-app.Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10
+FROM python:3.12
 
 ARG UID=1000
 ARG GID=1000

diff --git a/backend/docker/prod-app.Dockerfile b/backend/docker/prod-app.Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10
+FROM python:3.12
 
 ARG UID=1000
 ARG GID=1000

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -12,6 +12,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import AppHeader from "@/components/AppHeader.vue";
+import AuthService from "@/services/AuthService";
 
 export default Vue.extend({
   name: 'App',
@@ -21,6 +22,10 @@ export default Vue.extend({
   }),
   mounted() {
     this.$vuetify.theme.currentTheme.secondary = '#41A6A0';
+
+    if (AuthService.isLoggedIn()) {
+      AuthService.refreshUser();
+    }
   }
 });
 </script>

diff --git a/frontend/src/services/AuthService.ts b/frontend/src/services/AuthService.ts
@@ -65,6 +65,15 @@ export default {
     isLoggedIn() {
         return localStorage.getItem('access_token') != null;
     },
+    async refreshUser() {
+        const apiClient = await api;
+
+        apiClient.user_getCurrent().then((response) => {
+            localStorage.setItem('user', JSON.stringify(response.data));
+        }).catch(() => {
+            this.logout();
+        });
+    },
     getUser() {
         const userData = localStorage.getItem('user');
 
@@ -74,4 +83,4 @@ export default {
 
         return JSON.parse(userData);
     }
-}
+}