@eui/cli 17.3.1-snapshot-1711129041669 → 18.0.0-next.1

package/.version.properties

@@ -1 +1 @@
-17.3.1-snapshot-1711129041669
+18.0.0-next.1

package/lib/build.js

@@ -149,14 +149,6 @@ const copyAngular = (targetPath, cliConfig, overwrite = true) => {
       }
       return Promise.resolve();
     })
-    .then(() => {
-        const allAvaiableOptionsCount = Object.keys(config.optionsPath).length - 1;
-        if (cliConfig.appOptions && cliConfig.appOptions.length === allAvaiableOptionsCount) {
-            tools.copydir(config.optionsPath["ecl-openid-jwt"], targetPath, true);
-            console.log('Applying options merge : ecl-openid-jwt');
-          }
-          return Promise.resolve();
-     })
     .catch((e) => {
       throw e;
     })

package/lib/cli.js

@@ -79,7 +79,6 @@ module.exports.start = (options) => {
           default: defaultConfig.appOptions,
           message: 'Select one or more additional configuration options :',
           choices: [
-            { name: 'OpenId Connect JWT implementation', value: 'openid-jwt' },
             { name: 'eUI ECL app-shell template and configuration - for ec.europa.eu apps', value: 'ecl' },
           ],
           when: function (answers) {

package/lib/config.js

@@ -16,10 +16,8 @@ module.exports.webPhpStarterRepo = 'webgate.ec.europa.eu/CITnet/stash/scm/csdr/e
 module.exports.webSymfonyPath = path.join(skeletonsPath, 'web-symfony');
 
 module.exports.optionsPath = {
-    "openid-jwt": path.join(skeletonsPath, '_angular/options/openid-jwt'),
     "ecl-ec": path.join(skeletonsPath, '_angular/options/ecl-ec'),
     "ecl-eu": path.join(skeletonsPath, '_angular/options/ecl-eu'),
-    "ecl-openid-jwt": path.join(skeletonsPath, '_angular/options/merged-ecl-openid-jwt'),
 };
 
 module.exports.version = version;

package/lib/skeletons/_angular/base/gitignore_TO_REPLACE

@@ -47,4 +47,3 @@ yarn-error.log
 Thumbs.db
 
 /assets/env-json-config.json
-/assets/openid-login-config.json

package/lib/skeletons/_angular/base/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "17.3.1-snapshot-1711129041669",
+    "version": "18.0.0-next.1",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -20,6 +20,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "17.3.1-snapshot-1711129041669"
+        "@eui/deps-base": "18.0.0-next.1"
     }
 }

package/lib/skeletons/_angular/base/src/app/core/core.module.ts

