Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove base URls with ContainerManager when possible

Browse Source
This commit is contained in:
Joachim Van Herwegen
2020-12-09 16:08:59 +01:00
parent f0db9e501f
commit 1bb5de97ab
10 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/DataAccessorBasedStore.ts
View File

@@ -50,12 +50,10 @@ import type { ResourceStore } from './ResourceStore';
*/
export class DataAccessorBasedStore implements ResourceStore {
private readonly accessor: DataAccessor;
private readonly base: string;
private readonly identifierStrategy: IdentifierStrategy;
public constructor(accessor: DataAccessor, base: string, identifierStrategy: IdentifierStrategy) {
public constructor(accessor: DataAccessor, identifierStrategy: IdentifierStrategy) {
this.accessor = accessor;
this.base = ensureTrailingSlash(base);
this.identifierStrategy = identifierStrategy;
}
@@ -149,7 +147,7 @@ export class DataAccessorBasedStore implements ResourceStore {
public async deleteResource(identifier: ResourceIdentifier): Promise<void> {
this.validateIdentifier(identifier);
if (ensureTrailingSlash(identifier.path) === this.base) {
if (this.identifierStrategy.isRootContainer(identifier)) {
throw new MethodNotAllowedHttpError('Cannot delete root container.');
}
const metadata = await this.accessor.getMetadata(identifier);
@@ -163,7 +161,7 @@ export class DataAccessorBasedStore implements ResourceStore {
* Verify if the given identifier matches the stored base.
*/
protected validateIdentifier(identifier: ResourceIdentifier): void {
if (!identifier.path.startsWith(this.base)) {
if (!this.identifierStrategy.supportsIdentifier(identifier)) {
throw new NotFoundHttpError();
}
}

10
src/storage/accessors/SparqlDataAccessor.ts
View File

@@ -26,7 +26,7 @@ import { UnsupportedMediaTypeHttpError } from '../../util/errors/UnsupportedMedi
import { guardStream } from '../../util/GuardedStream';
import type { Guarded } from '../../util/GuardedStream';
import type { IdentifierStrategy } from '../../util/identifiers/IdentifierStrategy';
import { ensureTrailingSlash, isContainerIdentifier } from '../../util/PathUtil';
import { isContainerIdentifier } from '../../util/PathUtil';
import { generateResourceQuads } from '../../util/ResourceUtil';
import { CONTENT_TYPE, LDP } from '../../util/UriConstants';
import { toNamedNode } from '../../util/UriUtil';
@@ -49,14 +49,12 @@ const { defaultGraph, namedNode, quad, variable } = DataFactory;
export class SparqlDataAccessor implements DataAccessor {
protected readonly logger = getLoggerFor(this);
private readonly endpoint: string;
private readonly base: string;
private readonly identifierStrategy: IdentifierStrategy;
private readonly fetcher: SparqlEndpointFetcher;
private readonly generator: SparqlGenerator;
public constructor(endpoint: string, base: string, identifierStrategy: IdentifierStrategy) {
public constructor(endpoint: string, identifierStrategy: IdentifierStrategy) {
this.endpoint = endpoint;
this.base = ensureTrailingSlash(base);
this.identifierStrategy = identifierStrategy;
this.fetcher = new SparqlEndpointFetcher();
this.generator = new Generator();
@@ -93,7 +91,7 @@ export class SparqlDataAccessor implements DataAccessor {
const quads = await arrayifyStream(stream);
// Root container will not have metadata if there are no containment triples
if (quads.length === 0 && identifier.path !== this.base) {
if (quads.length === 0 && !this.identifierStrategy.isRootContainer(identifier)) {
throw new NotFoundHttpError();
}
@@ -103,7 +101,7 @@ export class SparqlDataAccessor implements DataAccessor {
}
// Need to generate type metadata for the root container since it's not stored
if (identifier.path === this.base) {
if (this.identifierStrategy.isRootContainer(identifier)) {
metadata.addQuads(generateResourceQuads(name, true));
}