Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e68e605
[CST-5309] Added LoginOrcid component
Apr 14, 2021
cc08a28
[CST-5668] ORCID Authorizations added.
Apr 13, 2022
dd4ff5e
[CST-5338] ORCID Settings added.
Apr 13, 2022
0d09dbd
Merge remote-tracking branch '4Science-bitbucket/CST-5668' into CST-5307
Apr 27, 2022
fd00b55
Merge branch 'CST-5309' into CST-5307
Apr 27, 2022
ad39ad3
Merge remote-tracking branch '4Science-bitbucket/CST-5338' into CST-5307
Apr 27, 2022
3b550b5
Merge branch 'CST-5307' into CST-5668
May 3, 2022
bdad05b
Merge branch 'CST-5307' into CST-5668
May 6, 2022
da1fb55
[CST-5668] Fixed orcid page
May 6, 2022
733688b
Merge remote-tracking branch '4Science-bitbucket/main' into CST-5668
May 18, 2022
06091e3
[CST-5668] Improved orcid page adding back button and fixing synchron…
May 20, 2022
bdc8c5d
Merge branch 'main' into CST-5668
May 20, 2022
857a3c5
[CST-5668] Fixed lint warnings
May 20, 2022
7320d1c
[CST-5668] Removed unused imports
Jun 7, 2022
43f4ff7
[CST-5668] Fixed DsoPageOrcidButtonComponent test
Jun 7, 2022
a9fcdce
CST-5309 changes for error page component
nikunj59 Jun 7, 2022
1e9e4d5
CST-5309 added test cases
nikunj59 Jun 7, 2022
b062534
Merge remote-tracking branch '4Science-github/main' into CST-5668
Jun 7, 2022
7ea208e
[CST-5668] Fixed lint warnings
Jun 7, 2022
b03c73e
Merge remote-tracking branch 'origin/main' into CST-5668
atarix83 Jun 9, 2022
c3ececd
[CST-5668] Retrieve item from route data
atarix83 Jun 9, 2022
17cc307
[CST-5668] Fix after merge
atarix83 Jun 9, 2022
3cb5e0c
[CST-5668] Fix button style and tooltip messages
atarix83 Jun 10, 2022
b372a27
[CST-5668] Add test for orcid-page.component
atarix83 Jun 10, 2022
03369b8
[CST-5668] Address feedback and add test for orcid-auth.component
atarix83 Jun 10, 2022
10f4f80
[CST-5668] Create and abstract component for authentication with exte…
atarix83 Jun 10, 2022
0b0fae4
[CST-5668] Fix layout and add typedoc
atarix83 Jun 13, 2022
98f1bae
[CST-5668] Rename component
atarix83 Jun 13, 2022
a915659
[CST-5668] Add test
atarix83 Jun 13, 2022
9b6aa9f
[CST-5668] Improve synchronization description
atarix83 Jun 13, 2022
d94e6ad
[CST-5668] Add description messages
atarix83 Jun 14, 2022
03af265
[CST-5668] Fix issue with notification css that override min-width fo…
atarix83 Jun 14, 2022
3a4d770
[CST-5668] Fix layout
atarix83 Jun 14, 2022
a0ea69a
[CST-5668] use orcid icon as button
atarix83 Jun 14, 2022
eda4797
[CST-5668] Implement orcid linking by redirect on front-end
atarix83 Jun 14, 2022
09be335
[CST-5668] Remove outer box
atarix83 Jun 14, 2022
94281fd
[CST-5668] fix issue with cards margin with small window
atarix83 Jun 14, 2022
82748c5
[CST-5668] fix cache issue when settings are updated
atarix83 Jun 15, 2022
9a9010f
Merge remote-tracking branch 'origin/main' into CST-5668
atarix83 Jun 16, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app/app-routing-paths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ export function getPageInternalServerErrorRoute() {
return `/${INTERNAL_SERVER_ERROR}`;
}

export const ERROR_PAGE = 'error';

export const INFO_MODULE_PATH = 'info';
export function getInfoModulePath() {
return `/${INFO_MODULE_PATH}`;
Expand Down
3 changes: 3 additions & 0 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
ACCESS_CONTROL_MODULE_PATH,
ADMIN_MODULE_PATH,
BITSTREAM_MODULE_PATH,
ERROR_PAGE,
FORBIDDEN_PATH,
FORGOT_PASSWORD_PATH,
HEALTH_PAGE_PATH,
Expand Down Expand Up @@ -38,11 +39,13 @@ import {
} from './page-internal-server-error/themed-page-internal-server-error.component';
import { ServerCheckGuard } from './core/server-check/server-check.guard';
import { MenuResolver } from './menu.resolver';
import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';

@NgModule({
imports: [
RouterModule.forRoot([
{ path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
{ path: ERROR_PAGE , component: ThemedPageErrorComponent },
{
path: '',
canActivate: [AuthBlockingGuard],
Expand Down
3 changes: 2 additions & 1 deletion src/app/core/auth/models/auth.method-type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ export enum AuthMethodType {
Ldap = 'ldap',
Ip = 'ip',
X509 = 'x509',
Oidc = 'oidc'
Oidc = 'oidc',
Orcid = 'orcid'
}
5 changes: 5 additions & 0 deletions src/app/core/auth/models/auth.method.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ export class AuthMethod {
this.location = location;
break;
}
case 'orcid': {
this.authMethodType = AuthMethodType.Orcid;
this.location = location;
break;
}

default: {
break;
Expand Down
10 changes: 7 additions & 3 deletions src/app/core/core.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import { SubmissionSectionModel } from './config/models/config-submission-sectio
import { SubmissionUploadsModel } from './config/models/config-submission-uploads.model';
import { SubmissionFormsConfigService } from './config/submission-forms-config.service';
import { coreEffects } from './core.effects';
import { coreReducers} from './core.reducers';
import { coreReducers } from './core.reducers';
import { BitstreamFormatDataService } from './data/bitstream-format-data.service';
import { CollectionDataService } from './data/collection-data.service';
import { CommunityDataService } from './data/community-data.service';
Expand Down Expand Up @@ -132,11 +132,15 @@ import { Feature } from './shared/feature.model';
import { Authorization } from './shared/authorization.model';
import { FeatureDataService } from './data/feature-authorization/feature-data.service';
import { AuthorizationDataService } from './data/feature-authorization/authorization-data.service';
import { SiteAdministratorGuard } from './data/feature-authorization/feature-authorization-guard/site-administrator.guard';
import {
SiteAdministratorGuard
} from './data/feature-authorization/feature-authorization-guard/site-administrator.guard';
import { Registration } from './shared/registration.model';
import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
import { MetadataFieldDataService } from './data/metadata-field-data.service';
import { DsDynamicTypeBindRelationService } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
import {
DsDynamicTypeBindRelationService
} from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
import { TokenResponseParsingService } from './auth/token-response-parsing.service';
import { SubmissionCcLicenseDataService } from './submission/submission-cc-license-data.service';
import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';
Expand Down
1 change: 1 addition & 0 deletions src/app/core/data/feature-authorization/feature-id.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ export enum FeatureID {
CanViewUsageStatistics = 'canViewUsageStatistics',
CanSendFeedback = 'canSendFeedback',
CanClaimItem = 'canClaimItem',
CanSynchronizeWithORCID = 'canSynchronizeWithORCID'
}
Loading