diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts index 3fb0de9d50..3d94e33668 100644 --- a/src/app/core/auth/auth-request.service.ts +++ b/src/app/core/auth/auth-request.service.ts @@ -8,15 +8,11 @@ import { tap, } from 'rxjs/operators'; -import { - isNotEmpty, - isNotEmptyOperator, -} from '../../shared/empty.util'; +import { isNotEmpty } from '../../shared/empty.util'; import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model'; import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service'; import { RemoteData } from '../data/remote-data'; import { - DeleteRequest, GetRequest, PostRequest, } from '../data/request.models'; @@ -24,12 +20,9 @@ import { RequestService } from '../data/request.service'; import { RestRequest } from '../data/rest-request.model'; import { HttpOptions } from '../dspace-rest/dspace-rest.service'; import { HALEndpointService } from '../shared/hal-endpoint.service'; -import { NoContent } from '../shared/NoContent.model'; import { getFirstCompletedRemoteData } from '../shared/operators'; -import { sendRequest } from '../shared/request.operators'; import { URLCombiner } from '../url-combiner/url-combiner'; import { AuthStatus } from './models/auth-status.model'; -import { MachineToken } from './models/machine-token.model'; import { ShortLivedToken } from './models/short-lived-token.model'; /** @@ -38,7 +31,6 @@ import { ShortLivedToken } from './models/short-lived-token.model'; export abstract class AuthRequestService { protected linkName = 'authn'; protected shortlivedtokensEndpoint = 'shortlivedtokens'; - protected machinetokenEndpoint = 'machinetokens'; constructor(protected halService: HALEndpointService, protected requestService: RequestService, @@ -148,31 +140,4 @@ export abstract class AuthRequestService { ); } - /** - * Send a post request to create a machine token - */ - public postToMachineTokenEndpoint(): Observable> { - return this.halService.getEndpoint(this.linkName).pipe( - isNotEmptyOperator(), - distinctUntilChanged(), - map((href: string) => new URLCombiner(href, this.machinetokenEndpoint).toString()), - map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL)), - tap((request: RestRequest) => this.requestService.send(request)), - switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)), - ); - } - - /** - * Send a delete request to destroy a machine token - */ - public deleteToMachineTokenEndpoint(): Observable> { - return this.halService.getEndpoint(this.linkName).pipe( - isNotEmptyOperator(), - distinctUntilChanged(), - map((href: string) => new URLCombiner(href, this.machinetokenEndpoint).toString()), - map((endpointURL: string) => new DeleteRequest(this.requestService.generateRequestId(), endpointURL)), - sendRequest(this.requestService), - switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)), - ); - } } diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index 59aabf25ec..109002a776 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -57,7 +57,6 @@ import { NativeWindowRef, NativeWindowService, } from '../services/window.service'; -import { NoContent } from '../shared/NoContent.model'; import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, @@ -80,7 +79,6 @@ import { AuthTokenInfo, TOKENITEM, } from './models/auth-token-info.model'; -import { MachineToken } from './models/machine-token.model'; import { getAuthenticatedUserId, getAuthenticationToken, @@ -692,18 +690,4 @@ export class AuthService { } } - /** - * Create a new machine token for the current user - */ - public createMachineToken(): Observable> { - return this.authRequestService.postToMachineTokenEndpoint(); - } - - /** - * Delete the machine token for the current user - */ - public deleteMachineToken(): Observable> { - return this.authRequestService.deleteToMachineTokenEndpoint(); - } - } diff --git a/src/app/core/auth/models/machine-token.model.ts b/src/app/core/auth/models/machine-token.model.ts deleted file mode 100644 index 1d146d743a..0000000000 --- a/src/app/core/auth/models/machine-token.model.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { - autoserialize, - autoserializeAs, - deserialize, -} from 'cerialize'; - -import { typedObject } from '../../cache/builders/build-decorators'; -import { CacheableObject } from '../../cache/cacheable-object.model'; -import { HALLink } from '../../shared/hal-link.model'; -import { ResourceType } from '../../shared/resource-type'; -import { excludeFromEquals } from '../../utilities/equals.decorators'; -import { MACHINE_TOKEN } from './machine-token.resource-type'; - -/** - * A machine token that can be used to authenticate a rest request - */ -@typedObject -export class MachineToken implements CacheableObject { - static type = MACHINE_TOKEN; - /** - * The type for this MachineToken - */ - @excludeFromEquals - @autoserialize - type: ResourceType; - - /** - * The value for this MachineToken - */ - @autoserializeAs('token') - value: string; - - /** - * The {@link HALLink}s for this MachineToken - */ - @deserialize - _links: { - self: HALLink; - }; -} diff --git a/src/app/core/auth/models/machine-token.resource-type.ts b/src/app/core/auth/models/machine-token.resource-type.ts deleted file mode 100644 index c3d3dabeb9..0000000000 --- a/src/app/core/auth/models/machine-token.resource-type.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { ResourceType } from '../../shared/resource-type'; - -/** - * The resource type for MachineToken - * - * Needs to be in a separate file to prevent circular - * dependencies in webpack. - */ -export const MACHINE_TOKEN = new ResourceType('machinetoken'); diff --git a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html index 455aaf75e7..6d51c403e4 100644 --- a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html @@ -10,6 +10,7 @@ formControlName="email" placeholder="profile.email@example.com" class="form-control form-control-lg position-relative" + [attr.aria-label]="'external-login.confirmation.email-label' | translate" />
-

or

+

{{ 'external-login.component.or' | translate }}