Add MTXRequest, MTXClient & support for logging in
FossilOrigin-Name: 1e716c7f85cbebd8a6cdddaee2605897beeb69d0a20150ab5a300254007648e4
This commit is contained in:
parent
6adffeb699
commit
d2bb4edae9
13 changed files with 794 additions and 0 deletions
97
src/MTXClient.h
Normal file
97
src/MTXClient.h
Normal file
|
@ -0,0 +1,97 @@
|
|||
/*
|
||||
* Copyright (c) 2020, Jonathan Schleifer <js@nil.im>
|
||||
*
|
||||
* https://fossil.nil.im/objmatrix
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice is present in all copies.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#import <ObjFW/ObjFW.h>
|
||||
|
||||
OF_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class MTXClient;
|
||||
|
||||
/**
|
||||
* @brief A block called when a new login succeeded or failed.
|
||||
*
|
||||
* @param client If the login succeeded, the newly created client
|
||||
* @param exception If the login failed, an exception
|
||||
*/
|
||||
typedef void (^mtx_client_login_block_t)(MTXClient *_Nullable client,
|
||||
id _Nullable exception);
|
||||
|
||||
/**
|
||||
* @brief A class that represents a client.
|
||||
*/
|
||||
@interface MTXClient: OFObject
|
||||
/**
|
||||
* @brief The user ID used by the client.
|
||||
*/
|
||||
@property (readonly, nonatomic) OFString *userID;
|
||||
|
||||
/**
|
||||
* @brief The device ID used by the client.
|
||||
*/
|
||||
@property (readonly, nonatomic) OFString *deviceID;
|
||||
|
||||
/**
|
||||
* @brief The access token used by the client.
|
||||
*/
|
||||
@property (readonly, nonatomic) OFString *accessToken;
|
||||
|
||||
/**
|
||||
* @brief The homeserver used by the client.
|
||||
*/
|
||||
@property (readonly, nonatomic) OFURL *homeserver;
|
||||
|
||||
/**
|
||||
* @brief Creates a new client with the specified access token on the specified
|
||||
* homeserver.
|
||||
*
|
||||
* @param accessToken The access token for the client
|
||||
* @param homeserver The URL of the homeserver
|
||||
* @return An autoreleased MTXClient
|
||||
*/
|
||||
+ (instancetype)clientWithUserID: (OFString *)userID
|
||||
deviceID: (OFString *)deviceID
|
||||
accessToken: (OFString *)accessToken
|
||||
homeserver: (OFURL *)homeserver;
|
||||
|
||||
/**
|
||||
* @brief Logs into the homeserver and creates a new client.
|
||||
*/
|
||||
+ (void)logInWithUser: (OFString *)user
|
||||
password: (OFString *)password
|
||||
homeserver: (OFURL *)homeserver
|
||||
block: (mtx_client_login_block_t)block;
|
||||
|
||||
/**
|
||||
* @brief Initializes an already allocated client with the specified access
|
||||
* token on the specified homeserver.
|
||||
*
|
||||
* @param accessToken The access token for the client
|
||||
* @param homeserver The URL of the homeserver
|
||||
* @return An initialized MTXClient
|
||||
*/
|
||||
- (instancetype)initWithUserID: (OFString *)userID
|
||||
deviceID: (OFString *)deviceID
|
||||
accessToken: (OFString *)accessToken
|
||||
homeserver: (OFURL *)homeserver OF_DESIGNATED_INITIALIZER;
|
||||
@end
|
||||
|
||||
OF_ASSUME_NONNULL_END
|
173
src/MTXClient.m
Normal file
173
src/MTXClient.m
Normal file
|
@ -0,0 +1,173 @@
|
|||
/*
|
||||
* Copyright (c) 2020, Jonathan Schleifer <js@nil.im>
|
||||
*
|
||||
* https://fossil.nil.im/objmatrix
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice is present in all copies.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#import "MTXClient.h"
|
||||
#import "MTXRequest.h"
|
||||
|
||||
#import "MTXLoginFailedException.h"
|
||||
|
||||
static void
|
||||
validateHomeserver(OFURL *homeserver)
|
||||
{
|
||||
if (![homeserver.scheme isEqual: @"http"] &&
|
||||
![homeserver.scheme isEqual: @"https"])
|
||||
@throw [OFUnsupportedProtocolException
|
||||
exceptionWithURL: homeserver];
|
||||
|
||||
if (homeserver.path != nil && ![homeserver.path isEqual: @"/"])
|
||||
@throw [OFInvalidArgumentException exception];
|
||||
|
||||
if (homeserver.user != nil || homeserver.password != nil ||
|
||||
homeserver.query != nil || homeserver.fragment != nil)
|
||||
@throw [OFInvalidArgumentException exception];
|
||||
}
|
||||
|
||||
@implementation MTXClient
|
||||
+ (instancetype)clientWithUserID: (OFString *)userID
|
||||
deviceID: (OFString *)deviceID
|
||||
accessToken: (OFString *)accessToken
|
||||
homeserver: (OFURL *)homeserver
|
||||
{
|
||||
return [[[self alloc] initWithUserID: userID
|
||||
deviceID: deviceID
|
||||
accessToken: accessToken
|
||||
homeserver: homeserver] autorelease];
|
||||
}
|
||||
|
||||
+ (void)logInWithUser: (OFString *)user
|
||||
password: (OFString *)password
|
||||
homeserver: (OFURL *)homeserver
|
||||
block: (mtx_client_login_block_t)block
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
validateHomeserver(homeserver);
|
||||
|
||||
MTXRequest *request = [MTXRequest
|
||||
requestWithPath: @"/_matrix/client/r0/login"
|
||||
accessToken: nil
|
||||
homeserver: homeserver];
|
||||
request.method = OF_HTTP_REQUEST_METHOD_POST;
|
||||
request.body = @{
|
||||
@"type": @"m.login.password",
|
||||
@"identifier": @{
|
||||
@"type": @"m.id.user",
|
||||
@"user": user
|
||||
},
|
||||
@"password": password
|
||||
};
|
||||
|
||||
[request asyncPerformWithBlock:
|
||||
^ (OFDictionary<OFString *, id> *response, int statusCode,
|
||||
id exception) {
|
||||
if (exception != nil) {
|
||||
block(nil, exception);
|
||||
return;
|
||||
}
|
||||
|
||||
if (statusCode != 200) {
|
||||
id exception = [MTXLoginFailedException
|
||||
exceptionWithUser: user
|
||||
homeserver: homeserver
|
||||
statusCode: statusCode
|
||||
response: response];
|
||||
block(nil, exception);
|
||||
return;
|
||||
}
|
||||
|
||||
OFString *userID = response[@"user_id"];
|
||||
OFString *deviceID = response[@"device_id"];
|
||||
OFString *accessToken = response[@"access_token"];
|
||||
if (userID == nil || deviceID == nil ||
|
||||
accessToken == nil) {
|
||||
block(nil, [OFInvalidServerReplyException exception]);
|
||||
return;
|
||||
}
|
||||
|
||||
OFString *baseURL =
|
||||
response[@"well_known"][@"m.homeserver"][@"base_url"];
|
||||
OFURL *realHomeserver;
|
||||
if (baseURL != nil) {
|
||||
@try {
|
||||
realHomeserver = [OFURL URLWithString: baseURL];
|
||||
} @catch (id e) {
|
||||
block(nil, e);
|
||||
return;
|
||||
}
|
||||
} else
|
||||
realHomeserver = homeserver;
|
||||
|
||||
MTXClient *client = [MTXClient
|
||||
clientWithUserID: userID
|
||||
deviceID: deviceID
|
||||
accessToken: accessToken
|
||||
homeserver: realHomeserver];
|
||||
block(client, nil);
|
||||
}];
|
||||
|
||||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (instancetype)initWithUserID: (OFString *)userID
|
||||
deviceID: (OFString *)deviceID
|
||||
accessToken: (OFString *)accessToken
|
||||
homeserver: (OFURL *)homeserver
|
||||
{
|
||||
self = [super init];
|
||||
|
||||
@try {
|
||||
validateHomeserver(homeserver);
|
||||
|
||||
_userID = [userID copy];
|
||||
_deviceID = [deviceID copy];
|
||||
_accessToken = [accessToken copy];
|
||||
_homeserver = [homeserver copy];
|
||||
} @catch (id e) {
|
||||
[self release];
|
||||
@throw e;
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
[_userID release];
|
||||
[_deviceID release];
|
||||
[_accessToken release];
|
||||
[_homeserver release];
|
||||
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (OFString *)description
|
||||
{
|
||||
return [OFString stringWithFormat:
|
||||
@"<%@\n"
|
||||
@"\tUser ID = %@\n"
|
||||
@"\tDevice ID = %@\n"
|
||||
@"\tAccess token = %@\n"
|
||||
@"\tHomeserver = %@\n"
|
||||
@">",
|
||||
self.class, _userID, _deviceID, _accessToken, _homeserver];
|
||||
}
|
||||
@end
|
106
src/MTXRequest.h
Normal file
106
src/MTXRequest.h
Normal file
|
@ -0,0 +1,106 @@
|
|||
/*
|
||||
* Copyright (c) 2020, Jonathan Schleifer <js@nil.im>
|
||||
*
|
||||
* https://fossil.nil.im/objmatrix
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice is present in all copies.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#import <ObjFW/ObjFW.h>
|
||||
|
||||
OF_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
* @brief A block called with the response for an MTXRequest.
|
||||
*
|
||||
* @param response The response to the request, as a dictionary parsed from JSON
|
||||
* @param statusCode The HTTP status code returned for the request
|
||||
* @param exception The first exception that occurred during the request,
|
||||
* or `nil` on success
|
||||
*/
|
||||
typedef void (^mtx_request_block_t)(
|
||||
OFDictionary<OFString *, id> *_Nullable response, int statusCode,
|
||||
id _Nullable exception);
|
||||
|
||||
/**
|
||||
* @brief An internal class for performing a request on the Matrix server.
|
||||
*/
|
||||
@interface MTXRequest: OFObject <OFHTTPClientDelegate>
|
||||
/**
|
||||
* @brief The access token to use.
|
||||
*
|
||||
* Some requests are unauthenticated - for those, the access token is `nil`.
|
||||
*/
|
||||
@property (readonly, nonatomic, nullable) OFString *accessToken;
|
||||
|
||||
/**
|
||||
* @brief The URL of the homeserver to send the request to.
|
||||
*/
|
||||
@property (readonly, nonatomic) OFURL *homeserver;
|
||||
|
||||
/**
|
||||
* @brief The HTTP request method.
|
||||
*
|
||||
* Defaults to `OF_HTTP_REQUEST_METHOD_GET`.
|
||||
*/
|
||||
@property (nonatomic) of_http_request_method_t method;
|
||||
|
||||
/**
|
||||
* @brief The path of the request.
|
||||
*/
|
||||
@property (copy, nonatomic) OFString *path;
|
||||
|
||||
/**
|
||||
* @brief An optional body to send along with the request.
|
||||
*
|
||||
* This is a dictionary that gets serialized to JSON when the request is sent.
|
||||
*/
|
||||
@property (copy, nullable, nonatomic) OFDictionary<OFString *, id> *body;
|
||||
|
||||
/**
|
||||
* @brief Creates a new request with the specified access token and homeserver.
|
||||
*
|
||||
* @param accessToken An (optional) access token to use
|
||||
* @param homeserver The homeserver the request will be sent to
|
||||
* @return An autoreleased MTXRequest
|
||||
*/
|
||||
+ (instancetype)requestWithPath: (OFString *)path
|
||||
accessToken: (nullable OFString *)accessToken
|
||||
homeserver: (OFURL *)homeserver;
|
||||
|
||||
/**
|
||||
* @brief Initializes an already allocated request with the specified access
|
||||
* token and homeserver.
|
||||
*
|
||||
* @param accessToken An (optional) access token to use
|
||||
* @param homeserver The homeserver the request will be sent to
|
||||
* @return An initialized MTXRequest
|
||||
*/
|
||||
- (instancetype)initWithPath: (OFString *)path
|
||||
accessToken: (nullable OFString *)accessToken
|
||||
homeserver: (OFURL *)homeserver;
|
||||
|
||||
/**
|
||||
* @brief Performs the request and calls the specified block once the request
|
||||
* succeeded or failed.
|
||||
*
|
||||
* @param block The block to call once the request succeeded or failed
|
||||
*/
|
||||
- (void)asyncPerformWithBlock: (mtx_request_block_t)block;
|
||||
@end
|
||||
|
||||
OF_ASSUME_NONNULL_END
|
176
src/MTXRequest.m
Normal file
176
src/MTXRequest.m
Normal file
|
@ -0,0 +1,176 @@
|
|||
/*
|
||||
* Copyright (c) 2020, Jonathan Schleifer <js@nil.im>
|
||||
*
|
||||
* https://fossil.nil.im/objmatrix
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice is present in all copies.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#import "MTXRequest.h"
|
||||
|
||||
@implementation MTXRequest
|
||||
{
|
||||
OFData *_body;
|
||||
mtx_request_block_t _block;
|
||||
}
|
||||
|
||||
+ (instancetype)requestWithPath: (OFString *)path
|
||||
accessToken: (OFString *)accessToken
|
||||
homeserver: (OFURL *)homeserver
|
||||
{
|
||||
return [[[self alloc] initWithPath: path
|
||||
accessToken: accessToken
|
||||
homeserver: homeserver] autorelease];
|
||||
}
|
||||
|
||||
- (instancetype)initWithPath: (OFString *)path
|
||||
accessToken: (OFString *)accessToken
|
||||
homeserver: (OFURL *)homeserver
|
||||
{
|
||||
self = [super init];
|
||||
|
||||
@try {
|
||||
_accessToken = [accessToken copy];
|
||||
_homeserver = [homeserver copy];
|
||||
_path = [path copy];
|
||||
_method = OF_HTTP_REQUEST_METHOD_GET;
|
||||
} @catch (id e) {
|
||||
[self release];
|
||||
@throw e;
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
[_accessToken release];
|
||||
[_homeserver release];
|
||||
[_path release];
|
||||
[_body release];
|
||||
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (void)setBody: (OFDictionary<OFString *, id> *)body
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
[_body release];
|
||||
|
||||
OFString *JSONString = [body JSONRepresentation];
|
||||
_body = [[OFData alloc]
|
||||
initWithItems: JSONString.UTF8String
|
||||
count: JSONString.UTF8StringLength];
|
||||
|
||||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (OFDictionary<OFString *, id> *)body
|
||||
{
|
||||
return [OFString stringWithUTF8String: _body.items
|
||||
length: _body.count]
|
||||
.objectByParsingJSON;
|
||||
}
|
||||
|
||||
- (void)asyncPerformWithBlock: (mtx_request_block_t)block
|
||||
{
|
||||
void *pool = objc_autoreleasePoolPush();
|
||||
|
||||
if (_block != nil)
|
||||
/* Not the best exception to indicate it's already in-flight. */
|
||||
@throw [OFAlreadyConnectedException exception];
|
||||
|
||||
OFMutableURL *requestURL = [[_homeserver mutableCopy] autorelease];
|
||||
requestURL.path = _path;
|
||||
|
||||
OFMutableDictionary *headers = [OFMutableDictionary dictionary];
|
||||
headers[@"User-Agent"] = @"ObjMatrix";
|
||||
if (_accessToken != nil)
|
||||
headers[@"Authentication"] = [OFString
|
||||
stringWithFormat: @"Bearer %@", _accessToken];
|
||||
if (_body != nil)
|
||||
headers[@"Content-Length"] = @(_body.count).stringValue;
|
||||
|
||||
OFHTTPRequest *request = [OFHTTPRequest requestWithURL: requestURL];
|
||||
request.method = _method;
|
||||
request.headers = headers;
|
||||
|
||||
OFHTTPClient *client = [OFHTTPClient client];
|
||||
client.delegate = self;
|
||||
|
||||
_block = [block copy];
|
||||
[self retain];
|
||||
[client asyncPerformRequest: request];
|
||||
|
||||
objc_autoreleasePoolPop(pool);
|
||||
}
|
||||
|
||||
- (void)client: (OFHTTPClient *)client
|
||||
didPerformRequest: (OFHTTPRequest *)request
|
||||
response: (OFHTTPResponse *)response
|
||||
{
|
||||
/* Reset to nil first, so that another one can be performed. */
|
||||
mtx_request_block_t block = _block;
|
||||
_block = nil;
|
||||
|
||||
@try {
|
||||
OFMutableData *responseData = [OFMutableData data];
|
||||
while (!response.atEndOfStream) {
|
||||
char buffer[512];
|
||||
size_t length = [response readIntoBuffer: buffer
|
||||
length: 512];
|
||||
|
||||
[responseData addItems: buffer
|
||||
count: length];
|
||||
}
|
||||
|
||||
OFDictionary<OFString *, id> *responseJSON =
|
||||
[OFString stringWithUTF8String: responseData.items
|
||||
length: responseData.count]
|
||||
.objectByParsingJSON;
|
||||
|
||||
block(responseJSON, response.statusCode, nil);
|
||||
} @catch (id e) {
|
||||
block(nil, response.statusCode, e);
|
||||
}
|
||||
|
||||
[block release];
|
||||
[self release];
|
||||
}
|
||||
|
||||
- (void)client: (OFHTTPClient *)client
|
||||
didFailWithException: (id)exception
|
||||
request: (OFHTTPRequest *)request
|
||||
{
|
||||
/* Reset to nil first, so that another one can be performed. */
|
||||
mtx_request_block_t block = _block;
|
||||
_block = nil;
|
||||
|
||||
block(nil, 0, exception);
|
||||
|
||||
[block release];
|
||||
[self release];
|
||||
}
|
||||
|
||||
- (void)client: (OFHTTPClient *)client
|
||||
wantsRequestBody: (OFStream *)body
|
||||
request: (OFHTTPRequest *)request
|
||||
{
|
||||
[body writeData: _body];
|
||||
}
|
||||
@end
|
|
@ -8,6 +8,8 @@ FRAMEWORK = ${OBJMATRIX_FRAMEWORK}
|
|||
LIB_MAJOR = ${OBJMATRIX_LIB_MAJOR}
|
||||
LIB_MINOR = ${OBJMATRIX_LIB_MINOR}
|
||||
|
||||
SRCS = MTXClient.m \
|
||||
MTXRequest.m
|
||||
INCLUDES := ${SRCS:.m=.h} \
|
||||
ObjMatrix.h
|
||||
|
||||
|
|
24
src/ObjMatrix.h
Normal file
24
src/ObjMatrix.h
Normal file
|
@ -0,0 +1,24 @@
|
|||
/*
|
||||
* Copyright (c) 2020, Jonathan Schleifer <js@nil.im>
|
||||
*
|
||||
* https://fossil.nil.im/objmatrix
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice is present in all copies.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#import "MTXClient.h"
|
||||
#import "MTXRequest.h"
|
43
src/exceptions/MTXLoginFailedException.h
Normal file
43
src/exceptions/MTXLoginFailedException.h
Normal file
|
@ -0,0 +1,43 @@
|
|||
/*
|
||||
* Copyright (c) 2020, Jonathan Schleifer <js@nil.im>
|
||||
*
|
||||
* https://fossil.nil.im/objmatrix
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice is present in all copies.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#import <ObjFW/ObjFW.h>
|
||||
|
||||
OF_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface MTXLoginFailedException: OFException
|
||||
@property (readonly, nonatomic) OFString *user;
|
||||
@property (readonly, nonatomic) OFURL *homeserver;
|
||||
@property (readonly, nonatomic) int statusCode;
|
||||
@property (readonly, nonatomic) OFDictionary<OFString *, id> *response;
|
||||
|
||||
+ (instancetype)exceptionWithUser: (OFString *)user
|
||||
homeserver: (OFURL *)homeserver
|
||||
statusCode: (int)statusCode
|
||||
response: (OFDictionary<OFString *, id> *)response;
|
||||
- (instancetype)initWithUser: (OFString *)user
|
||||
homeserver: (OFURL *)homeserver
|
||||
statusCode: (int)statusCode
|
||||
response: (OFDictionary<OFString *, id> *)response;
|
||||
@end
|
||||
|
||||
OF_ASSUME_NONNULL_END
|
65
src/exceptions/MTXLoginFailedException.m
Normal file
65
src/exceptions/MTXLoginFailedException.m
Normal file
|
@ -0,0 +1,65 @@
|
|||
/*
|
||||
* Copyright (c) 2020, Jonathan Schleifer <js@nil.im>
|
||||
*
|
||||
* https://fossil.nil.im/objmatrix
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice is present in all copies.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#import "MTXLoginFailedException.h"
|
||||
|
||||
@implementation MTXLoginFailedException
|
||||
+ (instancetype)exceptionWithUser: (OFString *)user
|
||||
homeserver: (OFURL *)homeserver
|
||||
statusCode: (int)statusCode
|
||||
response: (OFDictionary<OFString *, id> *)response
|
||||
{
|
||||
return [[[self alloc] initWithUser: user
|
||||
homeserver: homeserver
|
||||
statusCode: statusCode
|
||||
response: response] autorelease];
|
||||
}
|
||||
|
||||
- (instancetype)initWithUser: (OFString *)user
|
||||
homeserver: (OFURL *)homeserver
|
||||
statusCode: (int)statusCode
|
||||
response: (OFDictionary<OFString *, id> *)response
|
||||
{
|
||||
self = [super init];
|
||||
|
||||
@try {
|
||||
_user = [user copy];
|
||||
_homeserver = [homeserver copy];
|
||||
_statusCode = statusCode;
|
||||
_response = [response copy];
|
||||
} @catch (id e) {
|
||||
[self release];
|
||||
@throw e;
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
[_user release];
|
||||
[_homeserver release];
|
||||
[_response release];
|
||||
|
||||
[super dealloc];
|
||||
}
|
||||
@end
|
|
@ -3,6 +3,7 @@ include ../../extra.mk
|
|||
STATIC_PIC_LIB_NOINST = ${EXCEPTIONS_LIB_A}
|
||||
STATIC_LIB_NOINST = ${EXCEPTIONS_A}
|
||||
|
||||
SRCS = MTXLoginFailedException.m
|
||||
INCLUDES = ${SRCS:.m=.h}
|
||||
|
||||
include ../../buildsys.mk
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue