mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-09 19:13:08 +00:00
Merge remote-tracking branch 'remotes/origin/master' into shibboleth
# Conflicts: # resources/i18n/de.json5 # resources/i18n/en.json5 # src/app/shared/shared.module.ts
This commit is contained in:
@@ -46,7 +46,11 @@ export class AuthRequestService {
|
||||
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
|
||||
distinctUntilChanged(),
|
||||
map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)),
|
||||
tap((request: PostRequest) => this.requestService.configure(request, true)),
|
||||
map ((request: PostRequest) => {
|
||||
request.responseMsToLive = 10 * 1000;
|
||||
return request;
|
||||
}),
|
||||
tap((request: PostRequest) => this.requestService.configure(request)),
|
||||
mergeMap((request: PostRequest) => this.fetchRequest(request)),
|
||||
distinctUntilChanged());
|
||||
}
|
||||
@@ -57,7 +61,11 @@ export class AuthRequestService {
|
||||
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
|
||||
distinctUntilChanged(),
|
||||
map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options)),
|
||||
tap((request: GetRequest) => this.requestService.configure(request, true)),
|
||||
map ((request: GetRequest) => {
|
||||
request.responseMsToLive = 10 * 1000;
|
||||
return request;
|
||||
}),
|
||||
tap((request: GetRequest) => this.requestService.configure(request)),
|
||||
mergeMap((request: GetRequest) => this.fetchRequest(request)),
|
||||
distinctUntilChanged());
|
||||
}
|
||||
|
Reference in New Issue
Block a user