@@ -58,7 +58,6 @@ import { SharedModule } from '@shared/shared.module';
             multi: true,
         },
         {
-            // WARNING: in case of OpenID this is not needed since OpenID is stateless therefore no revalidation needed.
             // When the authentication session is invalid, we need to re-authenticate. The browser refreshes the current URL,
             // and lets the EU Login client redirect to the official EU Login page.
             provide: HTTP_INTERCEPTORS,

package/lib/skeletons/_angular/base-mobile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "17.3.1-snapshot-1711129041669",
+    "version": "18.0.0-next.1",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",

package/lib/skeletons/_angular/base-mobile/src/app/core/core.module.ts

@@ -60,7 +60,6 @@ import { SharedModule } from '@shared/shared.module';
             multi: true,
         },
         {
-            // WARNING: in case of OpenID this is not needed since OpenID is stateless therefore no revalidation needed.
             // When the authentication session is invalid, we need to re-authenticate. The browser refreshes the current URL,
             // and lets the EU Login client redirect to the official EU Login page.
             provide: HTTP_INTERCEPTORS,

package/lib/skeletons/web-symfony/myapp-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "17.3.1-snapshot-1711129041669",
+    "version": "18.0.0-next.1",
     "license": "EUPL-1.1",
     "description": "eUI JEE Symfony app scripts",
     "scripts": {
@@ -14,11 +14,10 @@
         "start": "npm run clean && npm-run-all --parallel start-symfony start-serve",
         "start-mean": "npm run clean && npm-run-all --parallel start-mock-server-mean start-serve",
         "start-proxy": "npm run clean && eui-scripts serve-app --configuration=proxy",
-        "start-openid": "npm run clean && eui-scripts serve-app --configuration=local-openid",
         "generate-changelog": "eui-scripts generate-changelog"
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "17.3.1-snapshot-1711129041669"
+        "@eui/deps-base": "18.0.0-next.1"
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@eui/cli",
-    "version": "17.3.1-snapshot-1711129041669",
-    "tag": "snapshot",
+    "version": "18.0.0-next.1",
+    "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator",
     "bin": {
@@ -27,7 +27,7 @@
     "homepage": "https://eui.ecdevops.eu",
     "author": "ec.europa.eui@gmail.com",
     "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || >=20.11.1",
         "yarn": ">=1.22.4 <2"
     }
 }

package/lib/skeletons/_angular/options/merged-ecl-openid-jwt/package.json

@@ -1,26 +0,0 @@
-{
-    "name": "eui-angular-app",
-    "version": "17.3.1-snapshot-1711129041669",
-    "license": "EUPL-1.1",
-    "scripts": {
-        "ng": "ng",
-        "start-mock-server": "nodemon --watch ./mock ./mock/server.js",
-        "start-serve": "eui-scripts serve-app --openid --configuration=proxy-mock --configEnvTarget=local-mock",
-        "start": "npm-run-all --parallel start-mock-server start-serve",
-        "start-proxy": "eui-scripts serve-app --openid",
-        "start-openid": "eui-scripts serve-app --openid --configEnvTarget=local",
-        "build-dev": "eui-scripts build-app --configuration=development --configEnvTarget=dev",
-        "build-prod": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=prod",
-        "build-prod-skip-test": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=prod --skipTest",
-        "build-prod-stats": "eui-scripts build-app --configuration=production-optimized --configEnvTarget=prod --statsJson",
-        "build-openid-dev": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=dev",
-        "build-openid-prd": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=prod",
-        "app:build": "eui-scripts build-app",
-        "app:inject-config": "eui-scripts inject-config-app",
-        "generate-changelog": "eui-scripts generate-changelog"
-    },
-    "private": true,
-    "dependencies": {
-        "@eui/deps-base": "17.3.1-snapshot-1711129041669"
-    }
-}

package/lib/skeletons/_angular/options/openid-jwt/package.json

@@ -1,23 +0,0 @@
-{
-    "name": "eui-angular-app",
-    "version": "17.3.1-snapshot-1711129041669",
-    "license": "EUPL-1.1",
-    "scripts": {
-        "ng": "ng",
-        "start-mock-server": "nodemon --watch ./mock ./mock/server.js",
-        "start-serve": "eui-scripts serve-app --openid --configuration=proxy-mock --configEnvTarget=local-mock",
-        "start": "npm-run-all --parallel start-mock-server start-serve",
-        "start-proxy": "eui-scripts serve-app --openid",
-        "start-openid": "eui-scripts serve-app --openid --configEnvTarget=local",
-        "build": "eui-scripts build-app",
-        "build-openid-dev": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=dev",
-        "build-openid-prod": "eui-scripts build-app --configuration=production-optimized --openid --configEnvTarget=prod",
-        "app:build": "eui-scripts build-app",
-        "app:inject-config": "eui-scripts inject-config-app",
-        "generate-changelog": "eui-scripts generate-changelog"
-    },
-    "private": true,
-    "dependencies": {
-        "@eui/deps-base": "17.3.1-snapshot-1711129041669"
-    }
-}

package/lib/skeletons/_angular/options/openid-jwt/src/app/core/core.module.ts

@@ -1,94 +0,0 @@
-import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
-import { StoreModule } from '@ngrx/store';
-import { EffectsModule } from '@ngrx/effects';
-import { StoreDevtoolsModule } from '@ngrx/store-devtools';
-import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
-
-import {
-    CachePreventionInterceptor,
-    CorsSecurityInterceptor,
-    CsrfPreventionInterceptor,
-    EuLoginSessionTimeoutHandlingInterceptor,
-    OpenIdConnectInterceptor,
-    CoreModule as EuiCoreModule,
-    translateConfig,
-    CoreModuleEffects,
-    EUI_CONFIG_TOKEN,
-} from '@eui/core';
-import { EuiLayoutModule } from '@eui/components/layout';
-
-import { appConfig } from '../../config/index';
-import { environment } from '../../environments/environment';
-
-import { REDUCER_TOKEN, getReducers, metaReducers } from './reducers/index';
-
-import { SharedModule } from '@shared/shared.module';
-
-@NgModule({
-    imports: [
-        EuiLayoutModule,
-        SharedModule,
-        HttpClientModule,
-        EuiCoreModule.forRoot(),
-        EffectsModule.forRoot([...CoreModuleEffects]),
-        TranslateModule.forRoot(translateConfig),
-        StoreModule.forRoot(REDUCER_TOKEN, { metaReducers }),
-        !environment.production ? StoreDevtoolsModule.instrument({ maxAge: 50 }) : [],
-    ],
-    declarations: [
-    ],
-    exports: [
-        EuiLayoutModule,
-        SharedModule,
-    ],
-    providers: [
-        {
-            provide: REDUCER_TOKEN,
-            deps: [],
-            useFactory: getReducers,
-        },
-        {
-            provide: EUI_CONFIG_TOKEN,
-            useValue: { appConfig, environment },
-        },
-        {
-            // Sets the withCredentials on Ajax Request to send the JSESSIONID cookie to another domain.
-            // This is necessary when a request is being made to another domain that is protected by EU Login.
-            provide: HTTP_INTERCEPTORS,
-            useClass: CorsSecurityInterceptor,
-            multi: true,
-        },
-        {
-            // WARNING: in case of OpenID this is not needed since OpenID is stateless therefore no revalidation needed.
-            // When the authentication session is invalid, we need to re-authenticate. The browser refreshes the current URL,
-            // and lets the EU Login client redirect to the official EU Login page.
-            provide: HTTP_INTERCEPTORS,
-            useClass: EuLoginSessionTimeoutHandlingInterceptor,
-            multi: true,
-        },
-        {
-            // Adds HTTP header to each Ajax request that ensures the request is set by a piece of JavaScript code in the application.
-            // This prevents dynamically-loaded content from forging a request in the name of the currently logged-in user.
-            // Be aware that this assumes that cross-site scripting (XSS) is already put in place, (default setting in Angular).
-            provide: HTTP_INTERCEPTORS,
-            useClass: CsrfPreventionInterceptor,
-            multi: true,
-        },
-        {
-            // Asks the intermediate proxies not to return a cache copy of the resource.
-            // In matter of fact forces each server in the chain to validate the freshness of the resource.
-            provide: HTTP_INTERCEPTORS,
-            useClass: CachePreventionInterceptor,
-            multi: true,
-        },
-        {
-            provide: HTTP_INTERCEPTORS,
-            useClass: OpenIdConnectInterceptor,
-            multi: true,
-        },
-    ]
-})
-export class CoreModule {
-
-}

package/lib/skeletons/_angular/options/openid-jwt/src/assets/config/env-json-config-dev.json

@@ -1,24 +0,0 @@
-{
-    "openIdConnect": {
-        "enabled": true,
-        "allowDevelopmentLogin": true,
-        "stripIdTokenFromLocation": true,
-        "maximumRequestRetries": 1,
-        "metadataUrl": "https://webgate.ec.europa.eu/cas/oauth2/.well-known/openid-configuration",
-        "spaClientId": "your-webapp-EU-Login-ACC-client-ID-here",
-        "spaRedirectUrl": "https://your-development-server-url/",
-        "apiGatewayAccessTokenUrl": "https://api.tech.ec.europa.eu/federation/oauth/token",
-        "apiGatewayAccessTokenAudienceId": "DFlp4emQ6jCLjNw8U7ko18zNjb9bwJ3ACrnP89iPsVv4zcChOEVRPHCT88Q7jPpNGCFa0hJEtV77rBj6L1XvOt-Jj71zxYb8yr7ujzQt669zSG",
-        "apiGatewayConsumerKey": "API-Gateway-sandbox-URL-consumer-key-here",
-        "apiGatewayServices": {
-        },
-        "services": {
-        }
-    },
-    "modules": {
-        "core": {
-            "base": "/api",
-            "userDetails": "/user-details"
-        }
-    }
-}

package/lib/skeletons/_angular/options/openid-jwt/src/assets/config/env-json-config-local-mock.json

@@ -1,10 +0,0 @@
-{
-    "openIdConnect": {
-        "enabled": false
-    },
-    "modules": {
-        "core": {
-            "userDetails": "/user-details"
-        }
-    }
-}

package/lib/skeletons/_angular/options/openid-jwt/src/assets/config/env-json-config-local.json

@@ -1,23 +0,0 @@
-{
-    "openIdConnect": {
-        "enabled": true,
-        "stripIdTokenFromLocation": true,
-        "maximumRequestRetries": 1,
-        "metadataUrl": "https://webgate.ec.europa.eu/cas/oauth2/.well-known/openid-configuration",
-        "spaClientId": "your-webapp-EU-Login-ACC-client-ID-here",
-        "spaRedirectUrl": "https://your-development-server-url/",
-        "apiGatewayAccessTokenUrl": "https://api.tech.ec.europa.eu/federation/oauth/token",
-        "apiGatewayAccessTokenAudienceId": "DFlp4emQ6jCLjNw8U7ko18zNjb9bwJ3ACrnP89iPsVv4zcChOEVRPHCT88Q7jPpNGCFa0hJEtV77rBj6L1XvOt-Jj71zxYb8yr7ujzQt669zSG",
-        "apiGatewayConsumerKey": "API-Gateway-sandbox-URL-consumer-key-here",
-        "apiGatewayServices": {
-        },
-        "services": {
-        }
-    },
-    "modules": {
-        "core": {
-            "base": "/api",
-            "userDetails": "/user-details"
-        }
-    }
-}

package/lib/skeletons/_angular/options/openid-jwt/src/assets/config/env-json-config-prod.json

@@ -1,23 +0,0 @@
-{
-    "openIdConnect": {
-        "enabled": true,
-        "stripIdTokenFromLocation": true,
-        "maximumRequestRetries": 1,
-        "metadataUrl": "https://webgate.ec.europa.eu/cas/oauth2/.well-known/openid-configuration",
-        "spaClientId": "your-webapp-EU-Login-PROD-client-ID-here",
-        "spaRedirectUrl": "https://your-production-server-url/",
-        "apiGatewayAccessTokenUrl": "https://api.tech.ec.europa.eu/federation/oauth/token",
-        "apiGatewayAccessTokenAudienceId": "DFlp4emQ6jCLjNw8U7ko18zNjb9bwJ3ACrnP89iPsVv4zcChOEVRPHCT88Q7jPpNGCFa0hJEtV77rBj6L1XvOt-Jj71zxYb8yr7ujzQt669zSG",
-        "apiGatewayConsumerKey": "API-Gateway-production-URL-consumer-key-here",
-        "apiGatewayServices": {
-        },
-        "services": {
-        }
-    },
-    "modules": {
-        "core": {
-            "base": "/api",
-            "userDetails": "/user-details"
-        }
-    }
-}

package/lib/skeletons/_angular/options/openid-jwt/src/assets/config/env-json-config.json

@@ -1,10 +0,0 @@
-{
-    "openIdConnect": {
-        "enabled": false
-    },
-    "modules": {
-        "core": {
-            "userDetails": "/user-details"
-        }
-    }
-}

package/lib/skeletons/_angular/options/openid-jwt/src/environments/environment.prod.ts

@@ -1,11 +0,0 @@
-import { EuiEnvConfig } from '@eui/core';
-
-export const environment: EuiEnvConfig = {
-    production: true,
-    enableDevToolRedux: false,
-    envDynamicConfig: {
-        uri: 'assets/openid-login-config.json',
-        deepMerge: true,
-        merge: ['modules'],
-    },
-};

package/lib/skeletons/_angular/options/openid-jwt/src/environments/environment.ts

@@ -1,11 +0,0 @@
-import { EuiEnvConfig } from '@eui/core';
-
-export const environment: EuiEnvConfig = {
-    production: false,
-    enableDevToolRedux: true,
-    envDynamicConfig: {
-        uri: 'assets/openid-login-config.json',
-        deepMerge: true,
-        merge: ['modules'],
-    },
-};

package/lib/skeletons/_angular/options/openid-jwt/src/index.html

@@ -1,21 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <meta charset="utf-8">
-        <title>Application name</title>
-        <base href="/"> <!-- replaced by either app build script / post-build replacement -->
-
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="icon" type="image/x-icon" href="favicon.ico">
-        <script type="text/javascript" src="assets/jsrsasign-all-min.js"></script>
-        <script type="text/javascript" src="assets/oidc-client.min.js"></script>
-        <script type="text/javascript" src="assets/openid-login.js"></script>
-    </head>
-    <body>
-        <app-root>
-            <div id="loader-wrapper">
-                <div id="loader"></div>
-            </div>
-        </app-root>
-    </body>
-</html>