[RELEASE] create version v0.4.1

.island/release.bash

@@ -2,10 +2,11 @@
 
 version_file="version.txt"
 
-if grep -q "dev" "$version_file"; then
-    # update all dependency
 new_version=$(cat $version_file)
 sed -i "s|\"version\":.*\".*\"|\"version\":\"$new_version\"|" package.json
+
+if grep -q "dev" "$version_file"; then
+    # update all dependency
     pnpm install
     pnpm run update_packages
 else

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kangaroo-and-rabbit/kar-cw",
-  "version":"0.2.2-dev",
+  "version": "0.4.1",
   "sideEffects": false,
   "scripts": {
     "dev": "ng build kar-cw --watch --configuration development",
@@ -13,13 +13,13 @@
     "install_dependency": "pnpm install --force"
   },
   "peerDependencies": {
-    "@angular/common": "^17.3.6",
-    "@angular/compiler": "^17.3.6",
-    "@angular/core": "^17.3.6",
-    "@angular/forms": "^17.3.6",
-    "@angular/platform-browser": "^17.3.6",
-    "@angular/platform-browser-dynamic": "^17.3.6",
-    "@angular/router": "^17.3.6",
+    "@angular/common": "^18.0.0",
+    "@angular/compiler": "^18.0.0",
+    "@angular/core": "^18.0.0",
+    "@angular/forms": "^18.0.0",
+    "@angular/platform-browser": "^18.0.0",
+    "@angular/platform-browser-dynamic": "^18.0.0",
+    "@angular/router": "^18.0.0",
     "rxjs": "~7.8.1",
     "zone.js": "~0.14.5"
   },
@@ -27,9 +27,9 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.3.7",
-    "@angular/cli": "^17.3.7",
-    "@angular/compiler-cli": "^17.3.8",
+    "@angular-devkit/build-angular": "^18.0.1",
+    "@angular/cli": "^18.0.1",
+    "@angular/compiler-cli": "^18.0.0",
     "@types/jasmine": "~5.1.4",
     "jasmine-core": "~5.1.2",
     "karma": "~6.4.3",
@@ -37,7 +37,7 @@
     "karma-coverage": "~2.2.1",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "ng-packagr": "^17.3.0",
+    "ng-packagr": "^18.0.0",
     "typescript": "~5.4.5",
     "npm-check-updates": "^16.14.20"
   },

src/service/sso.ts

@@ -47,7 +47,7 @@ export class SSOService {
 		) {
 			return this.utf8_to_b64(data);
 		}
-		const pathName = getApplicationLocation();
+		const pathName = getApplicationLocation(this.environment);
 		if (isInArray(pathName, ['sso', '/sso', '/sso/'])) {
 			return this.utf8_to_b64('home');
 		}

src/service/user.ts

@@ -13,6 +13,7 @@ import { SSOService } from './sso';
 import { getApplicationLocation, isNullOrUndefined, sha512 } from '../utils';
 import { HttpWrapperService, HTTPRequestModel, HTTPMimeType, ModelResponseHttp } from './http-wrapper_kjdhqslkjf';
 import { Environment } from '../model/environment';
+import { APP_BASE_HREF } from '@angular/common';
 
 
 @Injectable()
@@ -76,7 +77,7 @@ export class UserService {
 	 * Check if the system can be connected
 	 */
 	checkAutoConnect(): Promise<void> {
-		let locationOrigin = getApplicationLocation();
+		let locationOrigin = getApplicationLocation(this.environment);
 		const self = this;
 		return new Promise<void>((resolve, reject) => {
 			// Need to use the windows global route to prevent the log in cycle ...
@@ -91,7 +92,7 @@ export class UserService {
 			}
 			console.log('    ==> Check if need reconnect?');
 			let rememberMe = self.getRememberMe();
-			// TODO: in case of jest reload ==> no need to manage the SSO ==> just keep the token ... it in enought...
+			// TODO: in case of jest reload ==> no need to manage the SSO ==> just keep the token ... it in enough...
 			let token: undefined | string = undefined;
 			if (
 				isNullOrUndefined(this.environment.tokenStoredInPermanentStorage) ||
@@ -109,7 +110,7 @@ export class UserService {
 				self.startSession(token ?? '', rememberMe)
 					.then(() => {
 						self.router.navigateByUrl(locationOrigin);
-						console.log(`update global URL = ${locationOrigin}`);
+						console.log(`update global URL = ${locationOrigin} APP_BASE_HREF=${APP_BASE_HREF}`);
 						resolve();
 					})
 					.catch(() => {

src/utils/applPath.ts

@@ -1,12 +1,11 @@
 //import { environment } from 'environments/environment';
 
-export function getApplicationLocation(): string {
+import { Environment } from "../model";
+
+export function getApplicationLocation(environment: Environment): string {
 	let pathName = location.pathname;
-	return pathName;
 	//console.log("start Path-name: '" + pathName  + "'");
 	//console.log("check with:      '" + environment.applName + "/sso/" + "'");
-	/*
-	
 	if (pathName.startsWith('/' + environment.applName + '/')) {
 		pathName = pathName.substring(environment.applName.length + 2);
 	} else if (pathName.startsWith('/' + environment.applName)) {
@@ -17,5 +16,4 @@ export function getApplicationLocation(): string {
 		pathName = pathName.substring(environment.applName.length);
 	}
 	return pathName;
-	*/
 }

version.txt

@@ -1 +1 @@
-0.2.3
+0.4.1