* added the blUserLocale property (two character code) to the BackendlessUser object

* loginAsGuest methods in progress

Author: Olha Danylova

CHANGELOG.md

@@ -1,5 +1,22 @@
 # RELEASE HISTORY
 
+## 5.4.1 August ?, 2019
+* added the blUserLocale property (two character code) to the BackendlessUser object
+* added methods to UserService:
+```
+- (void)setUserToken:(NSString *)userToken;
+
+-(NSString *)getUserToken;
+
+-(BackendlessUser *)loginAsGuest;
+
+-(BackendlessUser *)loginAsGuestWithStayLoggedIn:(BOOL)stayLoggedIn;
+
+-(void)loginAsGuest:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
+
+-(void)loginAsGuestWithStayLoggedIn:(BOOL)stayLoggedIn response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
+```
+
 ## 5.4.0 July 9, 2019
 * added support of custom smart-text substitutions for push templates, the sendEmail method signatures changed:
 ```

Pods/Backendless.podspec

@@ -17,4 +17,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 675cc991d5f2f8cb6bcd0ce2d67444ed1b8f2a74
 
-COCOAPODS: 1.7.1
+COCOAPODS: 1.7.5

SDK/Podfile.lock

@@ -27,6 +27,7 @@
 #define BACKENDLESS_ID_KEY @"id"
 #define BACKENDLESS_USER_TOKEN @"user-token"
 #define BACKENDLESS_USER_REGISTERED @"user-registered"
+#define BACKENDLESS_USER_LOCALE @"blUserLocale"
 
 @interface BackendlessUser : NSObject <NSCopying>
 
@@ -38,6 +39,7 @@
 -(id)initWithProperties:(NSDictionary<NSString*, id> *)properties;
 -(BOOL)isUserRegistered;
 -(NSString *)getUserToken;
+-(void)setUserToken:(NSString *)userToken;
 -(void)persistCurrentUser;
 -(void)setProperty:(NSString *)key object:(id)value;
 -(void)setProperties:(NSDictionary<NSString*, id> *)properties;
@@ -47,5 +49,6 @@
 -(NSDictionary<NSString*, id> *)getProperties;
 -(void)removeProperty:(NSString *)key;
 -(void)removeProperties:(NSArray<NSString*> *)keys;
+-(void)setLocale:(NSString *)languageCode;
 
 @end

SDK/backendlessAPI/Classes/UserService/BackendlessUser.h

@@ -31,15 +31,16 @@ @interface BackendlessUser() {
 @implementation BackendlessUser
 
 -(id)init {
-    if (self=[super init]) {
-        __properties = nil;
+    if (self = [super init]) {
+        __properties = [[HashMap alloc] initWithNode:@{BACKENDLESS_USER_LOCALE: [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode]}];
     }
     return self;
 }
 
 -(id)initWithProperties:(NSDictionary<NSString*, id> *)properties {
-    if (self=[super init]) {
+    if (self = [super init]) {
         __properties = (properties) ? [[HashMap alloc] initWithNode:properties] : nil;
+        [__properties add:BACKENDLESS_USER_LOCALE withObject:[[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode]];
     }
     return self;
 }
@@ -82,6 +83,14 @@ -(void)setName:(NSString *)name {
     [self setProperty:BACKENDLESS_NAME_KEY object:name];
 }
 
+-(void)setLocale:(NSString *)languageCode {
+    [self setProperty:BACKENDLESS_USER_LOCALE object:languageCode];
+}
+
+-(NSString *)getLocale {
+    return [self getProperty:BACKENDLESS_USER_LOCALE];
+}
+
 -(BOOL)isUserRegistered {
     return [[self getProperty:BACKENDLESS_USER_REGISTERED] isKindOfClass:NSNumber.class];
 }
@@ -97,6 +106,10 @@ -(NSString *)getUserToken {
     return nil;
 }
 
+-(void)setUserToken:(NSString *)userToken {
+    [self setProperty:BACKENDLESS_USER_TOKEN object:userToken];
+}
+
 -(void)persistCurrentUser {
     if (backendless.userService.isStayLoggedIn && backendless.userService.currentUser && [self.objectId isEqualToString:backendless.userService.currentUser.objectId]) {
         [backendless.userService setPersistentUser];

SDK/backendlessAPI/Classes/UserService/BackendlessUser.m

@@ -29,6 +29,8 @@
 @property (readonly) BOOL isStayLoggedIn;
 
 -(BOOL)setStayLoggedIn:(BOOL)value;
+- (void)setUserToken:(NSString *)userToken;
+-(NSString *)getUserToken;
 
 // sync methods with fault return (as exception)
 -(BackendlessUser *)registerUser:(BackendlessUser *)user;
@@ -44,6 +46,8 @@
 -(BackendlessUser *)loginWithGoogleSDK:(NSString *)idToken accessToken:(NSString *)accessToken;
 -(BackendlessUser *)loginWithTwitterSDK:(NSString *)authToken authTokenSecret:(NSString *)authTokenSecret fieldsMapping:(NSDictionary *)fieldsMapping;
 -(void)resendEmailConfirmation:(NSString *)email;
+-(BackendlessUser *)loginAsGuest;
+-(BackendlessUser *)loginAsGuestWithStayLoggedIn:(BOOL)stayLoggedIn;
 
 // async methods with block-based callbacks
 -(void)registerUser:(BackendlessUser *)user response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
@@ -59,6 +63,8 @@
 -(void)loginWithGoogleSDK:(NSString *)idToken accessToken:(NSString *)accessToken response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
 -(void)loginWithTwitterSDK:(NSString *)authToken authTokenSecret:(NSString *)authTokenSecret fieldsMapping:(NSDictionary *)fieldsMapping response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
 -(void)resendEmailConfirmation:(NSString *)email response:(void(^)(void))responseBlock error:(void(^)(Fault *))errorBlock;
+-(void)loginAsGuest:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
+-(void)loginAsGuestWithStayLoggedIn:(BOOL)stayLoggedIn response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
 
 // persistent user
 -(BOOL)getPersistentUser;

SDK/backendlessAPI/Classes/UserService/UserService.h

@@ -58,6 +58,7 @@
 static NSString *METHOD_USER_LOGIN_WITH_GOOGLEPLUS_SDK = @"loginWithGooglePlus";
 static NSString *METHOD_USER_LOGIN_WITH_TWITTER_SDK = @"loginWithTwitter";
 static NSString *METHOD_RESEND_EMAIL_CONFIRMATION = @"resendEmailConfirmation";
+static NSString *METHOD_GUEST_LOGIN = @"loginAsGuest";
 
 @interface UserService ()
 
@@ -109,6 +110,14 @@ -(BOOL)setStayLoggedIn:(BOOL)value {
     return (_isStayLoggedIn = value) ? [self setPersistentUser] : [self resetPersistentUser];
 }
 
+-(void)setUserToken:(NSString *)userToken {
+    [backendless.headers setValue:userToken forKey:BACKENDLESS_USER_TOKEN];
+}
+
+-(NSString *)getUserToken {
+    return self.currentUser.getUserToken;
+}
+
 // sync methods with fault return (as exception)
 
 -(BackendlessUser *)registerUser:(BackendlessUser *)user {
@@ -274,6 +283,31 @@ -(void)resendEmailConfirmation:(NSString *)email {
     [self onLogin:result];
 }
 
+-(BackendlessUser *)loginAsGuest  {
+    return [self loginAsGuestWithStayLoggedIn:NO];
+}
+
+-(BackendlessUser *)loginAsGuestWithStayLoggedIn:(BOOL)stayLoggedIn {
+    [self setStayLoggedIn:stayLoggedIn];
+    id result = [invoker invokeSync:SERVER_USER_SERVICE_PATH method:METHOD_GUEST_LOGIN args:nil responseAdapter:[BackendlessUserAdapter new]];
+    if ([result isKindOfClass:[Fault class]]) {
+        return [backendless throwFault:result];
+    }
+    BackendlessUser *guest = [BackendlessUser new];
+    guest.objectId = [result objectForKey:@"objectId"];
+    [guest setUserToken:[result objectForKey:@"user-token"]];
+    
+    self.currentUser = guest;
+    if (self.currentUser.getUserToken) {
+        [backendless.headers setValue:self.currentUser.getUserToken forKey:BACKENDLESS_USER_TOKEN];
+    }
+    else {
+        [backendless.headers removeObjectForKey:BACKENDLESS_USER_TOKEN];
+    }
+    [self setPersistentUser];
+    return self.currentUser;
+}
+
 // async methods with block-based callbacks
 
 -(void)registerUser:(BackendlessUser *)user response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock {
@@ -401,6 +435,17 @@ -(void)resendEmailConfirmation:(NSString *)email response:(void(^)(void))respons
     [invoker invokeAsync:SERVER_USER_SERVICE_PATH method:METHOD_RESEND_EMAIL_CONFIRMATION args:args responder:responder];
 }
 
+-(void)loginAsGuest:(void (^)(BackendlessUser *))responseBlock error:(void (^)(Fault *))errorBlock {
+    [self loginAsGuestWithStayLoggedIn:NO response:responseBlock error:errorBlock];
+}
+
+-(void)loginAsGuestWithStayLoggedIn:(BOOL)stayLoggedIn response:(void (^)(BackendlessUser *))responseBlock error:(void (^)(Fault *))errorBlock {    
+    Responder *responder = [ResponderBlocksContext responderBlocksContext:responseBlock error:errorBlock];
+    Responder *_responder = [Responder responder:self selResponseHandler:@selector(onLogin:) selErrorHandler:nil];
+    _responder.chained = responder;
+    [invoker invokeAsync:SERVER_USER_SERVICE_PATH method:METHOD_GUEST_LOGIN args:nil responder:_responder responseAdapter:[BackendlessUserAdapter new]];
+}
+
 // persistent user
 
 -(BOOL)getPersistentUser {
@@ -513,5 +558,4 @@ -(void)onLogoutError:(Fault *)fault {
     }
 }
 
-
 @end

SDK/backendlessAPI/Classes/UserService/UserService.m

@@ -27,6 +27,7 @@
 #define BACKENDLESS_ID_KEY @"id"
 #define BACKENDLESS_USER_TOKEN @"user-token"
 #define BACKENDLESS_USER_REGISTERED @"user-registered"
+#define BACKENDLESS_USER_LOCALE @"blUserLocale"
 
 @interface BackendlessUser : NSObject <NSCopying>
 
@@ -38,6 +39,7 @@
 -(id)initWithProperties:(NSDictionary<NSString*, id> *)properties;
 -(BOOL)isUserRegistered;
 -(NSString *)getUserToken;
+-(void)setUserToken:(NSString *)userToken;
 -(void)persistCurrentUser;
 -(void)setProperty:(NSString *)key object:(id)value;
 -(void)setProperties:(NSDictionary<NSString*, id> *)properties;
@@ -47,5 +49,6 @@
 -(NSDictionary<NSString*, id> *)getProperties;
 -(void)removeProperty:(NSString *)key;
 -(void)removeProperties:(NSArray<NSString*> *)keys;
+-(void)setLocale:(NSString *)languageCode;
 
 @end

SDK/ios/backendless/backendless.a

@@ -29,6 +29,8 @@
 @property (readonly) BOOL isStayLoggedIn;
 
 -(BOOL)setStayLoggedIn:(BOOL)value;
+- (void)setUserToken:(NSString *)userToken;
+-(NSString *)getUserToken;
 
 // sync methods with fault return (as exception)
 -(BackendlessUser *)registerUser:(BackendlessUser *)user;
@@ -44,6 +46,8 @@
 -(BackendlessUser *)loginWithGoogleSDK:(NSString *)idToken accessToken:(NSString *)accessToken;
 -(BackendlessUser *)loginWithTwitterSDK:(NSString *)authToken authTokenSecret:(NSString *)authTokenSecret fieldsMapping:(NSDictionary *)fieldsMapping;
 -(void)resendEmailConfirmation:(NSString *)email;
+-(BackendlessUser *)loginAsGuest;
+-(BackendlessUser *)loginAsGuestWithStayLoggedIn:(BOOL)stayLoggedIn;
 
 // async methods with block-based callbacks
 -(void)registerUser:(BackendlessUser *)user response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
@@ -59,6 +63,8 @@
 -(void)loginWithGoogleSDK:(NSString *)idToken accessToken:(NSString *)accessToken response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
 -(void)loginWithTwitterSDK:(NSString *)authToken authTokenSecret:(NSString *)authTokenSecret fieldsMapping:(NSDictionary *)fieldsMapping response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
 -(void)resendEmailConfirmation:(NSString *)email response:(void(^)(void))responseBlock error:(void(^)(Fault *))errorBlock;
+-(void)loginAsGuest:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
+-(void)loginAsGuestWithStayLoggedIn:(BOOL)stayLoggedIn response:(void(^)(BackendlessUser *))responseBlock error:(void(^)(Fault *))errorBlock;
 
 // persistent user
 -(BOOL)getPersistentUser;