diff options
-rw-r--r-- | Example/Auth/Sample/UserInfoViewController.m | 2 | ||||
-rw-r--r-- | Firebase/Auth/Source/FIRUserMetadata.h (renamed from Firebase/Auth/Source/Public/FIRUserMetadata.h) | 3 | ||||
-rw-r--r-- | Firebase/Auth/Source/FIRUser_Internal.h | 5 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRUser.h | 5 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FirebaseAuth.h | 1 |
5 files changed, 6 insertions, 10 deletions
diff --git a/Example/Auth/Sample/UserInfoViewController.m b/Example/Auth/Sample/UserInfoViewController.m index e8e15cb..379e883 100644 --- a/Example/Auth/Sample/UserInfoViewController.m +++ b/Example/Auth/Sample/UserInfoViewController.m @@ -16,7 +16,7 @@ #import "UserInfoViewController.h" -#import "FIRUser.h" +#import "FIRUser_Internal.h" #import "FIRUserInfo.h" #import "FIRUserMetadata.h" #import "StaticContentTableViewManager.h" diff --git a/Firebase/Auth/Source/Public/FIRUserMetadata.h b/Firebase/Auth/Source/FIRUserMetadata.h index 1b72ee1..a93b148 100644 --- a/Firebase/Auth/Source/Public/FIRUserMetadata.h +++ b/Firebase/Auth/Source/FIRUserMetadata.h @@ -16,14 +16,11 @@ #import <Foundation/Foundation.h> -#import "FIRAuthSwiftNameSupport.h" - NS_ASSUME_NONNULL_BEGIN /** @class FIRUserMetdata @brief A data class representing the metadata corresponding to a Firebase user. */ -FIR_SWIFT_NAME(UserMetadata) @interface FIRUserMetadata : NSObject /** @property lastSignInDate diff --git a/Firebase/Auth/Source/FIRUser_Internal.h b/Firebase/Auth/Source/FIRUser_Internal.h index 9a069bb..9e26301 100644 --- a/Firebase/Auth/Source/FIRUser_Internal.h +++ b/Firebase/Auth/Source/FIRUser_Internal.h @@ -47,6 +47,11 @@ typedef void(^FIRRetrieveUserCallback)(FIRUser *_Nullable user, NSError *_Nullab */ @property(nonatomic, copy, readonly) NSDate *accessTokenExpirationDate; +/** @property metadata + @brief Metadata associated with the Firebase user in question. + */ +@property(nonatomic, readonly, nonnull) FIRUserMetadata *metadata; + /** @fn retrieveUserWithAuth:accessToken:accessTokenExpirationDate:refreshToken:callback: @brief Constructs a user with Secure Token Service tokens, and obtains user details from the getAccountInfo endpoint. diff --git a/Firebase/Auth/Source/Public/FIRUser.h b/Firebase/Auth/Source/Public/FIRUser.h index f0a5619..ecbbd8c 100644 --- a/Firebase/Auth/Source/Public/FIRUser.h +++ b/Firebase/Auth/Source/Public/FIRUser.h @@ -85,11 +85,6 @@ FIR_SWIFT_NAME(User) */ @property(nonatomic, readonly, nonnull) NSArray<id<FIRUserInfo>> *providerData; -/** @property metadata - @brief Metadata associated with the Firebase user in question. - */ -@property(nonatomic, readonly, nonnull) FIRUserMetadata *metadata; - /** @fn init @brief This class should not be instantiated. @remarks To retrieve the current user, use @c FIRAuth.currentUser. To sign a user diff --git a/Firebase/Auth/Source/Public/FirebaseAuth.h b/Firebase/Auth/Source/Public/FirebaseAuth.h index 0cc5905..15699ff 100644 --- a/Firebase/Auth/Source/Public/FirebaseAuth.h +++ b/Firebase/Auth/Source/Public/FirebaseAuth.h @@ -32,7 +32,6 @@ #import "FIRTwitterAuthProvider.h" #import "FIRUser.h" #import "FIRUserInfo.h" -#import "FIRUserMetadata.h" #if TARGET_OS_IOS #import "FIRAuthUIDelegate.h" |