Merge branch 'master' into 2024-11-06-staging-bump

wireapp · Nov 6, 2024 · 9d5bdfd · 9d5bdfd
2 parents fafd73d + 41f3cbd
commit 9d5bdfd
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/script/main/app.ts b/src/script/main/app.ts
@@ -370,7 +370,14 @@ export class App {
       onProgress(2.5);
       telemetry.timeStep(AppInitTimingsStep.RECEIVED_ACCESS_TOKEN);
 
-      const selfUser = await this.repository.user.getSelf([{position: 'App.initiateSelfUser', vendor: 'webapp'}]);
+      let selfUser: User;
+
+      try {
+        selfUser = await this.repository.user.getSelf([{position: 'App.initiateSelfUser', vendor: 'webapp'}]);
+      } catch (error) {
+        await this.logout(SIGN_OUT_REASON.SESSION_EXPIRED, false);
+        return undefined;
+      }
 
       await initializeDataDog(this.config, selfUser.qualifiedId);
       const eventLogger = new InitializationEventLogger(selfUser.id);