From 26250ede6a1ac7fb325aee916bea80d16cc897c4 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Sun, 7 Jan 2024 01:43:04 +0200 Subject: [PATCH] [master | CHAMGED]: Change login service properties with the new ones. --- src/app/claims/claimsAdmin/claimsAdmin.component.ts | 3 +-- src/app/claims/myClaims/myClaims.component.ts | 3 +-- src/app/openaireLibrary | 2 +- src/environments/environment.beta.ts | 4 +--- src/environments/environment.prod.ts | 11 +++++++---- src/environments/environment.ts | 6 ++---- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/app/claims/claimsAdmin/claimsAdmin.component.ts b/src/app/claims/claimsAdmin/claimsAdmin.component.ts index 23f4e19..4a090a3 100644 --- a/src/app/claims/claimsAdmin/claimsAdmin.component.ts +++ b/src/app/claims/claimsAdmin/claimsAdmin.component.ts @@ -4,7 +4,7 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-claims-admin', template: ` - + `, }) @@ -17,6 +17,5 @@ export class OpenaireClaimsAdminComponent implements OnInit { public ngOnInit() { this.claimsInfoURL = properties.claimsInformationLink; - this.userInfoURL = properties.userInfoUrl; } } diff --git a/src/app/claims/myClaims/myClaims.component.ts b/src/app/claims/myClaims/myClaims.component.ts index da297ff..84d6826 100644 --- a/src/app/claims/myClaims/myClaims.component.ts +++ b/src/app/claims/myClaims/myClaims.component.ts @@ -5,7 +5,7 @@ import {properties} from "../../../environments/environment"; @Component({ selector: 'openaire-my-claims', template: ` - + ` @@ -19,6 +19,5 @@ export class OpenaireMyClaimsComponent implements OnInit { public ngOnInit() { this.claimsInfoURL = properties.claimsInformationLink; - this.userInfoURL = properties.userInfoUrl; } } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index abaa776..bc4e30c 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit abaa7764b941aeafc04051c2de5f10c8ff55b667 +Subproject commit bc4e30c3f2dc0294cec798252c5c040fe3e377e3 diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 47e954e..4d42aa6 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -12,9 +12,7 @@ let props: EnvProperties = { logServiceUrl: "https://beta.oamonitor.ireland.openaire.eu/", logFilesPath: "/srv/nodejs/irish-monitor-action-logs/", myClaimsLink:"/participate/myclaims", - loginUrl: ["https://beta.services.openaire.eu/irish-monitor-service/openid_connect_login", commonBeta.loginUrl], - userInfoUrl: "https://beta.services.openaire.eu/irish-monitor-service/userInfo", - logoutUrl: ["https://beta.services.openaire.eu/irish-monitor-service/openid_logout", commonBeta.logoutUrl], + loginServiceURL: ["https://beta.services.openaire.eu/irish-monitor-service/", commonBeta.loginServiceURL], afterLoginRedirectLink: "/user-policy", admins: ['oamonitor.ireland@openaire.eu'], useHelpTexts: false diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index cb37cfa..894a195 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,5 +1,10 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; -import {common, commonDev, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; +import { + common, + commonBeta, + commonDev, + commonProd +} from "../app/openaireLibrary/utils/properties/environments/environment"; let props: EnvProperties = { monitorServiceAPIURL: "https://services.openaire.eu/irish-monitor-service/", @@ -12,9 +17,7 @@ let props: EnvProperties = { logServiceUrl: "https://oamonitor.ireland.openaire.eu/", logFilesPath: "/srv/static/nodejs/irish-monitor-action-logs/", myClaimsLink:"/participate/myclaims", - loginUrl: ["https://services.openaire.eu/irish-monitor-service/openid_connect_login", commonProd.loginUrl], - userInfoUrl: "https://services.openaire.eu/irish-monitor-service/userInfo", - logoutUrl: ["https://services.openaire.eu/irish-monitor-service/openid_logout", commonProd.logoutUrl], + loginServiceURL: ["https://services.openaire.eu/irish-monitor-service/", commonProd.loginServiceURL], afterLoginRedirectLink: "/user-policy", admins: ['oamonitor.ireland@openaire.eu'], useHelpTexts: false diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 1bbe628..17712b7 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -14,7 +14,7 @@ let props: EnvProperties = { piwikSiteId: "407", enablePiwikTrack:false, piwikBaseUrl: 'https://beta.analytics.openaire.eu/piwik.php?idsite=', - disableFrameLoad: false, + disableFrameLoad: true, adminToolsPortalType: 'irish', adminToolsCommunity: 'irish', domain: "http://mpagasas.di.uoa.gr:5500", @@ -22,9 +22,7 @@ let props: EnvProperties = { logServiceUrl: "http://scoobydoo.di.uoa.gr:4200/", logFilesPath: "/var/log/irish-log/", myClaimsLink:"/participate/myclaims", - loginUrl: ["http://duffy.di.uoa.gr:19780/irish-monitor-service/openid_connect_login", commonDev.loginUrl], - userInfoUrl: "http://duffy.di.uoa.gr:19780/irish-monitor-service/userInfo", - logoutUrl: ["http://duffy.di.uoa.gr:19780/irish-monitor-service/openid_logout", commonDev.logoutUrl], + loginServiceURL: ["http://duffy.di.uoa.gr:19780/irish-monitor-service/", commonDev.loginServiceURL], afterLoginRedirectLink: "/user-policy", useHelpTexts: false }