hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into submission

Browse Source 
# Conflicts:
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/auth/auth-response-parsing.service.ts
#	src/app/core/cache/models/normalized-object-factory.ts
#	src/app/core/cache/models/normalized-resource-policy.model.ts
#	src/app/core/core.module.ts
#	src/app/core/data/base-response-parsing.service.ts
#	src/app/core/data/config-response-parsing.service.spec.ts
#	src/app/core/data/config-response-parsing.service.ts
#	src/app/core/data/dso-response-parsing.service.ts
#	src/app/core/data/request.models.ts
#	src/app/core/data/search-response-parsing.service.ts
#	src/app/core/integration/integration-response-parsing.service.spec.ts
#	src/app/core/integration/integration-response-parsing.service.ts
#	src/app/core/shared/item.model.ts
#	src/app/core/shared/resource-policy.model.ts
#	src/app/core/shared/resource-type.ts
#	src/app/shared/shared.module.ts
#	src/app/thumbnail/thumbnail.component.html
This commit is contained in:
Giuseppe
2018-10-15 19:21:01 +02:00
parent 507020db7b 8c124f227d
commit b27e3d9e2f
255 changed files with 7005 additions and 1317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/core/auth/auth-response-parsing.service.ts
View File

@@ -12,22 +12,23 @@ import { ResponseParsingService } from '../data/parsing.service';
import { RestRequest } from '../data/request.models';
import { AuthType } from './auth-type';
import { AuthStatus } from './models/auth-status.model';
import { NormalizedAuthStatus } from './models/normalized-auth-status.model';
@Injectable()
export class AuthResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
protected objectFactory = AuthObjectFactory;
protected toCache = false;
protected toCache = true;
constructor(@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
protected objectCache: ObjectCacheService,) {
protected objectCache: ObjectCacheService) {
super();
}
parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && (data.statusCode === 200)) {
const response = this.process<AuthStatus, AuthType>(data.payload, request.href);
return new AuthStatusResponse(response[Object.keys(response)[0]][0], data.statusCode, data.statusText);
const response = this.process<NormalizedAuthStatus, AuthType>(data.payload, request.href);
return new AuthStatusResponse(response, data.statusCode, data.statusText);
} else {
return new AuthStatusResponse(data.payload as AuthStatus, data.statusCode, data.statusText);
}