Merge pull request #9 from in2workspace/feature/login

Feature/login

Author: AlbaLopez552

cypress/e2e/dashboard.cy.ts

@@ -16,7 +16,7 @@ describe('/dashboard',{
         cy.getBySel('browseServices').should('not.be.disabled')
         cy.getBySel('mainText').should('exist')
         cy.getBySel('publishOff').should('exist')
-        cy.getBySel('publishOff').should('have.attr', 'href', init_config.domeRegister)
+        cy.getBySel('publishOff').should('have.attr', 'href', init_config.isbeRegister)
         cy.getBySel('vServices').should('exist')
         cy.getBySel('vServices').should('have.text', '1 verified services')
         cy.getBySel('rPublishers').should('exist')

cypress/support/constants.ts

@@ -18,8 +18,8 @@ export const init_config = {
     'matomoId': '',
     'matomoUrl': '',
     'searchEnabled': false,
-    'domeAbout': 'https://dome-marketplace.eu/about/',
-    'domeRegister': 'https://dome-marketplace.github.io/onboarding/',
+    'isbeAbout': 'https://dome-marketplace.eu/about/',
+    'isbeRegister': 'https://dome-marketplace.github.io/onboarding/',
     'domePublish': 'https://knowledgebase.dome-marketplace.org/shelves/company-onboarding-process',
     'purchaseEnabled': false,
     'defaultId': 'urn:ngsi-ld:catalog:32828e1d-4652-4f4c-b13e-327450ce83c6'

jest.config.ts

@@ -96,7 +96,7 @@ const config: Config = {
 
   // Line to handle ES modules
   transformIgnorePatterns: [
-     "node_modules/(?!@angular|@ngx-translate/core|@fortawesome/angular-fontawesome|ngx-markdown|@ctrl/ngx-emoji-mart|ngx-file-drop)"
+     "node_modules/(?!@angular|@ngx-translate/core|@fortawesome/angular-fontawesome|ngx-markdown|@ctrl/ngx-emoji-mart|ngx-file-drop|angular-auth-oidc-client)"
   ],
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader

package-lock.json

@@ -39,6 +39,7 @@
     "@ngx-translate/core": "^15.0.0",
     "@ngx-translate/http-loader": "^8.0.0",
     "@types/tailwindcss": "^3.1.0",
+    "angular-auth-oidc-client": "^19.0.2",
     "currencies.json": "^1.0.2",
     "fast-average-color": "^9.4.0",
     "flowbite": "^1.8.1",

package.json

@@ -1,15 +1,16 @@
 import { MatomoInitializerService } from 'ngx-matomo-client';
-import { AppInitService } from './services/app-init.service'; // Adjust path as necessary
-import { inject } from '@angular/core';
+import { environment } from 'src/environments/environment';
 
-export function appConfigFactory(appInitService: AppInitService, matomoInitializer: MatomoInitializerService): () => Promise<any> {
+export function appConfigFactory(matomoInitializer: MatomoInitializerService) {
   return () => {
-    return appInitService.init().then(conf => {
-      const matomoConfigOptions = {
-        siteId: conf.matomoId,
-        trackerUrl: conf.matomoUrl
-      }
-      matomoInitializer.initializeTracker(matomoConfigOptions)
-    });
-  }
-}
+    const siteId = environment.MATOMO_SITE_ID;
+    const trackerUrl = environment.MATOMO_TRACKER_URL;
+
+    if (siteId && trackerUrl) {
+      matomoInitializer.initializeTracker({
+        siteId,
+        trackerUrl
+      });
+    }
+  };
+}

src/app/app-config-factory.ts

@@ -1,15 +1,11 @@
-import {Component, OnInit} from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { initFlowbite } from 'flowbite';
 import { TranslateService } from '@ngx-translate/core';
-import {LocalStorageService} from "./services/local-storage.service";
-import {EventMessageService} from "./services/event-message.service";
-import { NavigationEnd, Router, RouterOutlet } from '@angular/router';
-import { LoginInfo } from 'src/app/models/interfaces';
-import { RefreshLoginServiceService } from "src/app/services/refresh-login-service.service";
-import * as moment from 'moment';
+import { LocalStorageService } from './services/local-storage.service';
+import { Router, NavigationEnd, RouterOutlet } from '@angular/router';
 import { FooterComponent } from './shared/footer/footer.component';
 import { HeaderComponent } from './shared/header/header.component';
-
+import { AuthService } from './guard/auth.service';
 
 @Component({
   selector: 'app-root',
@@ -22,59 +18,35 @@ export class AppComponent implements OnInit {
   title = 'ISBE Catalog';
   showPanel = false;
 
-  constructor(private readonly translate: TranslateService,
-              private readonly localStorage: LocalStorageService,
-              private readonly eventMessage: EventMessageService,
-              private readonly router: Router,
-              private readonly refreshApi: RefreshLoginServiceService) {
+  constructor(
+    private readonly translate: TranslateService,
+    private readonly localStorage: LocalStorageService,
+    private readonly router: Router,
+    private readonly auth: AuthService
+  ) {
+    // Idioma
     this.translate.addLangs(['en', 'es']);
     this.translate.setDefaultLang('es');
-    let currLang = this.localStorage.getItem('current_language')
-    if(!currLang || currLang == null) {
-      this.localStorage.setItem('current_language', 'es');
-      this.translate.use('es');
-    } else {
-      this.translate.use(currLang);
-    }
-    if(!this.localStorage.getObject('selected_categories'))
+    const currLang = this.localStorage.getItem('current_language');
+    this.translate.use(currLang ?? 'es');
+
+    if (!this.localStorage.getObject('selected_categories')) {
       this.localStorage.setObject('selected_categories', []);
+    }
   }
 
   ngOnInit(): void {
     initFlowbite();
-    if(!this.localStorage.getObject('selected_categories'))
+    if (!this.localStorage.getObject('selected_categories')) {
       this.localStorage.setObject('selected_categories', []);
-    if(!this.localStorage.getObject('cart_items'))
-      this.localStorage.setObject('cart_items', []);
-    if(!this.localStorage.getObject('login_items'))
-      this.localStorage.setObject('login_items', {});
-    this.eventMessage.messages$.subscribe(ev => {
-      if(ev.type === 'LoginProcess') {
-        this.refreshApi.stopInterval();
-        let info = ev.value as LoginInfo;
-
-        console.log('STARTING INTERVAL')
-        console.log(info.expire)
-        console.log(((info.expire - moment().unix()) - 4))
-
-        this.refreshApi.startInterval(((info.expire - moment().unix())-4)*1000, ev);
-      }
-    })
-    let aux = this.localStorage.getObject('login_items') as LoginInfo;
-    if(JSON.stringify(aux) === '{}'){
-      //this.siopInfo.getSiopInfo().subscribe((data)=>{
-      //  environment.SIOP_INFO = data
-      //})
     }
-    else if (((aux.expire - moment().unix())-4) > 0) {
-      this.refreshApi.stopInterval();
-      this.refreshApi.startInterval(((aux.expire - moment().unix())-4)*1000, aux);
-      console.log('token')
-      console.log(aux.token)
+    if (!this.localStorage.getObject('cart_items')) {
+      this.localStorage.setObject('cart_items', []);
     }
+
     this.router.events.subscribe(event => {
       if (event instanceof NavigationEnd) {
-        window.scrollTo({ top: 0, behavior: 'smooth' }); // or just window.scrollTo(0, 0);
+        window.scrollTo({ top: 0, behavior: 'smooth' });
       }
     });
   }

src/app/app.component.ts

@@ -1,13 +1,14 @@
+import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+
 import { DashboardComponent } from './pages/dashboard/dashboard.component';
-import { SearchComponent } from "./pages/search/search.component";
-import { ProductDetailsComponent } from "./pages/product-details/product-details.component";
-import { SearchCatalogComponent } from "./pages/search-catalog/search-catalog.component";
-import { CatalogsComponent } from "./pages/catalogs/catalogs.component";
-import { UserProfileComponent } from "./pages/user-profile/user-profile.component";
-import { SellerOfferingsComponent } from "./pages/seller-offerings/seller-offerings.component";
-import { AdminComponent } from "./pages/admin/admin.component";
-import { NgModule } from '@angular/core';
+import { SearchComponent } from './pages/search/search.component';
+import { ProductDetailsComponent } from './pages/product-details/product-details.component';
+import { SearchCatalogComponent } from './pages/search-catalog/search-catalog.component';
+import { CatalogsComponent } from './pages/catalogs/catalogs.component';
+import { UserProfileComponent } from './pages/user-profile/user-profile.component';
+import { SellerOfferingsComponent } from './pages/seller-offerings/seller-offerings.component';
+import { AdminComponent } from './pages/admin/admin.component';
 import { AboutDomeComponent } from './pages/about-dome/about-dome.component';
 import { CheckoutComponent } from './pages/checkout/checkout.component';
 import { ContactUsFormComponent } from './pages/contact-us/contact-us-form.component';
@@ -17,80 +18,90 @@ import { ProductInventoryComponent } from './pages/product-inventory/product-inv
 import { ProductOrdersComponent } from './pages/product-orders/product-orders.component';
 import { ShoppingCartComponent } from './pages/shopping-cart/shopping-cart.component';
 import { UsageSpecsComponent } from './pages/usage-specs/usage-specs.component';
+
 import { environment } from 'src/environments/environment';
 import { AuthGuard } from './guard/auth.guard';
 
-
 export const routes: Routes = [
+  { path: 'dashboard', component: DashboardComponent },
+  { path: 'about', component: AboutDomeComponent ,
+    canActivate: [AuthGuard],
+    data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
+  },
+  { path: 'search', component: SearchComponent },
+  { path: 'search/:id', component: ProductDetailsComponent },
+  { path: 'org-details/:id', component: OrganizationDetailsComponent },
+
+  { path: 'search/catalogue/:id', component: SearchCatalogComponent ,
+    canActivate: [AuthGuard],
+    data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
+  },
+  { path: 'catalogues', 
+    component: CatalogsComponent ,
+    canActivate: [AuthGuard],
+    data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
+  },  
   {
-      path: 'dashboard',
-      component: DashboardComponent
-    },
-    {
-      path: 'about',
-      component: AboutDomeComponent
-    },
-    {
-      path: 'search',
-      component: SearchComponent
-    },
-    { path: 'search/:id',
-      component: ProductDetailsComponent
-    },
-    { path: 'org-details/:id',
-      component: OrganizationDetailsComponent
-    },
-    { path: 'search/catalogue/:id',
-    component: SearchCatalogComponent
-    },
-    { path: 'catalogues',
-    component: CatalogsComponent
-    },
-    { path: 'shopping-cart',
+    path: 'shopping-cart',
     component: ShoppingCartComponent,
-    canActivate: [AuthGuard], data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
-    },
-    { path: 'checkout',
-      component: CheckoutComponent,
-      canActivate: [AuthGuard], data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
-    },
-    { path: 'product-inventory',
+    canActivate: [AuthGuard],
+    data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
+  },
+  {
+    path: 'checkout',
+    component: CheckoutComponent,
+    canActivate: [AuthGuard],
+    data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
+  },
+
+  {
+    path: 'product-inventory',
     component: ProductInventoryComponent,
-    //canActivate: [AuthGuard], data: { roles: [] }
-    },
-    { path: 'product-inventory/:id',
-    component: ProductInvDetailComponent
-    },
-    { path: 'profile',
+    canActivate: [AuthGuard],
+    data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
+  },
+  { path: 'product-inventory/:id', component: ProductInvDetailComponent,
+    canActivate: [AuthGuard],
+    data: { roles: [], is_isbe: environment.ISBE_CATALOGUE } },
+  {
+    path: 'profile',
     component: UserProfileComponent,
-    //canActivate: [AuthGuard], data: { roles: ['individual','orgAdmin'] }
-    },
-    { path: 'my-offerings',
+    canActivate: [AuthGuard],
+    data: { roles: ['individual', 'orgAdmin'] }
+  },
+  {
+    path: 'my-offerings',
     component: SellerOfferingsComponent,
-    ////canActivate: [AuthGuard], data: { roles: ['seller'] }
-    },
-    { path: 'admin',
+    canActivate: [AuthGuard],
+    data: { roles: ['seller'] }
+  },
+  {
+    path: 'admin',
     component: AdminComponent,
-    ////canActivate: [AuthGuard], data: { roles: ['admin', 'certifier'] }
-    },
-    { path: 'contact-us',
-      component: ContactUsFormComponent
-    },
-    { path: 'product-orders',
-      component: ProductOrdersComponent,
-      canActivate: [AuthGuard], data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
-    },
-    { path: 'usage-spec',
-      component: UsageSpecsComponent,
-      canActivate: [AuthGuard], data: { roles: ['seller'], is_isbe: environment.ISBE_CATALOGUE }
-    },
-    { path: '**', redirectTo: 'dashboard', pathMatch: 'full' },
-  ]
-  
-  @NgModule({
-    imports: [RouterModule.forRoot(routes)],
-    exports: [RouterModule]
-  })
-  export class AppRoutingModule { }
-  
-  
+    canActivate: [AuthGuard],
+    data: { roles: ['admin', 'certifier'] }
+  },
+  { path: 'contact-us', component: ContactUsFormComponent ,
+    canActivate: [AuthGuard],
+    data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
+  },
+  {
+    path: 'product-orders',
+    component: ProductOrdersComponent,
+    canActivate: [AuthGuard],
+    data: { roles: [], is_isbe: environment.ISBE_CATALOGUE }
+  },
+  {
+    path: 'usage-spec',
+    component: UsageSpecsComponent,
+    canActivate: [AuthGuard],
+    data: { roles: ['seller'], is_isbe: environment.ISBE_CATALOGUE }
+  },
+  { path: '**', redirectTo: 'dashboard', pathMatch: 'full' },
+];
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes, { scrollPositionRestoration: 'enabled' })],
+  exports: [RouterModule],
+})
+export class AppRoutingModule {}