MaDgIK
/
irish-monitor
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

[master | CHAMGED]: Change login service properties with the new ones.

This commit is contained in:
Konstantinos Triantafyllou 2024-01-07 01:43:04 +02:00
parent 7dd41ad40c
commit 26250ede6a
6 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/claims/claimsAdmin/claimsAdmin.component.ts
View File

@ -4,7 +4,7 @@ import {properties} from "../../../environments/environment";
@Component({ @Component({
selector: 'openaire-claims-admin', selector: 'openaire-claims-admin',
template: ` template: `
<claims-admin *ngIf="claimsInfoURL && userInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL"> <claims-admin *ngIf="claimsInfoURL && userInfoURL" [claimsInfoURL]="claimsInfoURL">
</claims-admin> </claims-admin>
`, `,
}) })
@ -17,6 +17,5 @@ export class OpenaireClaimsAdminComponent implements OnInit {
public ngOnInit() { public ngOnInit() {
this.claimsInfoURL = properties.claimsInformationLink; this.claimsInfoURL = properties.claimsInformationLink;
this.userInfoURL = properties.userInfoUrl;
} }
} }

3
src/app/claims/myClaims/myClaims.component.ts
View File

@ -5,7 +5,7 @@ import {properties} from "../../../environments/environment";
@Component({ @Component({
selector: 'openaire-my-claims', selector: 'openaire-my-claims',
template: ` template: `
<my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL"> <my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]="claimsInfoURL">
</my-claims> </my-claims>
` `
@ -19,6 +19,5 @@ export class OpenaireMyClaimsComponent implements OnInit {
public ngOnInit() { public ngOnInit() {
this.claimsInfoURL = properties.claimsInformationLink; this.claimsInfoURL = properties.claimsInformationLink;
this.userInfoURL = properties.userInfoUrl;
} }
} }

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit abaa7764b941aeafc04051c2de5f10c8ff55b667 Subproject commit bc4e30c3f2dc0294cec798252c5c040fe3e377e3

4
src/environments/environment.beta.ts
View File

@ -12,9 +12,7 @@ let props: EnvProperties = {
logServiceUrl: "https://beta.oamonitor.ireland.openaire.eu/", logServiceUrl: "https://beta.oamonitor.ireland.openaire.eu/",
logFilesPath: "/srv/nodejs/irish-monitor-action-logs/", logFilesPath: "/srv/nodejs/irish-monitor-action-logs/",
myClaimsLink:"/participate/myclaims", myClaimsLink:"/participate/myclaims",
loginUrl: ["https://beta.services.openaire.eu/irish-monitor-service/openid_connect_login", <string>commonBeta.loginUrl], loginServiceURL: ["https://beta.services.openaire.eu/irish-monitor-service/", <string>commonBeta.loginServiceURL],
userInfoUrl: "https://beta.services.openaire.eu/irish-monitor-service/userInfo",
logoutUrl: ["https://beta.services.openaire.eu/irish-monitor-service/openid_logout", <string>commonBeta.logoutUrl],
afterLoginRedirectLink: "/user-policy", afterLoginRedirectLink: "/user-policy",
admins: ['oamonitor.ireland@openaire.eu'], admins: ['oamonitor.ireland@openaire.eu'],
useHelpTexts: false useHelpTexts: false

11
src/environments/environment.prod.ts
View File

@ -1,5 +1,10 @@
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; 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 = { let props: EnvProperties = {
monitorServiceAPIURL: "https://services.openaire.eu/irish-monitor-service/", monitorServiceAPIURL: "https://services.openaire.eu/irish-monitor-service/",
@ -12,9 +17,7 @@ let props: EnvProperties = {
logServiceUrl: "https://oamonitor.ireland.openaire.eu/", logServiceUrl: "https://oamonitor.ireland.openaire.eu/",
logFilesPath: "/srv/static/nodejs/irish-monitor-action-logs/", logFilesPath: "/srv/static/nodejs/irish-monitor-action-logs/",
myClaimsLink:"/participate/myclaims", myClaimsLink:"/participate/myclaims",
loginUrl: ["https://services.openaire.eu/irish-monitor-service/openid_connect_login", <string>commonProd.loginUrl], loginServiceURL: ["https://services.openaire.eu/irish-monitor-service/", <string>commonProd.loginServiceURL],
userInfoUrl: "https://services.openaire.eu/irish-monitor-service/userInfo",
logoutUrl: ["https://services.openaire.eu/irish-monitor-service/openid_logout", <string>commonProd.logoutUrl],
afterLoginRedirectLink: "/user-policy", afterLoginRedirectLink: "/user-policy",
admins: ['oamonitor.ireland@openaire.eu'], admins: ['oamonitor.ireland@openaire.eu'],
useHelpTexts: false useHelpTexts: false

6
src/environments/environment.ts
View File

@ -14,7 +14,7 @@ let props: EnvProperties = {
piwikSiteId: "407", piwikSiteId: "407",
enablePiwikTrack:false, enablePiwikTrack:false,
piwikBaseUrl: 'https://beta.analytics.openaire.eu/piwik.php?idsite=', piwikBaseUrl: 'https://beta.analytics.openaire.eu/piwik.php?idsite=',
disableFrameLoad: false, disableFrameLoad: true,
adminToolsPortalType: 'irish', adminToolsPortalType: 'irish',
adminToolsCommunity: 'irish', adminToolsCommunity: 'irish',
domain: "http://mpagasas.di.uoa.gr:5500", domain: "http://mpagasas.di.uoa.gr:5500",
@ -22,9 +22,7 @@ let props: EnvProperties = {
logServiceUrl: "http://scoobydoo.di.uoa.gr:4200/", logServiceUrl: "http://scoobydoo.di.uoa.gr:4200/",
logFilesPath: "/var/log/irish-log/", logFilesPath: "/var/log/irish-log/",
myClaimsLink:"/participate/myclaims", myClaimsLink:"/participate/myclaims",
loginUrl: ["http://duffy.di.uoa.gr:19780/irish-monitor-service/openid_connect_login", <string>commonDev.loginUrl], loginServiceURL: ["http://duffy.di.uoa.gr:19780/irish-monitor-service/", <string>commonDev.loginServiceURL],
userInfoUrl: "http://duffy.di.uoa.gr:19780/irish-monitor-service/userInfo",
logoutUrl: ["http://duffy.di.uoa.gr:19780/irish-monitor-service/openid_logout", <string>commonDev.logoutUrl],
afterLoginRedirectLink: "/user-policy", afterLoginRedirectLink: "/user-policy",
useHelpTexts: false useHelpTexts: false
} }