summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wray <jason@mapbox.com>2019-05-15 14:35:18 -0700
committerJason Wray <jason@mapbox.com>2019-05-15 14:35:18 -0700
commitcbef953ce39c5892adf0f468de5b065f23e6ac54 (patch)
tree8a00c25f35d50f9530fbecc646b597c43e688706
parent3a6ff7710fcf201f82ddc2090488ef585bd8ab17 (diff)
downloadqtlocation-mapboxgl-upstream/friedbunny-libmbxaccounts-0.0.5.tar.gz
[ios] Update to libmbxaccounts 0.0.5upstream/friedbunny-libmbxaccounts-0.0.5
-rw-r--r--platform/darwin/src/MGLAccountManager.m4
-rw-r--r--platform/ios/src/MGLMapboxEvents.m2
-rw-r--r--platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h21
-rw-r--r--platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.abin68592 -> 74248 bytes
4 files changed, 20 insertions, 7 deletions
diff --git a/platform/darwin/src/MGLAccountManager.m b/platform/darwin/src/MGLAccountManager.m
index edcfbbcdf0..da2b99c9ac 100644
--- a/platform/darwin/src/MGLAccountManager.m
+++ b/platform/darwin/src/MGLAccountManager.m
@@ -50,7 +50,7 @@ static BOOL _MGLAccountsSDKEnabled;
}
if (self.isAccountsSDKEnabled) {
- self.skuToken = MBXSKUToken.mapsToken;
+ self.skuToken = [MBXSKUToken tokenForSKUID:MBXAccountsSKUIDMaps type:MBXAccountsSKUTypeUser];
}
#endif
@@ -131,7 +131,7 @@ static BOOL _MGLAccountsSDKEnabled;
+ (NSString *)skuToken {
if (MGLAccountManager.isAccountsSDKEnabled) {
return [MGLAccountManager.sharedManager isSKUTokenExpired] ?
- MBXSKUToken.mapsToken :
+ [MBXSKUToken tokenForSKUID:MBXAccountsSKUIDMaps type:MBXAccountsSKUTypeUser] :
MGLAccountManager.sharedManager.skuToken;
}
else {
diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m
index bb16f77f98..337929c7ec 100644
--- a/platform/ios/src/MGLMapboxEvents.m
+++ b/platform/ios/src/MGLMapboxEvents.m
@@ -146,7 +146,7 @@ static NSString * const MGLVariableGeofence = @"VariableGeofence";
}
if (MGLAccountManager.isAccountsSDKEnabled) {
- [[self sharedInstance] eventsManager].skuId = MBXAccountsMapsSKUIDMaps;
+ [[self sharedInstance] eventsManager].skuId = MBXAccountsSKUIDMaps;
}
[self flush];
diff --git a/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h b/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h
index e83ffd2288..8a02d9641c 100644
--- a/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h
+++ b/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h
@@ -2,13 +2,26 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *const MBXAccountsMapsSKUIDMaps;
-extern NSString *const MBXAccountsNavigationSKUIDMaps;
+typedef NSString *MBXAccountsSKUID NS_TYPED_ENUM;
+FOUNDATION_EXTERN const MBXAccountsSKUID MBXAccountsSKUIDMaps;
+FOUNDATION_EXTERN const MBXAccountsSKUID MBXAccountsSKUIDNavigation;
+
+typedef NS_ENUM(NSInteger, MBXAccountsSKUType) {
+ MBXAccountsSKUTypeUser,
+ MBXAccountsSKUTypeSession
+};
@interface MBXSKUToken : NSObject
-@property (class, nonatomic, readonly) NSString *mapsToken;
-@property (class, nonatomic, readonly) NSString *navigationToken;
+/**
+ Generates a token for the given identifier and type.
+
+ @param skuId The sku identifier, e.g. maps or navigation.
+ @param type The type of token, e.g. user or session.
+
+ @return A SKU token for use with API requests.
+ */
++ (NSString *)tokenForSKUID:(MBXAccountsSKUID)skuId type:(MBXAccountsSKUType)type NS_SWIFT_NAME(token(for:type:));
@end
diff --git a/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a b/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a
index efe06835ec..b57e17d47f 100644
--- a/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a
+++ b/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a
Binary files differ