Working on shib

ORCID · Feb 25, 2019 · fe31fc1f4eddac767094e5e59c54765f81940b35 · fe31fc1
1 parent 2793c03
commit fe31fc1f4eddac767094e5e59c54765f81940b35
diff --git a/orcid-web/src/main/resources/freemarker/disco.ftl b/orcid-web/src/main/resources/freemarker/disco.ftl
diff --git a/orcid-web/src/main/resources/freemarker/includes/ng2_templates/funding-ng2-template.ftl b/orcid-web/src/main/resources/freemarker/includes/ng2_templates/funding-ng2-template.ftl
@@ -130,7 +130,7 @@
                     <div class="row wizards">               
                         <div class="col-md-12 col-sm-12 col-xs-12">
                             <div *ngFor="let wtw of fundingImportWizardList">
-                                <strong><a (click)="openImportWizardUrlFilter('{{getBaseUri()}}/oauth/authorize', wtw)">{{wtw.name}}</a></strong>
+                                <strong><a (click)="openImportWizardUrlFilter(getBaseUri() + '/oauth/authorize', wtw)">{{wtw.name}}</a></strong>
 
                                 <br />                                                                                    
                                 <div class="justify">                       

diff --git a/orcid-web/src/main/resources/freemarker/includes/ng2_templates/peer-review-ng2-template.ftl b/orcid-web/src/main/resources/freemarker/includes/ng2_templates/peer-review-ng2-template.ftl
@@ -113,7 +113,7 @@
                     <div class="row wizards">               
                         <div class="col-md-12 col-sm-12 col-xs-12">
                             <div *ngFor="let wtw of peerReviewImportWizardList">
-                                <strong><a (click)="openImportWizardUrlFilter('{{getBaseUri()}}/oauth/authorize', wtw)">{{wtw.name}}</a></strong>
+                                <strong><a (click)="openImportWizardUrlFilter(getBaseUri() + '/oauth/authorize', wtw)">{{wtw.name}}</a></strong>
 
                                 <br />                                                                                    
                                 <div class="justify">                       

diff --git a/orcid-web/src/main/resources/freemarker/includes/ng2_templates/works-ng2-template.ftl b/orcid-web/src/main/resources/freemarker/includes/ng2_templates/works-ng2-template.ftl
@@ -207,7 +207,7 @@
                 <div class="row wizards">               
                     <div class="col-md-12 col-sm-12 col-xs-12">
                         <div *ngFor="let wtw of workImportWizardsOriginal | orderBy: 'name' | filterImportWizards : selectedWorkType : selectedGeoArea; let index = index; let first = first; let last = last;">
-                            <strong><a (click)="openImportWizardUrlFilter('{{getBaseUri()}}/oauth/authorize', wtw)">{{wtw.name}}</a></strong>
+                            <strong><a (click)="openImportWizardUrlFilter(getBaseUri() + '/oauth/authorize', wtw)">{{wtw.name}}</a></strong>
 
                             <br />                                                                                    
                             <div class="justify">                       

diff --git a/orcid-web/src/main/webapp/static/javascript/script.js b/orcid-web/src/main/webapp/static/javascript/script.js
@@ -360,10 +360,10 @@ function logAjaxError(e){
     console.log("responseText: " + e.responseText);*/
 }
 
-function getBaseUri() {
+function getBaseUri() {    
     var uri = location.protocol + '//' + location.host
-    if(window.location.host.startsWith('localhost')) {
-        uri = uri + '/orcid-web'
+    if(window.location.host.startsWith('localhost:8443') | window.location.host.startsWith('localhost:8080')) {
+        uri = uri + '/orcid-web';        
     }    
     return uri;
 }
@@ -460,7 +460,7 @@ function logOffReload(reload_param) {
 $(function() {
 
     // Common
-    window.baseUrl = $('body').data('baseurl');
+    window.baseUrl = getBaseUri() + '/';
     window.basePath = window.location.pathname;
 
     // fire off  check, if this page wasn't loaded via iframe (or html5