[WIP] Modular request decorations (and pluggable authentication)

index.d.ts

@@ -1,16 +1,26 @@
 /// <reference lib="es2015" />
 /// <reference path="lib/Api/Client.d.ts" />
 /// <reference path="lib/Api/ClientInterface.d.ts" />
-/// <reference path="lib/Api/ContextualClientInterface.d.ts" />
 /// <reference path="lib/Exception/HttpException.d.ts" />
 /// <reference path="lib/Exception/NotFoundHttpException.d.ts" />
 /// <reference path="lib/Exception/NoTokenAvailableException.d.ts" />
-/// <reference path="lib/Requestor/Headers.d.ts" />
-/// <reference path="lib/Requestor/HttpMessage.d.ts" />
-/// <reference path="lib/Requestor/Request.d.ts" />
-/// <reference path="lib/Requestor/RequestorInterface.d.ts" />
-/// <reference path="lib/Requestor/Response.d.ts" />
-/// <reference path="lib/Requestor/WebRequestor.d.ts" />
+/// <reference path="lib/Http/Client.d.ts" />
+/// <reference path="lib/Http/ClientInterface.d.ts" />
+/// <reference path="lib/Requester/Decorator/Authentication/HttpBasicAuthenticator.d.ts" />
+/// <reference path="lib/Requester/Decorator/Authentication/OAuth/ClientTokenAuthenticator.d.ts" />
+/// <reference path="lib/Requester/Decorator/Authentication/OAuth/TokenPasswordAuthenticator.d.ts" />
+/// <reference path="lib/Requester/Decorator/BodyConverterDecorator.d.ts" />
+/// <reference path="lib/Requester/Decorator/DecoratorInterface.d.ts" />
+/// <reference path="lib/Requester/Decorator/UrlDecorator.d.ts" />
+/// <reference path="lib/Requester/Decorator/VersionSetterDecorator.d.ts" />
+/// <reference path="lib/Requester/Header/Accept.d.ts" />
+/// <reference path="lib/Requester/Header/BaseAccept.d.ts" />
+/// <reference path="lib/Requester/Headers.d.ts" />
+/// <reference path="lib/Requester/HttpMessage.d.ts" />
+/// <reference path="lib/Requester/Request.d.ts" />
+/// <reference path="lib/Requester/RequesterInterface.d.ts" />
+/// <reference path="lib/Requester/Response.d.ts" />
+/// <reference path="lib/Requester/WebRequester.d.ts" />
 /// <reference path="lib/Storage/Marshaller/JSONMarshaller.d.ts" />
 /// <reference path="lib/Storage/Marshaller/NullMarshaller.d.ts" />
 /// <reference path="lib/Storage/AbstractStorage.d.ts" />

lib/Api/Client.d.ts

@@ -1,82 +1,36 @@
+import BaseClient from '../Http/Client';
 import ClientInterface from './ClientInterface';
-import ContextualClientInterface from './ContextualClientInterface';
-import Request from "../Requestor/Request";
-import Response from '../Requestor/Response';
-import RequestorInterface from '../Requestor/RequestorInterface';
+import RequesterInterface from '../Requester/RequesterInterface';
 import StorageInterface from '../Storage/StorageInterface';
+import Response from "../Requester/Response";
 
 declare interface ClientConfig {
     client_id: string;
     client_secret: string;
+    base_url: string;
     version?: string;
 }
 
-declare class ContextualClient extends Client implements ContextualClientInterface {
-    constructor(tokenStorage: StorageInterface, requestor: RequestorInterface, clientTokenStorage: StorageInterface, config: ClientConfig);
-
-    /**
-     * Authenticates user.
-     */
-    authenticate(username: string, password: string): Promise<void>;
-
-    /**
-     * Logs user out.
-     */
-    logout(): Promise<void>;
-}
-
-declare class Client implements ClientInterface {
-    /**
-     * Token mutex.
-     */
-    protected _tokenMutex: __jymfony.Mutex;
-
-    constructor(requestor: RequestorInterface, tokenStorage: StorageInterface, config: ClientConfig);
-
-    /**
-     * @inheritdoc
-     */
-    request<T = any>(method: string, path: string, requestData?: any, headers?: {}): Promise<Response<T>>;
-
-    /**
-     * @inheritdoc
-     */
-    get<T = any>(path: string, headers?: {}): Promise<Response<T>>;
-
-    /**
-     * @inheritdoc
-     */
-    post<T = any>(path: string, requestData?: any, headers?: {}): Promise<Response<T>>;
-
-    /**
-     * @inheritdoc
-     */
-    put<T = any>(path: string, requestData?: any, headers?: {}): Promise<Response<T>>;
-
-    /**
-     * @inheritdoc
-     */
-    patch<T = any>(path: string, requestData?: any, headers?: {}): Promise<Response<T>>;
+/**
+ * @deprecated Api.Client has been deprecated. Please use Http.Client instead.
+ */
+declare class Client extends BaseClient implements ClientInterface {
+    constructor(requester: RequesterInterface, tokenStorage: StorageInterface, config: ClientConfig);
 
     /**
      * @inheritdoc
      */
     mergePatch<T = any>(path: string, requestData?: any, headers?: {}): Promise<Response<T>>;
 
     /**
-     * @inheritdoc
-     */
-    withContext(tokenStorage: StorageInterface): ContextualClientInterface;
-
-    /**
-     * Filters a response, eventually throwing an error in case response status is not successful.
+     * Authenticates user.
      */
-    protected _filterResponse(request: Request, response: Response): void;
+    authenticate(username: string, password: string): Promise<void>;
 
     /**
-     * Gets the token for the current api client.
+     * Logs user out.
      */
-    protected _getToken(): Promise<string>;
+    logout(): Promise<void>;
 }
 
 export default Client;