Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions src/app/core/interceptors/auth.interceptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,19 @@ export const authInterceptor: HttpInterceptorFn = (
const localStorageToken = localStorage.getItem('authToken');
const token = localStorageToken || authToken;
if (token) {
const authReq = req.clone({
setHeaders: {
Authorization: `Bearer ${token}`,
Accept: req.responseType === 'text' ? '*/*' : 'application/vnd.api+json',
'Content-Type': 'application/vnd.api+json',
},
});
if (!req.url.includes('/api.crossref.org/funders')) {
const authReq = req.clone({
setHeaders: {
Authorization: `Bearer ${token}`,
Accept: req.responseType === 'text' ? '*/*' : 'application/vnd.api+json',
'Content-Type': 'application/vnd.api+json',
},
});

return next(authReq);
return next(authReq);
} else {
return next(req);
}
}

return next(req);
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export class CedarMetadataHelper {

return items.map((item) => {
const safeItem = typeof item === 'object' && item !== null ? (item as Record<string, unknown>) : {};

return {
'@id': safeItem['@id'] ?? '',
'@type': safeItem['@type'] ?? '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ export interface CedarMetadataRecordData {
};
target: {
data: {
type: 'nodes';
type: 'nodes' | 'registrations';
id: string;
};
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import { ChangeDetectionStrategy, Component, DestroyRef, effect, HostBinding, in
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { ActivatedRoute, Router } from '@angular/router';

import { CedarTemplateFormComponent } from '@osf/features/project/metadata/components';
import {
CedarMetadataDataTemplateJsonApi,
CedarMetadataRecord,
CedarMetadataRecordData,
CedarRecordDataBinding,
} from '@osf/features/project/metadata/models';
import { LoadingSpinnerComponent, SubHeaderComponent } from '@shared/components';
import { CedarTemplateFormComponent } from '@shared/components/shared-metadata/components';
import { ToastService } from '@shared/services';

import {
Expand Down Expand Up @@ -57,10 +57,6 @@ export class AddMetadataComponent implements OnInit {
updateCedarMetadataRecord: UpdateCedarMetadataRecord,
});

get isEditingExistingRecord(): boolean {
return !!this.activatedRoute.snapshot.params['record-id'];
}

constructor() {
effect(() => {
const records = this.cedarRecords();
Expand Down
Loading