Re-implemented authentication with generalized auth implementation

TamuGeoInnovation · May 13, 2021 · 87bc57a · 87bc57a
1 parent 2b92d9a
commit 87bc57a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/apps/ues-recycling-angular/src/app/app.module.ts b/apps/ues-recycling-angular/src/app/app.module.ts
@@ -1,11 +1,11 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HttpClientModule } from '@angular/common/http';
 import { RouterModule } from '@angular/router';
 
 import * as WebFont from 'webfontloader';
 import { env, EnvironmentService } from '@tamu-gisc/common/ngx/environment';
-import { AuthInterceptor } from '@tamu-gisc/geoservices/data-access';
+import { AuthGuard, AuthProvider } from '@tamu-gisc/common/ngx/auth';
 
 import * as environment from '../environments/environment';
 import { AppComponent } from './app.component';
@@ -29,7 +29,8 @@ WebFont.load({
       [
         {
           path: 'data',
-          loadChildren: () => import('@tamu-gisc/ues/recycling/ngx').then((m) => m.DataModule)
+          loadChildren: () => import('@tamu-gisc/ues/recycling/ngx').then((m) => m.DataModule),
+          canActivate: [AuthGuard]
         },
         {
           path: '',
@@ -45,11 +46,7 @@ WebFont.load({
       provide: env,
       useValue: environment
     },
-    {
-      provide: HTTP_INTERCEPTORS,
-      useClass: AuthInterceptor,
-      multi: true
-    }
+    AuthProvider
   ],
   bootstrap: [AppComponent]
 })

diff --git a/apps/ues-recycling-angular/src/environments/environment.prod.ts b/apps/ues-recycling-angular/src/environments/environment.prod.ts
@@ -8,6 +8,6 @@ export * from './definitions';
 
 export const apiUrl = 'https://nodes.geoservices.tamu.edu/api/ues/recycling/';
 export const auth_options: AuthOptions = {
-  url: `https://nodes.geoservices.tamu.edu/api/ues/recycling/`,
+  url: `https://nodes.geoservices.tamu.edu/api/ues/recycling`,
   attach_href: true
 };
diff --git a/apps/ues-recycling-angular/src/environments/environment.ts b/apps/ues-recycling-angular/src/environments/environment.ts
@@ -18,4 +18,4 @@ import 'zone.js/dist/zone-error'; // Included with Angular CLI.
 export * from './definitions';
 
 export const apiUrl = 'http://localhost:3333/api/';
-export const auth_api_url = 'http://localhost:3333/api/';
+export const auth_url = 'http://localhost:3333/api';
diff --git a/libs/common/ngx/auth/src/lib/services/auth.service.ts b/libs/common/ngx/auth/src/lib/services/auth.service.ts
@@ -10,7 +10,10 @@ import { EnvironmentService } from '@tamu-gisc/common/ngx/environment';
   providedIn: 'root'
 })
 export class AuthService {
-  public authOptions: AuthOptions;
+  public authOptions: AuthOptions = {
+    url: undefined,
+    attach_href: undefined
+  };
 
   constructor(private http: HttpClient, private env: EnvironmentService) {
     if (this.env.value('auth_url', true)) {