Merge pull request #1638 from CSCfi/CSCTTV-3110v2

konolak · web-flow · commit 41d8fb5ea4e3 · 2023-02-08T13:45:29.000+02:00
Cscttv 3110v2
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "@gorniv/ngx-transfer-http": "^2.2.9",
     "@nguniversal/common": "^13.1.1",
     "@nguniversal/express-engine": "^13.1.1",
-    "angular-auth-oidc-client": "^13.1.0",
+    "angular-auth-oidc-client": "^14.1.5",
     "array-flat-polyfill": "^1.0.1",
     "body-parser": "^1.19.2",
     "bootstrap": "^5.1.3",
@@ -123,4 +123,4 @@
   "optionalDependencies": {
     "esbuild-android-arm64": "^0.15.13"
   }
-}
+}
diff --git a/src/app/mydata/components/account-settings/account-settings.component.ts b/src/app/mydata/components/account-settings/account-settings.component.ts
@@ -187,57 +187,45 @@ export class AccountSettingsComponent implements OnInit {
     this.connProblemHideProfile = false;
     this.profileService
       .hideProfile()
-      .pipe(take(1))
-      .subscribe({
-        next: (res: any) => {
+      .then(
+        (value) => {
           this.hideProfileInProgress = false;
-          if (res.ok && res.body.success) {
             this.dialog.closeAll();
             sessionStorage.setItem('profileHidden', 'true');
             this.isProfileHidden = true;
             this.snackbarService.show(
-                $localize`:@@profileHiddenToast:Profiilin piilottaminen onnistui. Profiilisi piilotetaan Tiedejatutkimus.fi -palvelusta muutaman minuutin kuluttua.`,
-                'success'
-              );
-
+              $localize`:@@profileHiddenToast:Profiilin piilottaminen onnistui. Profiilisi piilotetaan Tiedejatutkimus.fi -palvelusta muutaman minuutin kuluttua.`,
+              'success'
+            );
             //this.reset();
-          }
         },
-        error: (error) => {
+        (reason) => {
           this.hideProfileInProgress = false;
-          if (!error.ok) {
-            this.connProblemHideProfile = true;
-          }
-        },
-      });
+          this.connProblemHideProfile = true;
+        },);
   }
 
   deleteProfile() {
     this.deleteProfileInProgress = true;
     this.connProblemDeleteProfile = false;
     this.profileService
       .deleteProfile()
-      .pipe(take(1))
-      .subscribe({
-        next: (res: any) => {
+      .then(
+        (value) => {
           this.deleteProfileInProgress = false;
-          if (res.ok && res.body.success) {
-            this.dialog.closeAll();
-            this.reset();
+          this.dialog.closeAll();
+          this.reset();
 
-            // Wait for dialog to close
-            setTimeout(() => {
-              this.oidcSecurityService.logoff();
+          // Wait for dialog to close
+          setTimeout(() => {
+            this.oidcSecurityService.logoff();
             }, 500);
-          }
+
         },
-        error: (error) => {
+        (reason) => {
           this.deleteProfileInProgress = false;
-          if (!error.ok) {
-            this.connProblemDeleteProfile = true;
-          }
-        },
-      });
+          this.connProblemDeleteProfile = true;
+        },);
   }
 
   /*
diff --git a/src/app/mydata/components/profile/data-sources/data-sources-selection-actions/data-sources-selection-actions.component.ts b/src/app/mydata/components/profile/data-sources/data-sources-selection-actions/data-sources-selection-actions.component.ts
@@ -153,26 +153,24 @@ export class DataSourcesSelectionActionsComponent implements OnInit, OnDestroy {
     this.closeDialog();
   }
 
-  patchItems(action: Action) {
+  async patchItems(action: Action) {
     const patchItemsArr = this.patchService.confirmedPayLoad;
 
     const filteredItems = patchItemsArr.filter((item) =>
       action === 'publish' ? item.show : !item.show
     );
 
-    this.patchItemsSub = this.profileService
-      .patchObjects(filteredItems)
-      .pipe(take(1))
-      .subscribe((res: HttpResponse<any>) => {
-        if (res.body.success) {
+    this.profileService
+      .patchObjects(filteredItems).then(
+        (value) => {
           this.onPatchSuccess.emit(filteredItems);
           // Enable hide profile button in account settings section, if it has been disabled
           sessionStorage.removeItem('profileHidden');
           this.snackbarService.showPatchMessage('success');
-        } else {
+        },
+        (reason) => {
           this.snackbarService.showPatchMessage('error');
-        }
-      });
+        },);
   }
 
   // Used as callback function in filter pipe
diff --git a/src/app/mydata/components/profile/profile.component.ts b/src/app/mydata/components/profile/profile.component.ts
@@ -274,39 +274,16 @@ export class ProfileComponent implements OnInit, OnDestroy {
    * Patch items to backend
    */
   private async patchItemsPromise() {
-    return new Promise((resolve, reject) => {
-      const patchItems = this.patchService.confirmedPayLoad;
-      this.profileService
-        .patchObjects(patchItems)
-        .pipe(takeUntil(this.unsubscribe))
-        .subscribe({
-          next: (result) => {
-            resolve(true);
-          },
-          error: (error) => {
-            reject(error);
-          },
-        });
-    });
+    const patchItems = this.patchService.confirmedPayLoad;
+    return this.profileService
+      .patchObjects(patchItems);
   }
 
   /*
    * Patch datasets to backend
    */
   private async handleDatasetsPromise() {
-    return new Promise((resolve, reject) => {
-      this.datasetsService
-        .addDatasets()
-        .pipe(takeUntil(this.unsubscribe))
-        .subscribe({
-          next: (result) => {
-            resolve(true);
-          },
-          error: (error) => {
-            reject(error);
-          },
-        });
-    });
+    return this.datasetsService.addDatasets();
   }
 
   /*
diff --git a/src/app/mydata/components/service-deployment/cancel-deployment/cancel-deployment.component.ts b/src/app/mydata/components/service-deployment/cancel-deployment/cancel-deployment.component.ts
@@ -40,13 +40,13 @@ export class CancelDeploymentComponent implements OnInit {
 
     if (token) {
       this.profileService
-        .deleteAccount()
-        .pipe(take(1))
-        .subscribe((res: HttpResponse<any>) => {
-          if (res.ok) {
-            logout();
-          }
-        });
+        .deleteAccount().then(
+        (value) => {
+          this.oidcSecurityService.logoff()
+        },
+        (reason) => {
+          console.error(reason);
+        },);
     } else {
       this.router.navigate(['/mydata']);
     }
diff --git a/src/app/mydata/components/service-deployment/orcid-data-fetch/orcid-data-fetch.component.ts b/src/app/mydata/components/service-deployment/orcid-data-fetch/orcid-data-fetch.component.ts
@@ -33,39 +33,39 @@ export class OrcidDataFetchComponent implements OnInit, OnDestroy {
   orcidDataFetchInfo3 = $localize`:@@orcidDataFetchInfo3:Tässä vaiheessa emme vielä julkaise profiiliasi.`;
   orcidDataFetchInfo4 = $localize`:@@orcidDataFetchInfo4:Voit hallinnoida tietojesi julkisuutta seuraavaksi aukeavassa profiilieditorissa.`;
 
-  fetchOrcidData() {
+
+  // Create profile when proceeding from step 4. Get ORCID data after profile creation
+  async createProfile() {
+    this.profileService
+      .createProfile().then(
+      (value) => {
+        this.loading = true;
+        this.getOrcidData();
+      },
+      (reason) => {
+        console.error(reason);
+      },);
+  }
+
+  async fetchOrcidData() {
     if (!this.orcid) {
       this.profileService.handleOrcidNotLinked();
     } else {
-      this.accountLinkSub = this.profileService
-        .accountlink()
-        .subscribe((response: { body: { success: string } }) => {
-          if (response.body.success) {
-            this.loading = true;
-            this.createProfile();
-          } else {
-            console.error('Unable to link ORCID');
-          }
-        });
+      this.profileService
+        .accountlink().then(
+        (value) => {
+          this.loading = true;
+          this.createProfile();
+        },
+        (reason) => {
+          console.error(reason);
+          console.error('Unable to link ORCID');
+        },);
     }
   }
 
-  // Create profile when proceeding from step 4. Get ORCID data after profile creation
-  createProfile() {
-    this.createProfileSub = this.profileService
-      .createProfile()
-      .pipe(take(1))
-      .subscribe((data: any) => {
-        if (data.ok) {
-          this.getOrcidData();
-        } else {
-          // TODO: Alert problem
-        }
-      });
-  }
-
   async getOrcidData() {
-    const response: any = await this.profileService.getOrcidData().toPromise();
+    const response: any = await this.profileService.getOrcidData();
     if (response.ok) {
       this.dialog.closeAll();
       this.loading = false;
diff --git a/src/app/mydata/components/service-deployment/service-deployment.component.ts b/src/app/mydata/components/service-deployment/service-deployment.component.ts
@@ -79,15 +79,20 @@ export class ServiceDeploymentComponent implements OnInit, OnDestroy {
 
       // Initialize Identity Provider configuration and enable ORCID data fetch in step 4
       if (this.step === 4) {
-        this.IDPLinkSub = this.profileService
-          .accountlink()
-          .pipe(switchMap(() => this.oidcSecurityService.forceRefreshSession()))
-          .subscribe(() => {
-            const idTokenPayload =
-              this.oidcSecurityService.getPayloadFromIdToken();
-            this.orcid = idTokenPayload.orcid;
-            this.profileService.setUserData(idTokenPayload);
-          });
+        this.profileService
+          .accountlink().then(
+          (value) => {
+            this.IDPLinkSub = this.oidcSecurityService.forceRefreshSession()
+              .subscribe(() => {
+                this.oidcSecurityService.getPayloadFromIdToken().subscribe(data => {
+                  this.orcid = data.orcid;
+                  this.profileService.setUserData(data);
+                });
+              });
+          },
+          (reason) => {
+            console.error(reason);
+          },);
       }
     });
 
diff --git a/src/app/mydata/models/profile.model.ts b/src/app/mydata/models/profile.model.ts
@@ -37,7 +37,7 @@ export class ProfileAdapter implements Adapter<Profile> {
   ) {}
 
   adapt(item: any): Profile {
-    const data = item.body.data;
+    const data = item.data;
 
     const mapModel = (adapter, data) => Object.values(adapter.adapt(data));
 
diff --git a/src/app/mydata/resolvers/mydata-profile-resolver.service.ts b/src/app/mydata/resolvers/mydata-profile-resolver.service.ts
@@ -24,7 +24,12 @@ export class MyDataProfileResolverService implements Resolve<any>, OnDestroy {
 
   constructor(private profileService: ProfileService) {}
 
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+  async resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+
+    await this.profileService
+      .getProfileData().then((value) => {
+    });
+
     /*
      * Get MyData profile data before rendering route.
      * Data is stored in profile service.
@@ -35,18 +40,21 @@ export class MyDataProfileResolverService implements Resolve<any>, OnDestroy {
       return new Promise((resolve) => {
         this.profileService
           .getProfileData()
-          .pipe(takeUntil(this.unsubscribeOnDestroy))
-          .subscribe((response) => {
-            // Store original data in service
-            this.profileService.setCurrentProfileData(
-              cloneDeep(response.profileData)
-            );
-
-            resolve({
-              name: getName(response.profileData),
-              profileData: response.profileData,
-            });
-          });
+          .then(
+            (value) => {
+              if (value) {
+                this.profileService.setCurrentProfileData(
+                  cloneDeep(value.profileData)
+                );
+                resolve({
+                  name: getName(value.profileData),
+                  profileData: value.profileData,
+                });
+              }
+            },
+            (reason) => {
+              console.error('error', reason);
+            },);
       });
     } else {
       return {
diff --git a/src/app/mydata/resolvers/orcid-profile-resolver.service.ts b/src/app/mydata/resolvers/orcid-profile-resolver.service.ts
@@ -14,7 +14,7 @@ import {
 import { ProfileService } from '@mydata/services/profile.service';
 import { AppSettingsService } from '@shared/services/app-settings.service';
 import { OidcSecurityService } from 'angular-auth-oidc-client';
-import { Subject, takeUntil } from 'rxjs';
+import {firstValueFrom, Subject, takeUntil} from 'rxjs';
 
 @Injectable({
   providedIn: 'root',
@@ -41,20 +41,17 @@ export class OrcidProfileResolverService implements Resolve<any>, OnDestroy {
       return new Promise((resolve) => {
         this.oidcSecurityService.userData$
           .pipe(takeUntil(this.unsubscribeOnDestroy))
-          .subscribe((data) => {
+          .subscribe(async (data) => {
             if (data.userData) {
               const idTokenPayload =
-                this.oidcSecurityService.getPayloadFromIdToken();
-
+                await firstValueFrom(this.oidcSecurityService.getPayloadFromIdToken());
               // Create object that holds necessary ORCID profile items
               const userData = {
                 ...data.userData,
                 orcid: idTokenPayload.orcid,
               };
-
               this.profileService.setOrcidUserProfile(userData);
               this.appSettingsService.setOrcid(userData.orcid);
-
               resolve(userData);
             } else {
               return false;
diff --git a/src/app/mydata/services/orcid-account-linking.service.ts b/src/app/mydata/services/orcid-account-linking.service.ts
@@ -8,6 +8,7 @@
 import { DOCUMENT } from '@angular/common';
 import { Inject, Injectable } from '@angular/core';
 import { OidcSecurityService } from 'angular-auth-oidc-client';
+import {firstValueFrom} from "rxjs";
 
 @Injectable({
   providedIn: 'root',
@@ -109,10 +110,10 @@ export class OrcidAccoungLinkingService {
    */
   async getOrcidLink() {
     // Auth configuration
-    const authConfig = this.oidcSecurityService.getConfiguration();
+    const authConfig = await firstValueFrom(this.oidcSecurityService.getConfiguration());
 
     // Get ID token
-    const idTokenPayload = this.oidcSecurityService.getPayloadFromIdToken();
+    const idTokenPayload = await firstValueFrom(this.oidcSecurityService.getPayloadFromIdToken());
 
     // Keycloak base URL
     const keycloakUrl = authConfig.authority;
diff --git a/src/app/mydata/services/profile.service.ts b/src/app/mydata/services/profile.service.ts
