[angular-17 | DONE] upgrade ng-recaptcha to 13.2.1

angular.json

@@ -172,18 +172,18 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "monitor-dashboard:build"
+            "buildTarget": "monitor-dashboard:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "monitor-dashboard:build:production"
+              "buildTarget": "monitor-dashboard:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "monitor-dashboard:build"
+            "buildTarget": "monitor-dashboard:build"
           }
         },
         "test": {
@@ -248,7 +248,7 @@
           "defaultConfiguration": ""
         },
         "serve-ssr": {
-          "builder": "@nguniversal/builders:ssr-dev-server",
+          "builder": "@angular-devkit/build-angular:ssr-dev-server",
           "options": {
             "browserTarget": "monitor-dashboard:build",
             "serverTarget": "monitor-dashboard:server"
@@ -261,7 +261,7 @@
           }
         },
         "prerender": {
-          "builder": "@nguniversal/builders:prerender",
+          "builder": "@angular-devkit/build-angular:prerender",
           "options": {
             "browserTarget": "monitor-dashboard:build:production",
             "serverTarget": "monitor-dashboard:server:production",

package.json

@@ -21,44 +21,44 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^16.1.7",
-    "@angular/cdk": "^16.1.6",
-    "@angular/common": "^16.1.7",
-    "@angular/compiler": "^16.1.7",
-    "@angular/core": "^16.1.7",
-    "@angular/forms": "^16.1.7",
-    "@angular/localize": "^16.1.7",
-    "@angular/material": "^16.1.6",
-    "@angular/platform-browser": "^16.1.7",
-    "@angular/platform-browser-dynamic": "^16.1.7",
-    "@angular/platform-server": "^16.1.7",
-    "@angular/router": "^16.1.7",
-    "@nguniversal/express-engine": "^16.1.1",
+    "@angular/animations": "^17.3.12",
+    "@angular/cdk": "^17.3.10",
+    "@angular/common": "^17.3.12",
+    "@angular/compiler": "^17.3.12",
+    "@angular/core": "^17.3.12",
+    "@angular/forms": "^17.3.12",
+    "@angular/localize": "^17.3.12",
+    "@angular/material": "^17.3.10",
+    "@angular/platform-browser": "^17.3.12",
+    "@angular/platform-browser-dynamic": "^17.3.12",
+    "@angular/platform-server": "^17.3.12",
+    "@angular/router": "^17.3.12",
+    "@angular/ssr": "^17.3.8",
     "axios": "^1.4.0",
     "clipboard": "^1.5.16",
     "core-js": "^2.5.4",
     "express": "^4.15.2",
     "jquery": "^3.4.1",
-    "ng-recaptcha": "^12.0.2",
+    "ng-recaptcha": "^13.2.1",
     "ng2-ckeditor": "1.3.7",
     "rxjs": "^6.5.1",
     "ts-md5": "^1.2.0",
     "tslib": "^2.0.0",
     "uikit": "3.16.24",
-    "zone.js": "~0.13.1"
+    "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^16.1.6",
-    "@angular/cli": "^16.1.6",
-    "@angular/compiler-cli": "^16.1.7",
-    "@angular/language-service": "^16.1.7",
-    "@nguniversal/builders": "^16.1.1",
+    "@angular-devkit/build-angular": "^17.3.8",
+    "@angular/cli": "^17.3.8",
+    "@angular/compiler-cli": "^17.3.12",
+    "@angular/language-service": "^17.3.12",
     "@types/ckeditor": "^4.9.10",
     "@types/compression": "^1.7.0",
     "@types/express": "^4.17.0",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^16.18.50",
+    "browser-sync": "^3.0.0",
     "codelyzer": "^6.0.0",
     "jasmine-core": "~3.8.0",
     "jasmine-spec-reporter": "~5.0.0",
@@ -69,6 +69,6 @@
     "karma-jasmine-html-reporter": "^1.6.0",
     "protractor": "~7.0.0",
     "ts-node": "~7.0.0",
-    "typescript": "~4.9.5"
+    "typescript": "~5.2.0"
   }
-}
+}

