Merge pull request #1150 from ORCID/add-protocol-to-orcid-base-url-

add protocol to orcid base url
ORCID · Apr 4, 2024 · 4437428 · 4437428
2 parents d6f90e7 + 3171476
commit 4437428
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ui/src/app/affiliation/affiliations.component.html b/ui/src/app/affiliation/affiliations.component.html
@@ -158,8 +158,8 @@ <h1 id="page-heading" class="mt-3" i18n="@@gatewayApp.assertionServiceAssertion.
           <td>{{ affiliation.email }}</td>
           <td>
             <span *ngIf="affiliation.orcidId"
-              ><a href="https://{{ orcidBaseUrl }}/{{ affiliation.orcidId }}" target="_blank"
-                >https://{{ orcidBaseUrl }}/{{ affiliation.orcidId }}</a
+              ><a href="{{ orcidBaseUrl }}/{{ affiliation.orcidId }}" target="_blank"
+                >{{ orcidBaseUrl }}/{{ affiliation.orcidId }}</a
               ></span
             >
           </td>

diff --git a/ui/src/app/app.constants.ts b/ui/src/app/app.constants.ts
@@ -41,7 +41,7 @@ export function emailValidator(control: FormControl): { [key: string]: any } | n
   return null
 }
 const environment = window.location.hostname.replace('member-portal.', '').replace('.orcid.org', '')
-export const ORCID_BASE_URL = environment + '.orcid.org'
+export const ORCID_BASE_URL = 'https://' + environment + '.orcid.org'
 
 // eslint-disable-next-line
 export const EMAIL_REGEXP = /^([^@\s]|(".+"))+@([^@\s\."'\(\)\[\]\{\}\\/,:;]+\.)+([^@\s\."'\(\)\[\]\{\}\\/,:;]{2,})+$/

diff --git a/ui/src/app/landing-page/landing-page.component.spec.ts b/ui/src/app/landing-page/landing-page.component.spec.ts
@@ -55,7 +55,7 @@ describe('LandingPageComponent', () => {
     component.processRequest('someState', '', '')
     expect(landingPageService.getOrcidConnectionRecord).toHaveBeenCalled()
     expect(component.oauthUrl).toBe(
-      'localhost.orcid.org/oauth/authorize?response_type=token&redirect_uri=/landing-page&client_id=name&scope=/read-limited /activities/update /person/update openid&prompt=login&state=someState'
+      'https://localhost.orcid.org/oauth/authorize?response_type=token&redirect_uri=/landing-page&client_id=name&scope=/read-limited /activities/update /person/update openid&prompt=login&state=someState'
     )
     expect(landingPageService.getPublicKey).toHaveBeenCalledTimes(0)
     expect(windowLocationService.updateWindowLocation).toHaveBeenCalled()
@@ -72,7 +72,7 @@ describe('LandingPageComponent', () => {
     component.processRequest('someState', '', '')
     expect(landingPageService.getOrcidConnectionRecord).toHaveBeenCalled()
     expect(component.oauthUrl).toBe(
-      'localhost.orcid.org/oauth/authorize?response_type=token&redirect_uri=/landing-page&client_id=name&scope=/read-limited /activities/update /person/update openid&prompt=login&state=someState'
+      'https://localhost.orcid.org/oauth/authorize?response_type=token&redirect_uri=/landing-page&client_id=name&scope=/read-limited /activities/update /person/update openid&prompt=login&state=someState'
     )
     expect(landingPageService.getPublicKey).toHaveBeenCalledTimes(0)
     expect(windowLocationService.updateWindowLocation).toHaveBeenCalledTimes(0)
@@ -92,7 +92,7 @@ describe('LandingPageComponent', () => {
     component.processRequest('someState', '', '')
     expect(landingPageService.getOrcidConnectionRecord).toHaveBeenCalled()
     expect(component.oauthUrl).toBe(
-      'localhost.orcid.org/oauth/authorize?response_type=token&redirect_uri=/landing-page&client_id=name&scope=/read-limited /activities/update /person/update openid&prompt=login&state=someState'
+      'https://localhost.orcid.org/oauth/authorize?response_type=token&redirect_uri=/landing-page&client_id=name&scope=/read-limited /activities/update /person/update openid&prompt=login&state=someState'
     )
     expect(landingPageService.getPublicKey).toHaveBeenCalledTimes(0)
     expect(windowLocationService.updateWindowLocation).toHaveBeenCalledTimes(0)