fix: websocket subscriptions, release v0.10.1

Author: mikonse

abrechnung/__init__.py

@@ -1,6 +1,6 @@
 """Abrechnung - feature complete payment management and bookkeeping."""
 
-__version__ = "0.10.0"
+__version__ = "0.10.1"
 
 MAJOR_VERSION = __version__.split(".")[0]
 MINOR_VERSION = __version__.split(".")[1]

debian/changelog

@@ -1,3 +1,9 @@
+abrechnung (0.10.1) stable; urgency=medium
+
+  * Abrechnung release 0.10.1
+
+ -- Michael Loipführer <[email protected]>  Sun, 1 Jan 2022 18:00:00 +0100
+
 abrechnung (0.10.0) stable; urgency=medium
 
   * Abrechnung release 0.10.0

frontend/assets/locales/en/translation.json

@@ -56,18 +56,26 @@ export class Api {
     private accessToken: string | null = null;
     private backendVersion: string | null = null;
 
+    private authenticatedResolveCallbacks: Array<() => void> = [];
+
     constructor(private connectionStatusProvider: IConnectionStatusProvider) {}
 
     public resetAuthState = () => {
         this.sessionToken = null;
         // this.accessToken = null; // we do not null the access token s.t. we can perform remaining requests
     };
 
+    private notifyAuthenticatedWaiters = () => {
+        for (const cb of this.authenticatedResolveCallbacks) {
+            cb();
+        }
+    };
+
     public init = async (baseApiUrl: string, sessionToken?: string) => {
         this.baseApiUrl = baseApiUrl;
 
         if (sessionToken) {
-            this.sessionToken = sessionToken;
+            this.setSessionToken(sessionToken);
         }
         await this.checkBackendVersion();
     };
@@ -89,6 +97,16 @@ export class Api {
         }
     };
 
+    public waitUntilAuthenticated = async (): Promise<void> => {
+        return new Promise<void>((resolve) => {
+            if (this.sessionToken !== null) {
+                resolve();
+            } else {
+                this.authenticatedResolveCallbacks.push(resolve);
+            }
+        });
+    };
+
     public getAccessToken = (): string | null => {
         return this.accessToken;
     };
@@ -103,6 +121,7 @@ export class Api {
 
     public setSessionToken = (token: string) => {
         this.sessionToken = token;
+        this.notifyAuthenticatedWaiters();
     };
 
     public getSessionToken = (): string | null => {

frontend/libs/api/src/lib/api.ts

@@ -158,6 +158,10 @@ export class AbrechnungWebSocket {
         this.init();
     };
 
+    public waitUntilAuthenticated = async () => {
+        await this.api.waitUntilAuthenticated();
+    };
+
     private onmessage = (evt: MessageEvent) => {
         let msg;
         try {

frontend/libs/api/src/lib/websocket.ts

@@ -9,6 +9,7 @@ export const subscribe = createAsyncThunk<
 >(
     "subscribe",
     async ({ subscription, websocket }) => {
+        await websocket.waitUntilAuthenticated();
         websocket.sendSubscriptionRequest(
             subscription.type,
             subscription.type === "group" ? subscription.userId : subscription.groupId