server.ts

@@ -1,139 +1,56 @@
+
 import 'zone.js/node';
 
-import {ngExpressEngine} from '@nguniversal/express-engine';
+import { APP_BASE_HREF } from '@angular/common';
+import { CommonEngine } from '@angular/ssr';
 import * as express from 'express';
-import * as compression from 'compression';
-import {join} from 'path';
-
-import {AppServerModule} from './src/main.server';
-import {APP_BASE_HREF} from '@angular/common';
-import {existsSync} from 'fs';
-import {REQUEST, RESPONSE} from "./src/app/openaireLibrary/utils/tokens";
-import {properties} from "./src/environments/environment";
-import axios, {AxiosHeaders} from "axios";
-import {Stakeholder} from "./src/app/openaireLibrary/monitor/entities/stakeholder";
-import {CacheIndicators} from "./src/app/openaireLibrary/monitor-admin/utils/cache-indicators/cache-indicators";
-import {Session, User} from "./src/app/openaireLibrary/login/utils/helper.class";
-import {UserManagementService} from "./src/app/openaireLibrary/services/user-management.service";
-
-var bodyParser = require('body-parser');
-var jsonParser = bodyParser.json();
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import bootstrap from './src/main.server';
 
 // The Express app is exported so that it can be used by serverless Functions.
