feat(GAPP-4464): add migration api end-point (#179)

* Fix(GAPP-4464): Oikos Migration * Feat(GAPP-4464): migration api end-point add * fix: env variables * fix: enpoints error --------- Co-authored-by: Regan <[email protected]>
TaEthni · Nov 27, 2023 · 2803348 · 2803348
1 parent ff3594a
commit 2803348
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
         "ng": "ng",
         "start": "ng build --configuration production && node server.js",
         "build": "ng build",
-        "dev": "ng serve",
+        "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && ng serve",
         "test": "jest",
         "lint": "ng lint",
         "e2e": "ng e2e",

diff --git a/src/app/oikos/migrate-stream-dialog/migrate-stream-dialog.component.ts b/src/app/oikos/migrate-stream-dialog/migrate-stream-dialog.component.ts
@@ -22,7 +22,7 @@ import { ControlType, GMTemplate, ValueType } from '@npl-template';
 import { MAT_DIALOG_DATA, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';
 import uuid from 'uuid';
 import { GeocoderService } from '@npl-shared/geocoder.service';
-import { Observable, combineLatest, of } from 'rxjs';
+import { Observable, combineLatest, of, throwError } from 'rxjs';
 import { PeopleGroupService } from '../people-group.service';
 import { MatSnackBar } from '@angular/material/snack-bar';
 
@@ -164,7 +164,7 @@ export class MigrateStreamDialogComponent extends Unsubscribable implements OnIn
                     } else {
                         this.snackBack.open('Error Migrating', 'Ok');
                     }
-                    return error;
+                    return throwError(error);
                 })
             )
             .subscribe((result) => {

diff --git a/src/app/oikos/oikos.service.ts b/src/app/oikos/oikos.service.ts
@@ -9,7 +9,7 @@ import { MigrateDto, Team, Workspace } from './oikos.interface';
     providedIn: 'root',
 })
 export class OikosService {
-    public url = environment.oikosApi;
+    public url = environment.apiBase + environment.oikosApi;
     public constructor(private http: HttpClient) {}
 
     public getSelf(): Observable<any> {

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -5,7 +5,7 @@ export const environment = {
     apiBase: 'https://npl-api.genmapper.com/api/',
     ipGeoUrl: 'https://ipgeolocation.abstractapi.com/v1/',
     ipGeoApiKey: 'c5bb07e6f04a42c680356656041a722b',
-    oikosApi: 'https://api.thegapp.app/api/',
+    oikosApi: 'oikos-relay/',
     authConfig: {
         authority: 'https://myidp.io',
         clientId: 'npl_client',

diff --git a/src/environments/environment.qa.ts b/src/environments/environment.qa.ts
@@ -6,7 +6,7 @@ export const environment = {
     apiBase: 'https://npl-api-qa.genmapper.com/api/',
     ipGeoUrl: 'https://ipgeolocation.abstractapi.com/v1/',
     ipGeoApiKey: 'c5bb07e6f04a42c680356656041a722b',
-    oikosApi: 'https://oikos-api-qa.taethni.com/api/',
+    oikosApi: 'oikos-relay/',
     authConfig: {
         authority: 'https://qa.myidp.io',
         clientId: 'npl_client',

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -6,10 +6,9 @@ export const environment = {
     production: false,
     apiKey: 'AIzaSyCzMNmQPVY9uivoKSzoj0ACwKr-LxxcHko',
     // apiBase: 'https://localhost:44320/api/',
-    // apiBase: 'https://localhost:7001/api/',
-    apiBase: 'https://npl-api-qa.genmapper.com/api/',
-    // oikosApi: 'https://localhost:7001/api/',
-    oikosApi: 'https://oikos-api-qa.taethni.com/api/',
+    apiBase: 'https://localhost:8001/api/',
+    // apiBase: 'https://npl-api-qa.genmapper.com/api/',
+    oikosApi: 'oikos-relay/',
     authConfig: {
         authority: 'https://qa.myidp.io',
         // authority: 'http://localhost:5000',