Added compatibility with captcha and PoW similar to Android

Author: sp0x

.gitignore

@@ -1,2 +1,3 @@
 QueueITLib.xcworkspace/xcuserdata/queut-it.xcuserdatad/xcdebugger/**
 QueueITLib.xcworkspace/xcuserdata
+QueueITLib.xcworkspace

QueueITLib/QueueITEngine.h

@@ -40,6 +40,11 @@ typedef enum {
 -(void)updateQueuePageUrl:(NSString*)queuePageUrl;
 -(void)raiseViewClosed;
 -(void)close: (void (^ __nullable)(void))onComplete;
+-(void)handleAppEnqueueResponse:(NSString*) queueId
+                       queueURL:(NSString*) queueURL
+           queueURLTTLInMinutes:(int) ttl
+                 eventTargetURL:(NSString*) targetURL
+                   queueItToken:(NSString*) token;
 
 @end
 

QueueITLib/QueueITEngine.m

@@ -166,6 +166,50 @@ -(void)tryEnqueue
     }];
 }
 
+-(BOOL)isSafetyNet:(NSString*) queueId
+          queueURL:(NSString*) queueURL
+{
+    bool queueIdExists = queueId != nil && queueId != (id)[NSNull null];
+    bool queueUrlExists = queueURL != nil && queueURL != (id)[NSNull null];
+    return queueIdExists && !queueUrlExists;
+}
+
+-(BOOL)isDisabled:(NSString*) queueId
+         queueURL:(NSString*) queueURL
+{
+    bool queueIdExists = queueId != nil && queueId != (id)[NSNull null];
+    bool queueUrlExists = queueURL != nil && queueURL != (id)[NSNull null];
+    return !queueIdExists && !queueUrlExists;
+}
+
+-(void)handleAppEnqueueResponse:(NSString*) queueId
+                       queueURL:(NSString*) queueURL
+           queueURLTTLInMinutes:(int) ttl
+                 eventTargetURL:(NSString*) targetURL
+                   queueItToken:(NSString*) token {
+    //SafetyNet
+    if ([self isSafetyNet:queueId queueURL:queueURL])
+    {
+        [self raiseQueuePassed:token];
+        return;
+    }
+    //Disabled
+    else if ([self isDisabled:queueId queueURL:queueURL]){
+        self.requestInProgress = NO;
+        [self raiseQueueDisabled];
+        return;
+    }
+    
+    //InQueue, PostQueue or Idle
+    self.queueUrlTtl = ttl;
+    [self showQueue:queueURL targetUrl:targetURL];
+    
+    if(ttl>0){
+        NSString* urlTtlString = [self convertTtlMinutesToSecondsString:ttl];
+        [self.cache update:queueURL urlTTL:urlTtlString targetUrl:targetURL];
+    }
+}
+
 -(void)tryEnqueueWithUserAgent:(NSString*)secretAgent
 {
     NSString* userId = [IOSUtils getUserId];
@@ -186,34 +230,11 @@ -(void)tryEnqueueWithUserAgent:(NSString*)secretAgent
              return;
          }
 
-         bool queueIdExists = queueStatus.queueId != nil && queueStatus.queueId != (id)[NSNull null];
-         bool queueUrlExists = queueStatus.queueUrlString != nil && queueStatus.queueUrlString != (id)[NSNull null];
-         
-         //SafetyNet
-         if (queueIdExists && !queueUrlExists)
-         {
-             [self raiseQueuePassed:queueStatus.queueitToken];
-         }
-         //InQueue
-         else if (queueIdExists && queueUrlExists)
-         {
-             self.queueUrlTtl = queueStatus.queueUrlTTL;
-             [self showQueue:queueStatus.queueUrlString targetUrl:queueStatus.eventTargetUrl];
-             
-             NSString* urlTtlString = [self convertTtlMinutesToSecondsString:queueStatus.queueUrlTTL];
-             [self.cache update:queueStatus.queueUrlString urlTTL:urlTtlString targetUrl:queueStatus.eventTargetUrl];
-         }
-         //PostQueue or Idle
-         else if (!queueIdExists && queueUrlExists)
-         {
-             [self showQueue:queueStatus.queueUrlString targetUrl:queueStatus.eventTargetUrl];
-         }
-         //Disabled
-         else
-         {
-             self.requestInProgress = NO;
-             [self raiseQueueDisabled];
-         }
+        [self handleAppEnqueueResponse: queueStatus.queueId
+                              queueURL:queueStatus.queueUrlString
+                  queueURLTTLInMinutes:queueStatus.queueUrlTTL
+                        eventTargetURL:queueStatus.eventTargetUrl
+                          queueItToken:queueStatus.queueitToken];
      }
         failure:^(NSError *error, NSString* errorMessage)
      {

QueueITLib/QueueService.m

@@ -3,8 +3,8 @@
 
 static QueueService *SharedInstance;
 
-static NSString * const API_ROOT = @"https://%@.queue-it.net/api/queue";
-static NSString * const TESTING_API_ROOT = @"https://%@.test.queue-it.net/api/queue";
+static NSString * const API_ROOT = @"https://%@.queue-it.net/api/mobileapp/queue";
+static NSString * const TESTING_API_ROOT = @"https://%@.test.queue-it.net/api/mobileapp/queue";
 static bool testingIsEnabled = NO;
 
 @implementation QueueService
@@ -53,9 +53,9 @@ -(NSString*)enqueue:(NSString *)customerId
     }
     urlAsString = [urlAsString stringByAppendingString:[NSString stringWithFormat:@"/%@", customerId]];
     urlAsString = [urlAsString stringByAppendingString:[NSString stringWithFormat:@"/%@", eventorAliasId]];
-    urlAsString = [urlAsString stringByAppendingString:[NSString stringWithFormat:@"/appenqueue"]];
+    urlAsString = [urlAsString stringByAppendingString:[NSString stringWithFormat:@"/enqueue"]];
 
-    return [self submitPUTPath:urlAsString body:bodyDict
+    return [self submitPOSTPath:urlAsString body:bodyDict
             success:^(NSData *data)
             {
                 NSError *error = nil;
@@ -77,14 +77,14 @@ -(NSString*)enqueue:(NSString *)customerId
             }];
 }
 
-- (NSString *)submitPUTPath:(NSString *)path
+- (NSString *)submitPOSTPath:(NSString *)path
                        body:(NSDictionary *)bodyDict
                     success:(QueueServiceSuccess)success
                     failure:(QueueServiceFailure)failure
 {
     NSURL *url = [NSURL URLWithString:path];
     return [self submitRequestWithURL:url
-                               method:@"PUT"
+                               method:@"POST"
                                  body:bodyDict
                        expectedStatus:200
                               success:success