Commit d8fd6993 authored by Vincent's avatar Vincent

Version 2.1.4

parent ea0063f2
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = 'APMServices'
s.version = '2.1.2'
s.version = '2.1.4'
s.summary = 'app\'s miles® boosts your app\'s usage'
# This description is used to generate tags and improve search results.
......
......@@ -27,6 +27,8 @@
@property(assign, nonatomic) NSInteger adID;
@property(strong, nonatomic) NSString *label;
@property(strong, nonatomic) NSString *content;
@property(strong, nonatomic) NSString *shortDescription;
@property(strong, nonatomic) NSString *url;
@property(assign, nonatomic) NSInteger type;
-(id)initWithJSONObject:(NSDictionary*)jsonObject;
......
......@@ -42,7 +42,5 @@
-(NSString*)issuedDateString;
-(NSString*)expirationDateString;
-(NSString*)burnDateString;
-(NSString*)issuedDateString;
-(NSString*)expirationDateString;
@end
......@@ -9,5 +9,6 @@
@interface APMReactUtils : NSObject
+(NSMutableArray*)toArrayOfDictionary:(NSArray*)fromArray;
+(NSString*)timestampMilliSecondsFromDate:(NSDate*)date;
@end
......@@ -58,11 +58,11 @@
//Models
@property(nonatomic, strong, readonly) APMDevice* device;
@property(nonatomic, strong, readonly) APMProg* prog;
@property(nonatomic, strong) APMProg* prog;
@property(nonatomic, strong, readonly) APMUser* user;
@property(nonatomic, strong, readonly) APMGift* gift;
@property(nonatomic, strong, readonly) APMGenerosity* generosity;
@property(nonatomic, strong, readonly) NSMutableArray *generosities;
@property(nonatomic, strong) NSMutableArray *generosities;
@property(nonatomic, strong) APMUser* oldUser;
@property(nonatomic, strong, readonly) NSMutableArray *status;
......@@ -90,9 +90,14 @@
-(void)removeActionWithActionName:(NSString*)actionName;
-(NSDictionary*)getActionsForClassId:(NSString*)classId;
-(void)selectClassID:(NSString*)classID;
-(void)triggerActions:(NSArray*)listActionName;
-(void)triggerActions:(NSArray*)listActionName completion:(void (^)(NSMutableArray* listStatusActionName, NSError* error))completion;
-(void)triggerAction:(NSString*)actionName;
-(void)triggerAuto __attribute__((deprecated(("triggerAuto is DEPRECATED, use triggerAction"))));
-(void)triggerAuto:(NSString*)actionName __attribute__((deprecated(("triggerAuto is DEPRECATED, use triggerAction"))));
-(void)triggerAction:(NSString*)actionName success:(void (^)(void))success failure:(void (^)(NSError* error))failure;
-(void)triggerAction:(NSString*)actionName policy:(NSInteger)policy success:(void (^)(void))success failure:(void (^)(NSError* error))failure;
-(BOOL)handleOpenURL:(NSURL*)url;
//Getter and Setter
......
......@@ -8,8 +8,8 @@
// Version of API
#define APM_API_VERSION @"3.0"
#define APM_SERVICES_VERSION_NAME @"2.1.2"
#define APM_SERVICES_VERSION_CODE @"2120"
#define APM_SERVICES_VERSION_NAME @"2.1.4"
#define APM_SERVICES_VERSION_CODE @"2140"
//URL
#define APM_URL_API_PROD @"https://api.appsmiles.eu/" //Url API prod
......@@ -76,6 +76,9 @@
#define APM_EXCEPTION_ERROR_SERVER 1
#define APM_EXCEPTION_INVALID_TOKEN 2
#define APM_EXCEPTION_MODE_TEST 5
#define APM_EXCEPTION_ERROR_500 500 //Internal error
#define APM_EXCEPTION_ERROR_404 404 //Not found
#define APM_EXCEPTION_ERROR_401 401 //Signature error
// Exceptions mobiles
#define APM_EXCEPTION_NO_NETWORK -100
......@@ -84,9 +87,9 @@
#define APM_EXCEPTION_SERVICE_NOT_ACTIVE -103
#define APM_EXCEPTION_CONFIG -105
#define APM_EXCEPTION_ACCOUNT_NOT_CONNECTED -106
#define APM_EXCEPTION_HTTP_REQUEST_ERROR -107
#define APM_EXCEPTION_URL_HTTP_INVALID -108
#define APM_EXCEPTION_OPT_IN_NOT_ACCEPTED -109
#define APM_EXCEPTION_ACTION_NOT_FOUND -110
//Format Date
#define APM_DEFAULT_DATE_FORMAT @"dd/MM/yyyy"
......@@ -113,3 +116,8 @@
//Generosity type
#define APM_GENEROSITY_TYPE_SYSTEMATIC 1
#define APM_GENEROSITY_TYPE_SUGGESTED 2
#define APM_GENEROSITY_TYPE_AUTOMATIC 3
//TriggerAction Cache Policy
#define APM_TRIGGER_CACHE_POLICY_DISCARD -1
#define APM_TRIGGER_CACHE_POLICY_STORE_ALWAYS 0
......@@ -83,6 +83,7 @@
#define APM_K_USER_LOYALTY_ID @"loyaltyID"
#define APM_K_USER_CUSTOM_PARAMS @"customParams"
#define APM_K_USER_USER_JOURNEY @"userJourney"
#define APM_K_USER_ACQUIRED_TAGS @"acquiredTags"
// Device keys
#define APM_K_DEVICE @"device"
......@@ -90,13 +91,15 @@
#define APM_K_DEVICE_OPT_IN @"optIn"
// Ad
#define APM_K_AD_ID @"adID"
#define APM_K_AD_CONTENT @"content"
#define APM_K_AD_MEDIA @"media"
#define APM_K_AD_LARGEMEDIA @"largeMedia"
#define APM_K_AD_LABEL @"label"
#define APM_K_AD_TYPE @"type"
#define APM_K_AD_LIST @"ads"
#define APM_K_AD_ID @"adID"
#define APM_K_AD_CONTENT @"content"
#define APM_K_AD_SHORT_DESCRIPTION @"shortDesc"
#define APM_K_AD_URL @"url"
#define APM_K_AD_MEDIA @"media"
#define APM_K_AD_LARGEMEDIA @"largeMedia"
#define APM_K_AD_LABEL @"label"
#define APM_K_AD_TYPE @"type"
#define APM_K_AD_LIST @"ads"
// Prog keys
#define APM_K_PROG @"prog"
......@@ -126,8 +129,8 @@
#define APM_K_GENEROSITY_LNG @"long"
#define APM_K_GENEROSITY_NEXT @"generosityNext"
#define APM_K_GENEROSITY_GET_NEXT_TAG @"getNextTag"
#define APM_K_GENEROSITY_TRIGGED_AT @"triggedAt" //triggedAt and triggeredAt are same
#define APM_K_GENEROSITY_TRIGGERED_AT @"triggeredAt" //triggedAt and triggeredAt are same
#define APM_K_GENEROSITY_TRIGGED_AT @"triggedAt" //triggedAt and triggeredAt are same, need to keep triggedAt for fidelity, APM_K_GENEROSITY_TRIGGED_AT is the most important for me
#define APM_K_GENEROSITY_TRIGGERED_AT @"triggeredAt" //triggedAt and triggeredAt are same, need to keep triggeredAt for gamification
#define APM_K_GENEROSITY_OFFSET @"generosityOffset"
#define APM_K_GENEROSITY_TYPE @"generosityType"
#define APM_K_GENEROSITY_DEEPLINK_URL @"generosityUrl"
......@@ -246,6 +249,9 @@
#define APM_K_DATE @"gmtDate"
#define APM_K_PLACE @"localisation"
// Test keys
#define APM_K_CODE @"code"
// Functions
#define APM_FUNC_USER_CHECK_CREDENTIALS 1
#define APM_FUNC_USER_CREATE 2
......@@ -300,6 +306,7 @@
#define APM_FUNC_USER_LIST 52
#define APM_FUNC_AD_NEWS_LIST 53
#define APM_FUNC_AD_SPECIALS_LIST 54
#define APM_FUNC_USER_REFRESH_DATA 55
// Url WS
#define APM_INIT_CHECK_STORE @"partner/initialcheckstore"
......@@ -332,6 +339,7 @@
#define APM_USER_UNSUBSCRIBE @"user/unsubscribe"
#define APM_USER_DELETE @"user/delete"
#define APM_USER_LIST @"user/list"
#define APM_USER_REFRESH_DATA @"user/refreshdata"
#define APM_GENEROSITY_LIST @"generosity/list"
#define APM_GENEROSITY_SAVE @"generosity/save"
#define APM_GENEROSITY_STORE @"generosity/store"
......@@ -358,6 +366,8 @@
#define APM_STATISTIC_GIFT_DISPLAY @"statistic/giftdisplay"
#define APM_LOG_SAVE @"log/save"
#define APM_STORE_LIST @"store/list"
#define APM_TEST_OK @"test/ok"
#define APM_TEST_CODE @"test/code"
// Error
#define APM_K_ERROR_CODE @"errorCode"
......@@ -371,7 +381,6 @@
#define APM_ERROR_MESSAGE_CONFIG @"error on partnerID, partnerSecret, appID or schemeUrl..."
#define APM_ERROR_MESSAGE_ACCOUNT_NOT_CONNECTED @"user not connected..."
#define APM_ERROR_MESSAGE_ERROR_IMAGE @"error image..."
#define APM_ERROR_MESSAGE_HTTP_REQUEST_ERROR @"http request error..."
#define APM_ERROR_MESSAGE_URL_HTTP_INVALID @"url http invalid..."
#define APM_ERROR_MESSAGE_OPT_IN_NOT_ACCEPTED @"Opt in RGPD not accepted"
......@@ -395,6 +404,7 @@
#define APM_FILE_PENDING_CONNECTION_INFO_SDK @"fr.moonmiles.appsmiles:pendingConnectionInfo"
#define APM_FILE_LOT_ANIMATIONS_SDK @"fr.moonmiles.appsmiles:lotAnimations"
#define APM_FILE_LOT_ANIMATIONS_DATA_SDK @"fr.moonmiles.appsmiles:lotAnimationsData"
#define APM_FILE_GENEROSITY_BUFFER_SDK @"fr.moonmiles.appsmiles:generosityBuffer"
//Other
#define APM_CLASS_ID_AUTO @"auto"
......
//
// APMServicesConfigStatic.h
// APMServices
//
// Created by Vincent Ducastel on 24/08/2018.
// Copyright © 2018 Moonmiles. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface APMServicesConfigStatic : NSObject
+(NSString*)APM_API_VERSION_STATIC;
+(NSString*)APM_SERVICES_VERSION_NAME_STATIC;
+(NSString*)APM_SERVICES_VERSION_CODE_STATIC;
+(NSString*)APM_URL_API_PROD_STATIC;
+(NSString*)APM_URL_API_SANDBOX_STATIC;
+(NSString*)APM_URL_SITE_APPSMILES_STATIC;
+(NSInteger)APM_PARTNER_LEVEL_INITIAL_STATIC;
+(NSInteger)APM_PARTNER_LEVEL_STANDARD_STATIC;
+(NSInteger)APM_PARTNER_LEVEL_PREMIUM_STATIC;
+(NSInteger)APM_K_USER_GENDER_MME_STATIC;
+(NSInteger)APM_K_USER_GENDER_M_STATIC;
+(NSInteger)APM_GIFT_TYPE_TEXT_STATIC;
+(NSInteger)APM_GIFT_TYPE_BARCODE_STATIC;
+(NSInteger)APM_GIFT_TYPE_OBJECT_STATIC;
+(NSInteger)APM_GIFT_TYPE_URL_STATIC;
+(NSInteger)APM_GIFT_TYPE_EMAIL_STATIC;
+(NSInteger)APM_GIFT_NATURE_POINTS_STATIC;
+(NSInteger)APM_GIFT_NATURE_STATUS_STATIC;
+(NSInteger)APM_BURN_STATUS_UNDEFINED_STATIC;
+(NSInteger)APM_BURN_STATUS_ISSUED_STATIC;
+(NSInteger)APM_BURN_STATUS_USED_STATIC;
+(NSInteger)APM_BURN_STATUS_CANCELED_STATIC;
+(NSInteger)APM_BURN_STATUS_EXPIRED_STATIC;
+(NSInteger)APM_SHOW_PAGE_CNIL_STATIC;
+(NSInteger)APM_SHOW_PAGE_CGU_STATIC;
+(NSInteger)APM_SHOW_PAGE_MENTIONS_STATIC;
+(NSInteger)APM_SHOW_PAGE_HELPER_STATIC;
+(NSInteger)APM_SHOW_PAGE_TUTO_STATIC;
+(NSInteger)APM_SHOW_PAGE_INTERSTITIAL_STATIC;
+(NSInteger)APM_SHOW_PAGE_APP_ONBOARDING_STATIC;
+(NSInteger)APM_SHOW_PAGE_APP_MENTION_STATIC;
+(NSInteger)APM_SHOW_PAGE_APP_TUTORIAL_STATIC;
+(NSInteger)APM_SHOW_PAGE_APP_INTERSTITIAL_STATIC;
+(NSInteger)APM_HOW_WORKS_TYPE_WEBVIEW_STATIC;
+(NSInteger)APM_HOW_WORKS_TYPE_ACTIONS_STATIC;
+(NSInteger)APM_HOW_WORKS_TYPE_GIFTS_STATIC;
+(NSInteger)APM_PAGE_TARGET_ONLY_NOT_CONNECTED_STATIC;
+(NSInteger)APM_PAGE_TARGET_ONLY_CONNECTED_STATIC;
+(NSInteger)APM_PAGE_TARGET_BOTH_STATIC;
+(NSInteger)APM_WALKTHROUGH_STATUS_OFFLINE_STATIC;
+(NSInteger)APM_WALKTHROUGH_STATUS_ONLINE_STATIC;
+(NSInteger)APM_EXCEPTION_NO_ERROR_STATIC;
+(NSInteger)APM_EXCEPTION_ERROR_SERVER_STATIC;
+(NSInteger)APM_EXCEPTION_INVALID_TOKEN_STATIC;
+(NSInteger)APM_EXCEPTION_MODE_TEST_STATIC;
+(NSInteger)APM_EXCEPTION_ERROR_500_STATIC;
+(NSInteger)APM_EXCEPTION_ERROR_404_STATIC;
+(NSInteger)APM_EXCEPTION_ERROR_401_STATIC;
+(NSInteger)APM_EXCEPTION_NO_NETWORK_STATIC;
+(NSInteger)APM_EXCEPTION_UNKNOWN_ERROR_STATIC;
+(NSInteger)APM_EXCEPTION_SERVICE_LOADING_STATIC;
+(NSInteger)APM_EXCEPTION_SERVICE_NOT_ACTIVE_STATIC;
+(NSInteger)APM_EXCEPTION_CONFIG_STATIC;
+(NSInteger)APM_EXCEPTION_ACCOUNT_NOT_CONNECTED_STATIC;
+(NSInteger)APM_EXCEPTION_URL_HTTP_INVALID_STATIC;
+(NSInteger)APM_EXCEPTION_OPT_IN_NOT_ACCEPTED_STATIC;
+(NSInteger)APM_EXCEPTION_ACTION_NOT_FOUND_STATIC;
+(NSString*)APM_DEFAULT_DATE_FORMAT_STATIC;
+(NSInteger)APM_DEVICE_STATUS_NOT_SET_STATIC;
+(NSInteger)APM_DEVICE_STATUS_OK_STATIC;
+(NSInteger)APM_DEVICE_STATUS_ANONYMOUS_STATIC;
+(NSInteger)APM_DEVICE_STATUS_OPTIN_OFF_STATIC;
+(NSInteger)APM_DEVICE_OPT_IN_NOT_SET_STATIC;
+(NSInteger)APM_DEVICE_OPT_IN_REFUSE_STATIC;
+(NSInteger)APM_DEVICE_OPT_IN_ACCEPT_STATIC;
+(NSString*)APM_CLASS_ID_GLOBAL_STATIC;
+(NSInteger)APM_AD_TYPE_BONUS_STATIC;
+(NSInteger)APM_AD_TYPE_NEWS_STATIC;
+(NSInteger)APM_AD_TYPE_SPECIALS_STATIC;
+(NSInteger)APM_GENEROSITY_TYPE_SYSTEMATIC_STATIC;
+(NSInteger)APM_GENEROSITY_TYPE_SUGGESTED_STATIC;
+(NSInteger)APM_GENEROSITY_TYPE_AUTOMATIC_STATIC;
+(NSInteger)APM_TRIGGER_CACHE_POLICY_DISCARD_STATIC;
+(NSInteger)APM_TRIGGER_CACHE_POLICY_STORE_ALWAYS_STATIC;
@end
......@@ -13,5 +13,6 @@
+(NSError*)errorWithCode:(NSInteger)code;
+(NSError*)errorWithCode:(NSInteger)code message:(NSString*)message;
+(NSError*)errorWithDomain:(NSString*)domain code:(NSInteger)code message:(NSString*)message;
+(NSError*)errorWithSessionDataTask:(NSURLSessionDataTask*)task;
@end
......@@ -32,7 +32,7 @@
+(void)userRefresh:(void (^)(APMUser* user))userRefreshSuccess failure:(void (^)(NSError* error))failure;
+(void)userResetPassword:(NSString*)email userResetPasswordSuccess:(void (^)(NSString* message))userResetPasswordSuccess failure:(void (^)(NSError* error))failure;
+(void)userHistory:(void (^)(APMUser* user, NSMutableArray* earns, NSMutableArray* burns, NSMutableArray* ads))userHistorySuccess failure:(void (^)(NSError* error))failure;
+(void)userHistoryBurns:(void (^)(NSMutableArray* burns))userHistoryBurnsSuccess failure:(void (^)(NSError* error))failure;
+(void)userHistoryBurnsWithForceRefresh:(BOOL)forceRefresh userHistoryBurnsSuccess:(void (^)(NSMutableArray* burns))userHistoryBurnsSuccess failure:(void (^)(NSError* error))failure;
+(void)userHistoryEarns:(void (^)(NSMutableArray* earns))userHistoryEarnsSuccess failure:(void (^)(NSError* error))failure;
+(void)userUnsubscribeWithComment:(NSString*)comment userUnsubscribeSuccess:(void (^)(void))userUnsubscribeSuccess failure:(void (^)(NSError* error))failure;
+(void)userContact:(NSString*)comment userContactSuccess:(void (^)(NSString* message))userContactSuccess failure:(void (^)(NSError* error))failure;
......@@ -44,5 +44,6 @@
+(void)userSavePushToken:(NSString*)pushToken userSavePushTokenSuccess:(void (^)(void))userSavePushTokenSuccess failure:(void (^)(NSError* error))failure;
+(void)userDeleteWithUserDeleteSuccess:(void (^)(void))userDeleteSuccess failure:(void (^)(NSError* error))failure;
+(void)userListWithPartnerClientIDs:(NSArray*)partnerClientIDs userListSuccess:(void (^)(NSArray* users))userListSuccess failure:(void (^)(NSError* error))failure;
+(void)userRefreshDataWithUserRefreshDataSuccess:(void (^)())userRefreshDataSuccess failure:(void (^)(NSError* error))failure;
@end
......@@ -32,6 +32,7 @@
@property(nonatomic, strong) NSString *loyaltyId;
@property(nonatomic, strong) id customParams;
@property(nonatomic, strong) APMUserJourney* userJourney;
@property(nonatomic, strong) NSMutableArray *acquiredTags;
-(void)updateWithJSONObject:(NSDictionary*)jsonObject;
-(BOOL)isConnected;
......
//
// APMServices.h
// APMWebServices.h
// APMServices
//
// Created by Vincent Ducastel on 21/05/2015.
......@@ -26,7 +26,7 @@
+(void)userHistoryEarns:(NSString*)userToken success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userHistoryBurns:(NSString*)userToken success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userHistoryBurns:(NSString*)userToken forceRefresh:(BOOL)forceRefresh success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userSetPartnerClientId:(NSString*)userToken partnerClientId:(NSString*)partnerClientId success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userSetPartnerClientId:(NSString*)userToken params:(NSDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
......@@ -74,6 +74,8 @@
+(void)userList:(NSString*)userToken partnerClientIds:(NSArray*)partnerClientIds success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userList:(NSString*)userToken params:(NSDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)userRefreshData:(NSString*)userToken success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)partnerGetProg:(NSString*)partnerId versions:(APMVersions*)versions success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)partnerGetProg:(NSDictionary*)params success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
......@@ -134,6 +136,13 @@
+(void)getJsonFromUrl:(NSString*)url success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
//*************************************************************************************************************************//
+(void)testOk:(NSString*)userToken success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(void)testCode:(NSInteger)code userToken:(NSString*)userToken success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
//*************************************************************************************************************************//
+(void)callHttp:(NSString*)url success:(void (^)(NSURLSessionDataTask* task, id responseObject))success failure:(void (^)(NSURLSessionDataTask* task, NSError* error))failure;
+(NSString*)createUserAgent;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment