[ios] Updated accounts libraryupstream/jrex/sku-token-patch

3 files changed, 4 insertions, 23 deletions

diff --git a/platform/darwin/src/MGLAccountManager.m b/platform/darwin/src/MGLAccountManager.m
index cfcf4b616c..edcfbbcdf0 100644
--- a/platform/darwin/src/MGLAccountManager.m
+++ b/platform/darwin/src/MGLAccountManager.m
@@ -18,9 +18,6 @@ static BOOL _MGLAccountsSDKEnabled;
 @property (nonatomic) NSURL *apiBaseURL;
 
 #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR
-@property (class, readonly, nonnull) NSUserDefaults *skuDefaults;
-@property (class, readonly, nonnull) NSString *skuUserId;
-
 @property (atomic) NSString *skuToken;
 @property (atomic) NSDate *skuTokenExpiration;
 #endif
@@ -53,7 +50,7 @@ static BOOL _MGLAccountsSDKEnabled;
     }
     
     if (self.isAccountsSDKEnabled) {
-        self.skuToken = [MBXSKUToken mapsSKUTokenForUserId:self.skuUserId];
+        self.skuToken = MBXSKUToken.mapsToken;
     }
 
 #endif
@@ -119,21 +116,6 @@ static BOOL _MGLAccountsSDKEnabled;
     return _MGLAccountsSDKEnabled;
 }
 
-+ (nonnull NSUserDefaults *)skuDefaults {
-    return [NSUserDefaults standardUserDefaults];
-}
-
-+ (NSString *)skuUserId {
-    static NSString *userIdKey = @"MGLMapboxAccountsSDKUserId";
-    NSString *userId = [self.skuDefaults stringForKey:userIdKey];
-
-    if (!userId && self.isAccountsSDKEnabled) {
-        userId = [MBXSKUToken generateEndUserId];
-        [self.skuDefaults setObject:userId forKey:userIdKey];
-    }
-    return userId;
-}
-
 + (void)setSkuToken:(NSString *)skuToken {
     if (MGLAccountManager.isAccountsSDKEnabled) {
         NSTimeInterval oneHour = 60 * 60; // TODO: make this const
@@ -149,7 +131,7 @@ static BOOL _MGLAccountsSDKEnabled;
 + (NSString *)skuToken {
     if (MGLAccountManager.isAccountsSDKEnabled) {
         return [MGLAccountManager.sharedManager isSKUTokenExpired] ?
-            [MBXSKUToken mapsSKUTokenForUserId:self.skuUserId] :
+            MBXSKUToken.mapsToken :
             MGLAccountManager.sharedManager.skuToken;
     }
     else {
diff --git a/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h b/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h
index cf4da52965..e83ffd2288 100644
--- a/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h
+++ b/platform/ios/vendor/mapbox-accounts-ios/MBXSKUToken.h
@@ -7,9 +7,8 @@ extern NSString *const MBXAccountsNavigationSKUIDMaps;
 
 @interface MBXSKUToken : NSObject
 
-+ (NSString *)mapsSKUTokenForUserId:(NSString *)userId;
-+ (NSString *)navigationSKUTokenForUserId:(NSString *)userId;
-+ (NSString *)generateEndUserId;
+@property (class, nonatomic, readonly) NSString *mapsToken;
+@property (class, nonatomic, readonly) NSString *navigationToken;
 
 @end
 
diff --git a/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a b/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a
index 6288d5526d..95d51deabc 100644
--- a/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a
+++ b/platform/ios/vendor/mapbox-accounts-ios/libmbxaccounts.a