-export function app() {
+export function app(): express.Express {
   const server = express();
-  server.use(compression());
   const distFolder = join(process.cwd(), 'dist/monitor-dashboard/browser');
-  const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
-  let cacheIndicators: CacheIndicators = new CacheIndicators();
-  
-  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
-  server.engine('html', ngExpressEngine({
-    bootstrap: AppServerModule,
-    inlineCriticalCss: false
-  }));
-  
+  const indexHtml = existsSync(join(distFolder, 'index.original.html'))
+    ? join(distFolder, 'index.original.html')
+    : join(distFolder, 'index.html');
+
+  const commonEngine = new CommonEngine();
+
   server.set('view engine', 'html');
   server.set('views', distFolder);
-  
-  server.use('/cache', function (req, res, next) {
-    res.header('Access-Control-Allow-Origin', req.headers.origin);
-    res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
-    res.header('Access-Control-Allow-Methods', 'GET, OPTIONS, POST, DELETE');
-    res.header('Access-Control-Max-Age', "1800");
-    next();
-  });
-  
-  server.post('/cache/:alias', jsonParser, async (req, res) => {
-    await checkPermissions(req, res, (stakeholder, user) => {
-      if (cacheIndicators.completed(stakeholder._id)) {
-        res.send({
-          id: stakeholder._id,
-          report: cacheIndicators.createReport(stakeholder._id, cacheIndicators.stakeholderToCacheItems(stakeholder), stakeholder.name, user.email)
-        });
-      } else {
-        res.status(409).send('There is another active caching process for this stakeholder');
-      }
-    });
-  });
-  
-  server.get('/cache/:alias', async (req, res) => {
-    await checkPermissions(req, res, stakeholder => {
-      if (cacheIndicators.exists(stakeholder._id)) {
-        res.send({
-          id: stakeholder._id,
-          report: cacheIndicators.getReport(stakeholder._id)
-        });
-      } else {
-        res.status(404).send('There is not an active caching process for this stakeholder');
-      }
-    });
-  });
-  
-  async function checkPermissions(req, res, access: (stakeholder, user) => void) {
-    let headers: AxiosHeaders = new AxiosHeaders();
-    headers.set('Cookie', req.headers.cookie);
-    let userinfoRes = (await axios.get<any>(UserManagementService.userInfoUrl(), {
-      withCredentials: true,
-      headers: headers
-    }).catch(error => {
-      return error.response;
-    }));
-    if (userinfoRes.status === 200) {
-      let user = new User(userinfoRes.data);
-      let stakeholderRes = (await axios.get<Stakeholder>(properties.monitorServiceAPIURL + '/stakeholder/' + encodeURIComponent(req.params.alias), {
-        withCredentials: true,
-        headers: headers
-      }).catch(error => {
-        return error.response;
-      }));
-      if (stakeholderRes.status === 200) {
-        let stakeholder = stakeholderRes.data;
-        if (Session.isPortalAdministrator(user) || Session.isCurator(stakeholder.type, user)) {
-          access(stakeholder, user);
-        } else {
-          res.status(403).send('You are forbidden to access this resource');
-        }
-      } else {
-        res.status(stakeholderRes.status).send(stakeholderRes.statusText);
-      }
-    } else {
-      res.status(userinfoRes.status).send(userinfoRes.data.message);
-    }
-  }
-  
+
   // Example Express Rest API endpoints
   // server.get('/api/**', (req, res) => { });
   // Serve static files from /browser
   server.get('*.*', express.static(distFolder, {
     maxAge: '1y'
   }));
-  
-  // All regular routes use the Universal engine
-  server.get('*', (req, res) => {
-    res.render(indexHtml, {
-        req, providers: [
-          {
-            provide: APP_BASE_HREF,
-            useValue: req.baseUrl
-          },
-          {
-            provide: REQUEST, useValue: (req)
-          },
-          {
-            provide: RESPONSE, useValue: (res)
-          }
-        ]
-      }
-    );
+
+  // All regular routes use the Angular engine
+  server.get('*', (req, res, next) => {
+    const { protocol, originalUrl, baseUrl, headers } = req;
+
+    commonEngine
+      .render({
+        bootstrap,
+        documentFilePath: indexHtml,
+        url: `${protocol}://${headers.host}${originalUrl}`,
+        publicPath: distFolder,
+        providers: [
+          { provide: APP_BASE_HREF, useValue: baseUrl },],
+      })
+      .then((html) => res.send(html))
+      .catch((err) => next(err));
   });
-  
+
   return server;
 }
 
-function run() {
-  const port = process.env.PORT || 4000;
-  
+function run(): void {
+  const port = process.env['PORT'] || 4000;
+
   // Start up the Node server
   const server = app();
   server.listen(port, () => {
@@ -151,4 +68,4 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
 }
 
-export * from './src/main.server';
+export default bootstrap;

src/app/app.component.html

@@ -126,7 +126,7 @@
             <div class="uk-text-bold uk-text-small">Projects Status: Urgent Update Needed</div>
             <div class="uk-margin-xsmall-top uk-text-xsmall">
                 Your project list was last updated more than a year ago. Please send an updated project list to
-                <a href="mailto:mining@openaire.eu">mining@openaire.eu</a> or contact <a
+                <a href="mailto:mining@openaire.eu">mining&#64;openaire.eu</a> or contact <a
                     [href]="monitorLink + '/contact-us'">support</a>.
             </div>
         </div>
@@ -135,7 +135,7 @@
             <div class="uk-text-bold uk-text-small">Projects Status: Update Needed</div>
             <div class="uk-margin-xsmall-top uk-text-xsmall">
                 Your project list was last updated between 6 to 12 months ago. Please send an updated project list to
-                <a href="mailto:mining@openaire.eu">mining@openaire.eu</a> or contact <a
+                <a href="mailto:mining@openaire.eu">mining&#64;openaire.eu</a> or contact <a
                     [href]="monitorLink + '/contact-us'" target="_blank" class="custom-external">support</a>.
             </div>
         </div>

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 310f06b2348977c64825231fff79180f70fb404d
+Subproject commit 8a6f84000b2af92d91c2baea054f6b5b65e21239

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit 6bc02125166daa907d39ff523cd635088bdb63c2
+Subproject commit ee1a55a529fde844f54761633e59f3be791717e3