Skip to content

Commit

Permalink
Merge e9892b2 into 1ef1ea2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xiaoshouzi-gh
Xiaoshouzi-gh committed Jun 23, 2023
2 parents 1ef1ea2 + e9892b2 commit 84f7dc4
Show file tree
Hide file tree
Showing 54 changed files with 1,933 additions and 263 deletions.
3 changes: 3 additions & 0 deletions FirebaseAuth/CHANGELOG.md
View file
@@ -1,3 +1,6 @@
# 10.12.0
- [added] Added support to Firebase Auth to enroll and sign in a user with TOTP second factor.(#11261)

# 10.8.0
- [added] Added Firebase App Check support to Firebase Auth. (#11056)
- [added] Added Sign in with Apple token revocation support. (#9906)
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m
View file
Expand Up @@ -528,7 +528,7 @@ - (void)verifyClientAndSendVerificationCodeToPhoneNumber:(NSString *)phoneNumber
} else {
if (callback) {
callback(
response.enrollmentResponse.sessionInfo,
response.phoneSessionInfo.sessionInfo,
nil);
}
}
Expand Down
58 changes: 45 additions & 13 deletions FirebaseAuth/Sources/Backend/FIRAuthBackend.m
View file
Expand Up @@ -74,6 +74,8 @@

#import "FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthCredential_Internal.h"
#import "FirebaseAuth/Sources/MultiFactor/Phone/FIRPhoneMultiFactorInfo+Internal.h"
#import "FirebaseAuth/Sources/MultiFactor/TOTP/FIRTOTPMultiFactorInfo.h"

#endif

NS_ASSUME_NONNULL_BEGIN
Expand Down Expand Up @@ -798,15 +800,25 @@ - (void)verifyAssertion:(FIRVerifyAssertionRequest *)request
} else {
if (!response.IDToken && response.MFAInfo) {
#if TARGET_OS_IOS
NSMutableArray<FIRMultiFactorInfo *> *multiFactorInfo = [NSMutableArray array];
NSMutableArray<FIRMultiFactorInfo *> *multiFactorInfoArray =
[[NSMutableArray alloc] init];
for (FIRAuthProtoMFAEnrollment *MFAEnrollment in response.MFAInfo) {
FIRPhoneMultiFactorInfo *info =
[[FIRPhoneMultiFactorInfo alloc] initWithProto:MFAEnrollment];
[multiFactorInfo addObject:info];
if (MFAEnrollment.phoneInfo) {
FIRMultiFactorInfo *multiFactorInfo =
[[FIRPhoneMultiFactorInfo alloc] initWithProto:MFAEnrollment];
[multiFactorInfoArray addObject:multiFactorInfo];
} else if (MFAEnrollment.TOTPInfo) {
FIRMultiFactorInfo *multiFactorInfo =
[[FIRTOTPMultiFactorInfo alloc] initWithProto:MFAEnrollment];
[multiFactorInfoArray addObject:multiFactorInfo];
} else {
FIRLogError(kFIRLoggerAuth, @"I-AUT000020",
@"Multifactor type is not supported");
}
}
NSError *multiFactorRequiredError = [FIRAuthErrorUtils
secondFactorRequiredErrorWithPendingCredential:response.MFAPendingCredential
hints:multiFactorInfo
hints:multiFactorInfoArray
auth:request.requestConfiguration
.auth];
callback(nil, multiFactorRequiredError);
Expand Down Expand Up @@ -846,9 +858,19 @@ - (void)verifyPassword:(FIRVerifyPasswordRequest *)request
#if TARGET_OS_IOS
NSMutableArray<FIRMultiFactorInfo *> *multiFactorInfo = [NSMutableArray array];
for (FIRAuthProtoMFAEnrollment *MFAEnrollment in response.MFAInfo) {
FIRPhoneMultiFactorInfo *info =
[[FIRPhoneMultiFactorInfo alloc] initWithProto:MFAEnrollment];
[multiFactorInfo addObject:info];
// check which MFA factors are enabled.
if (MFAEnrollment.phoneInfo != nil) {
FIRPhoneMultiFactorInfo *info =
[[FIRPhoneMultiFactorInfo alloc] initWithProto:MFAEnrollment];
[multiFactorInfo addObject:info];
} else if (MFAEnrollment.TOTPInfo != nil) {
FIRTOTPMultiFactorInfo *info =
[[FIRTOTPMultiFactorInfo alloc] initWithProto:MFAEnrollment];
[multiFactorInfo addObject:info];
} else {
FIRLogError(kFIRLoggerAuth, @"I-AUT000021",
@"Multifactor type is not supported");
}
}
NSError *multiFactorRequiredError = [FIRAuthErrorUtils
secondFactorRequiredErrorWithPendingCredential:response.MFAPendingCredential
Expand Down Expand Up @@ -876,15 +898,25 @@ - (void)emailLinkSignin:(FIREmailLinkSignInRequest *)request
} else {
if (!response.IDToken && response.MFAInfo) {
#if TARGET_OS_IOS
NSMutableArray<FIRMultiFactorInfo *> *multiFactorInfo = [NSMutableArray array];
NSMutableArray<FIRMultiFactorInfo *> *multiFactorInfoArray =
[[NSMutableArray alloc] init];
for (FIRAuthProtoMFAEnrollment *MFAEnrollment in response.MFAInfo) {
FIRPhoneMultiFactorInfo *info =
[[FIRPhoneMultiFactorInfo alloc] initWithProto:MFAEnrollment];
[multiFactorInfo addObject:info];
if (MFAEnrollment.phoneInfo) {
FIRMultiFactorInfo *multiFactorInfo =
[[FIRPhoneMultiFactorInfo alloc] initWithProto:MFAEnrollment];
[multiFactorInfoArray addObject:multiFactorInfo];
} else if (MFAEnrollment.TOTPInfo) {
FIRMultiFactorInfo *multiFactorInfo =
[[FIRTOTPMultiFactorInfo alloc] initWithProto:MFAEnrollment];
[multiFactorInfoArray addObject:multiFactorInfo];
} else {
FIRLogError(kFIRLoggerAuth, @"I-AUT000022",
@"Multifactor type is not supported");
}
}
NSError *multiFactorRequiredError = [FIRAuthErrorUtils
secondFactorRequiredErrorWithPendingCredential:response.MFAPendingCredential
hints:multiFactorInfo
hints:multiFactorInfoArray
auth:request.requestConfiguration
.auth];
callback(nil, multiFactorRequiredError);
Expand Down
15 changes: 12 additions & 3 deletions FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentRequest.h
View file
Expand Up @@ -17,6 +17,7 @@
#import "FirebaseAuth/Sources/Backend/FIRAuthRPCRequest.h"
#import "FirebaseAuth/Sources/Backend/FIRIdentityToolkitRequest.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/Phone/FIRAuthProtoFinalizeMFAPhoneRequestInfo.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/TOTP/FIRAuthProtoFinalizeMFATOTPEnrollmentRequestInfo.h"

NS_ASSUME_NONNULL_BEGIN

Expand All @@ -25,13 +26,21 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, copy, readonly, nullable) NSString *IDToken;

@property(nonatomic, copy, readonly, nullable) NSString *displayName;

@property(nonatomic, copy, readonly, nullable)
FIRAuthProtoFinalizeMFAPhoneRequestInfo *verificationInfo;
FIRAuthProtoFinalizeMFAPhoneRequestInfo *phoneVerificationInfo;
@property(nonatomic, copy, readonly, nullable)
FIRAuthProtoFinalizeMFATOTPEnrollmentRequestInfo *TOTPVerificationInfo;

- (nullable instancetype)initWithIDToken:(NSString *)IDToken
displayName:(NSString *)displayName
phoneVerificationInfo:
(FIRAuthProtoFinalizeMFAPhoneRequestInfo *)phoneVerificationInfo
requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration;

- (nullable instancetype)initWithIDToken:(NSString *)IDToken
displayName:(NSString *)displayName
verificationInfo:(FIRAuthProtoFinalizeMFAPhoneRequestInfo *)verificationInfo
TOTPVerificationInfo:
(FIRAuthProtoFinalizeMFATOTPEnrollmentRequestInfo *)TOTPVerificationInfo
requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration;

@end
Expand Down
34 changes: 28 additions & 6 deletions FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentRequest.m
View file
Expand Up @@ -16,6 +16,8 @@

#import "FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentRequest.h"

NS_ASSUME_NONNULL_BEGIN

static NSString *const kFinalizeMFAEnrollmentEndPoint = @"accounts/mfaEnrollment:finalize";

/** @var kTenantIDKey
Expand All @@ -27,7 +29,25 @@ @implementation FIRFinalizeMFAEnrollmentRequest

- (nullable instancetype)initWithIDToken:(NSString *)IDToken
displayName:(NSString *)displayName
verificationInfo:(FIRAuthProtoFinalizeMFAPhoneRequestInfo *)verificationInfo
phoneVerificationInfo:
(FIRAuthProtoFinalizeMFAPhoneRequestInfo *)phoneVerificationInfo
requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
self = [super initWithEndpoint:kFinalizeMFAEnrollmentEndPoint
requestConfiguration:requestConfiguration
useIdentityPlatform:YES
useStaging:NO];
if (self) {
_IDToken = IDToken;
_displayName = displayName;
_phoneVerificationInfo = phoneVerificationInfo;
}
return self;
}

- (nullable instancetype)initWithIDToken:(NSString *)IDToken
displayName:(NSString *)displayName
TOTPVerificationInfo:
(FIRAuthProtoFinalizeMFATOTPEnrollmentRequestInfo *)TOTPVerificationInfo
requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
self = [super initWithEndpoint:kFinalizeMFAEnrollmentEndPoint
requestConfiguration:requestConfiguration
Expand All @@ -36,7 +56,7 @@ - (nullable instancetype)initWithIDToken:(NSString *)IDToken
if (self) {
_IDToken = IDToken;
_displayName = displayName;
_verificationInfo = verificationInfo;
_TOTPVerificationInfo = TOTPVerificationInfo;
}
return self;
}
Expand All @@ -49,10 +69,10 @@ - (nullable id)unencodedHTTPRequestBodyWithError:(NSError *__autoreleasing _Null
if (_displayName) {
postBody[@"displayName"] = _displayName;
}
if (_verificationInfo) {
if ([_verificationInfo isKindOfClass:[FIRAuthProtoFinalizeMFAPhoneRequestInfo class]]) {
postBody[@"phoneVerificationInfo"] = [_verificationInfo dictionary];
}
if (_phoneVerificationInfo) {
postBody[@"phoneVerificationInfo"] = [_phoneVerificationInfo dictionary];
} else if (_TOTPVerificationInfo) {
postBody[@"totpVerificationInfo"] = [_TOTPVerificationInfo dictionary];
}
if (self.tenantID) {
postBody[kTenantIDKey] = self.tenantID;
Expand All @@ -61,3 +81,5 @@ - (nullable id)unencodedHTTPRequestBodyWithError:(NSError *__autoreleasing _Null
}

@end

NS_ASSUME_NONNULL_END
5 changes: 5 additions & 0 deletions FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentResponse.h
View file
Expand Up @@ -16,6 +16,7 @@

#import "FirebaseAuth/Sources/Backend/FIRAuthRPCResponse.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/Phone/FIRAuthProtoFinalizeMFAPhoneResponseInfo.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/TOTP/FIRAuthProtoFinalizeMFATOTPEnrollmentResponseInfo.h"

NS_ASSUME_NONNULL_BEGIN

Expand All @@ -24,6 +25,10 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, copy, readonly, nullable) NSString *IDToken;

@property(nonatomic, copy, readonly, nullable) NSString *refreshToken;
@property(nonatomic, copy, readonly, nullable)
FIRAuthProtoFinalizeMFAPhoneResponseInfo *phoneAuthInfo;
@property(nonatomic, copy, readonly, nullable)
FIRAuthProtoFinalizeMFATOTPEnrollmentResponseInfo *TOTPAuthInfo;

@end

Expand Down
10 changes: 9 additions & 1 deletion FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentResponse.m
View file
Expand Up @@ -15,15 +15,23 @@
*/

#import "FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRFinalizeMFAEnrollmentResponse.h"

#import "FirebaseAuth/Sources/Backend/RPC/Proto/Phone/FIRAuthProtoFinalizeMFAPhoneResponseInfo.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/TOTP/FIRAuthProtoFinalizeMFATOTPEnrollmentResponseInfo.h"

@implementation FIRFinalizeMFAEnrollmentResponse

- (BOOL)setWithDictionary:(nonnull NSDictionary *)dictionary
error:(NSError *__autoreleasing _Nullable *_Nullable)error {
_IDToken = [dictionary[@"idToken"] copy];
_refreshToken = [dictionary[@"refreshToken"] copy];
if (dictionary[@"phoneAuthInfo"] != nil) {
NSDictionary *data = dictionary[@"phoneAuthInfo"];
_phoneAuthInfo = [[FIRAuthProtoFinalizeMFAPhoneResponseInfo alloc] initWithDictionary:data];
} else if (dictionary[@"totpAuthInfo"] != nil) {
NSDictionary *data = dictionary[@"totpAuthInfo"];
_TOTPAuthInfo =
[[FIRAuthProtoFinalizeMFATOTPEnrollmentResponseInfo alloc] initWithDictionary:data];
}
return YES;
}

Expand Down
12 changes: 10 additions & 2 deletions FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentRequest.h
View file
Expand Up @@ -17,17 +17,25 @@
#import "FirebaseAuth/Sources/Backend/FIRAuthRPCRequest.h"
#import "FirebaseAuth/Sources/Backend/FIRIdentityToolkitRequest.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/Phone/FIRAuthProtoStartMFAPhoneRequestInfo.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/TOTP/FIRAuthProtoStartMFATOTPEnrollmentRequestInfo.h"

NS_ASSUME_NONNULL_BEGIN

@interface FIRStartMFAEnrollmentRequest : FIRIdentityToolkitRequest <FIRAuthRPCRequest>

@property(nonatomic, copy, readonly, nullable) NSString *IDToken;
@property(nonatomic, copy, readonly, nullable)
FIRAuthProtoStartMFAPhoneRequestInfo *phoneEnrollmentInfo;
@property(nonatomic, copy, readonly, nullable)
FIRAuthProtoStartMFATOTPEnrollmentRequestInfo *TOTPEnrollmentInfo;

@property(nonatomic, copy, readonly, nullable) FIRAuthProtoStartMFAPhoneRequestInfo *enrollmentInfo;
- (nullable instancetype)initWithIDToken:(NSString *)IDToken
enrollmentInfo:(FIRAuthProtoStartMFAPhoneRequestInfo *)phoneEnrollmentInfo
requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration;

- (nullable instancetype)initWithIDToken:(NSString *)IDToken
enrollmentInfo:(FIRAuthProtoStartMFAPhoneRequestInfo *)enrollmentInfo
TOTPEnrollmentInfo:
(FIRAuthProtoStartMFATOTPEnrollmentRequestInfo *)TOTPEnrollmentInfo
requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration;

@end
Expand Down
29 changes: 22 additions & 7 deletions FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentRequest.m
View file
Expand Up @@ -15,8 +15,8 @@
*/

#import "FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentRequest.h"

#import "FirebaseAuth/Sources/Backend/RPC/Proto/Phone/FIRAuthProtoStartMFAPhoneRequestInfo.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/TOTP/FIRAuthProtoStartMFATOTPEnrollmentRequestInfo.h"

static NSString *const kStartMFAEnrollmentEndPoint = @"accounts/mfaEnrollment:start";

Expand All @@ -28,15 +28,30 @@
@implementation FIRStartMFAEnrollmentRequest

- (nullable instancetype)initWithIDToken:(NSString *)IDToken
enrollmentInfo:(FIRAuthProtoStartMFAPhoneRequestInfo *)enrollmentInfo
enrollmentInfo:(FIRAuthProtoStartMFAPhoneRequestInfo *)phoneEnrollmentInfo
requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
self = [super initWithEndpoint:kStartMFAEnrollmentEndPoint
requestConfiguration:requestConfiguration
useIdentityPlatform:YES
useStaging:NO];
if (self) {
_IDToken = IDToken;
_phoneEnrollmentInfo = phoneEnrollmentInfo;
}
return self;
}

- (nullable instancetype)initWithIDToken:(NSString *)IDToken
TOTPEnrollmentInfo:
(FIRAuthProtoStartMFATOTPEnrollmentRequestInfo *)TOTPEnrollmentInfo
requestConfiguration:(FIRAuthRequestConfiguration *)requestConfiguration {
self = [super initWithEndpoint:kStartMFAEnrollmentEndPoint
requestConfiguration:requestConfiguration
useIdentityPlatform:YES
useStaging:NO];
if (self) {
_IDToken = IDToken;
_enrollmentInfo = enrollmentInfo;
_TOTPEnrollmentInfo = TOTPEnrollmentInfo;
}
return self;
}
Expand All @@ -46,10 +61,10 @@ - (nullable id)unencodedHTTPRequestBodyWithError:(NSError *__autoreleasing _Null
if (_IDToken) {
postBody[@"idToken"] = _IDToken;
}
if (_enrollmentInfo) {
if ([_enrollmentInfo isKindOfClass:[FIRAuthProtoStartMFAPhoneRequestInfo class]]) {
postBody[@"phoneEnrollmentInfo"] = [_enrollmentInfo dictionary];
}
if (_phoneEnrollmentInfo) {
postBody[@"phoneEnrollmentInfo"] = [_phoneEnrollmentInfo dictionary];
} else if (_TOTPEnrollmentInfo) {
postBody[@"totpEnrollmentInfo"] = [_TOTPEnrollmentInfo dictionary];
}
if (self.tenantID) {
postBody[kTenantIDKey] = self.tenantID;
Expand Down
6 changes: 4 additions & 2 deletions FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentResponse.h
View file
Expand Up @@ -16,13 +16,15 @@

#import "FirebaseAuth/Sources/Backend/FIRAuthRPCResponse.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/Phone/FIRAuthProtoStartMFAPhoneResponseInfo.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/TOTP/FIRAuthProtoStartMFATOTPEnrollmentResponseInfo.h"

NS_ASSUME_NONNULL_BEGIN

@interface FIRStartMFAEnrollmentResponse : NSObject <FIRAuthRPCResponse>

@property(nonatomic, copy, readonly, nullable)
FIRAuthProtoStartMFAPhoneResponseInfo *enrollmentResponse;
FIRAuthProtoStartMFAPhoneResponseInfo *phoneSessionInfo;
@property(nonatomic, copy, readonly, nullable)
FIRAuthProtoStartMFATOTPEnrollmentResponseInfo *TOTPSessionInfo;

@end

Expand Down
7 changes: 6 additions & 1 deletion FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentResponse.m
View file
Expand Up @@ -17,14 +17,19 @@
#import "FirebaseAuth/Sources/Backend/RPC/MultiFactor/Enroll/FIRStartMFAEnrollmentResponse.h"

#import "FirebaseAuth/Sources/Backend/RPC/Proto/Phone/FIRAuthProtoStartMFAPhoneResponseInfo.h"
#import "FirebaseAuth/Sources/Backend/RPC/Proto/TOTP/FIRAuthProtoStartMFATOTPEnrollmentResponseInfo.h"

@implementation FIRStartMFAEnrollmentResponse

- (BOOL)setWithDictionary:(nonnull NSDictionary *)dictionary
error:(NSError *__autoreleasing _Nullable *_Nullable)error {
if (dictionary[@"phoneSessionInfo"] != nil) {
NSDictionary *data = dictionary[@"phoneSessionInfo"];
_enrollmentResponse = [[FIRAuthProtoStartMFAPhoneResponseInfo alloc] initWithDictionary:data];
_phoneSessionInfo = [[FIRAuthProtoStartMFAPhoneResponseInfo alloc] initWithDictionary:data];
} else if (dictionary[@"totpSessionInfo"] != nil) {
NSDictionary *data = dictionary[@"totpSessionInfo"];
_TOTPSessionInfo =
[[FIRAuthProtoStartMFATOTPEnrollmentResponseInfo alloc] initWithDictionary:data];
} else {
return NO;
}
Expand Down

0 comments on commit 84f7dc4

Please sign in to comment.