kangaroo-and-rabbit/karideo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DEV] correct the connection

Browse Source
This commit is contained in:
Edouard DUPIN 2022-12-14 23:45:20 +01:00
parent 7f7b73ec51
commit 6f96c0b929
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -70,7 +70,7 @@ RUN apk add --no-cache wget
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8
COPY --from=buildBack /tmp/out/maven/*.jar /application/application.jar COPY --from=buildBack /tmp/out/maven/*.jar /application/application.jar
COPY --from=buildFront /tmp/dist /application/karideo/ COPY --from=buildFront /tmp/dist /application/front/
WORKDIR /application/ WORKDIR /application/

7
front/src/app/app.component.ts
View File

@ -58,14 +58,17 @@ export class AppComponent implements OnInit {
self.isConnected = isConnected; self.isConnected = isConnected;
self.autoConnectedDone = true; self.autoConnectedDone = true;
self.updateMainMenu(); self.updateMainMenu();
if (isConnected) {
console.log("Is connected then back to the requested page")
self.router.navigateByUrl(self.location);
console.log(`update global URL = ${self.location}`);
}
}); });
this.ssoService.checkSignUpEnable() this.ssoService.checkSignUpEnable()
.then((value: boolean) => { .then((value: boolean) => {
console.log(`Get value signUp = ${value}`); console.log(`Get value signUp = ${value}`);
self.signUpEnable = value; self.signUpEnable = value;
self.updateMainMenu(); self.updateMainMenu();
self.router.navigateByUrl(self.location);
console.log(`update global URL = ${self.location}`);
}).catch((error: any) => { }).catch((error: any) => {
console.log(`Can not call the sso to check the sign-up_interface: ${error}`); console.log(`Can not call the sso to check the sign-up_interface: ${error}`);
}); });

5
front/src/common/service/session.ts
View File

@ -48,7 +48,7 @@ export class SessionService {
userBlocked: boolean; userBlocked: boolean;
userRemoved: boolean; userRemoved: boolean;
userAvatar: string; userAvatar: string;
tokenJwt?: string; tokenJwt: string;
}) { }) {
console.log(`Session Create: userId=${userId} userLogin=${userLogin} userEMail=${userEMail} userAdmin=${userAdmin} userAvatar=${userAvatar} sessionId = ${sessionId} tokenJwt = ${tokenJwt}`); console.log(`Session Create: userId=${userId} userLogin=${userLogin} userEMail=${userEMail} userAdmin=${userAdmin} userAvatar=${userAvatar} sessionId = ${sessionId} tokenJwt = ${tokenJwt}`);
this.tokenJwt = tokenJwt; this.tokenJwt = tokenJwt;
@ -76,9 +76,6 @@ export class SessionService {
this.userAvatar = null; this.userAvatar = null;
this.change.emit(false); this.change.emit(false);
} }
setToken(jwt: string) {
this.tokenJwt = jwt;
}
getToken(): string | undefined { getToken(): string | undefined {
return this.tokenJwt; return this.tokenJwt;
} }

2
front/src/common/service/sso.ts
View File

@ -30,7 +30,7 @@ export class SSOService {
* Request SSO connection * Request SSO connection
*/ */
hashLocalData(data?: string): string { hashLocalData(data?: string): string {
if (!isNullOrUndefined(data) && !isInArray(data, ["", "null", "NULL", "undefined", "---"])) { if (!isNullOrUndefined(data) && !isInArray(data, ["", "null", "NULL", "undefined", "---", "unregistered", "unregistered/", "forbidden", "forbidden/"])) {
return this.utf8_to_b64(data); return this.utf8_to_b64(data);
} }
let pathName = window.location.pathname; let pathName = window.location.pathname;

5
front/src/common/service/user.ts
View File

@ -146,8 +146,6 @@ export class UserService {
if(rememberMe === true) { if(rememberMe === true) {
self.storageService.set(self.cookiesRememberMe, rememberMe?"true":"false"); self.storageService.set(self.cookiesRememberMe, rememberMe?"true":"false");
} }
// transfer the session token property
self.sessionService.setToken(token);
if (isNullOrUndefined(environment.tokenStoredInPermanentStorage) || environment.tokenStoredInPermanentStorage !== true) { if (isNullOrUndefined(environment.tokenStoredInPermanentStorage) || environment.tokenStoredInPermanentStorage !== true) {
self.storageService.setSession(self.cookiesToken, token); self.storageService.setSession(self.cookiesToken, token);
} else { } else {
@ -182,7 +180,8 @@ export class UserService {
userAdmin: response.data.admin, userAdmin: response.data.admin,
userBlocked: response.data.blocked, userBlocked: response.data.blocked,
userRemoved: response.data.removed, userRemoved: response.data.removed,
userAvatar: response.data.avatar userAvatar: response.data.avatar,
tokenJwt: token,
}); });
resolve(true); resolve(true);
}).catch((error:any) => { }).catch((error:any) => {

2
front/src/environments/environment.ts
View File

@ -55,5 +55,5 @@ const environment_hybrid = {
}; };
export const environment = environment_local; export const environment = environment_back_prod;