DON-933: Remove async for deleting session cookie, add explicit overw…

…rite

src/app/donation-start/donation-start-form/donation-start-form.component.ts

@@ -526,13 +526,13 @@ export class DonationStartFormComponent implements AfterContentChecked, AfterCon
     this.stepHeaderEventsSet = true;
   }
 
-  reset = async () => {
+  reset = () => {
     this.donor = undefined;
     this.creditPenceToUse = 0;
     this.stripePaymentMethodReady = false;
     this.paymentReadinessTracker = new PaymentReadinessTracker(this.paymentGroup,);
     this.donationForm.reset();
-    await this.identityService.clearJWT();
+    this.identityService.clearJWT();
     this.idCaptcha.reset();
     this.destroyStripeElements();
 

src/app/identity.service.ts

@@ -126,17 +126,13 @@ export class IdentityService {
     ).pipe(retry(2), delay(2_000));
   }
 
-  /**
-   * We've seen logout not working in some cases, perhaps because use of navigate imediatly after deleting the cookie
-   * is making the cookie deletion un reliable. So await this function before navigating.
-   */
-  async clearJWT() {
+  clearJWT() {
     this.cookieService.delete(this.cookieName);
+
+    // delete didn't seem to work reliably, so also directly setting an empty cookie that expires in the past here:
+    this.cookieService.set(this.cookieName, '', new Date('1970-01-01'), '/')
     this.storage.remove(this.storageKey);
     this.loginStatusChanged.emit(false);
-
-    const point4Seconds = 4_00;
-    await new Promise(resolve => setTimeout(resolve, point4Seconds));
   }
 
   getIdAndJWT(): { id: string, jwt: string } | undefined {

src/app/my-account/my-account.component.ts

@@ -76,8 +76,8 @@ export class MyAccountComponent implements OnDestroy, OnInit {
       );
   }
 
-  async logout() {
-    await this.identityService.clearJWT();
+  logout() {
+    this.identityService.clearJWT();
     this.router.navigate(['']);
   }