Skip to content

Commit 637a4fa

Browse files
James BatemanJames Bateman
James Bateman
authored and
James Bateman
committed
Initial implementation of Totp and unenroll
1 parent 7eaaf18 commit 637a4fa

File tree

8 files changed

+420
-19
lines changed

8 files changed

+420
-19
lines changed

‎packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@
6464
import com.google.firebase.auth.PhoneAuthOptions;
6565
import com.google.firebase.auth.PhoneAuthProvider;
6666
import com.google.firebase.auth.PhoneMultiFactorAssertion;
67+
import com.google.firebase.auth.TotpMultiFactorAssertion;
68+
import com.google.firebase.auth.TotpMultiFactorGenerator;
6769
import com.google.firebase.auth.PhoneMultiFactorGenerator;
6870
import com.google.firebase.auth.PhoneMultiFactorInfo;
71+
import com.google.firebase.auth.TotpSecret;
6972
import com.google.firebase.auth.TwitterAuthProvider;
7073
import com.google.firebase.auth.UserInfo;
7174
import com.google.firebase.auth.UserProfileChangeRequest;
@@ -107,6 +110,7 @@ class ReactNativeFirebaseAuthModule extends ReactNativeFirebaseModule {
107110

108111
private final HashMap<String, MultiFactorResolver> mCachedResolvers = new HashMap<>();
109112
private final HashMap<String, MultiFactorSession> mMultiFactorSessions = new HashMap<>();
113+
private final HashMap<String, TotpSecret> mTotpSecrets = new HashMap<>();
110114

111115
// storage for anonymous phone auth credentials, used for linkWithCredentials
112116
// https://github.com/invertase/react-native-firebase/issues/4911
@@ -154,6 +158,7 @@ public void invalidate() {
154158

155159
mCachedResolvers.clear();
156160
mMultiFactorSessions.clear();
161+
mTotpSecrets.clear();
157162
}
158163

159164
@ReactMethod
@@ -1130,6 +1135,29 @@ public void getSession(final String appName, final Promise promise) {
11301135
});
11311136
}
11321137

1138+
@ReactMethod
1139+
public void unenrollMultiFactor(
1140+
final String appName,
1141+
final String factorUID,
1142+
final Promise promise) {
1143+
FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
1144+
FirebaseAuth firebaseAuth = FirebaseAuth.getInstance(firebaseApp);
1145+
firebaseAuth
1146+
.getCurrentUser()
1147+
.getMultiFactor()
1148+
.unenroll(factorUID)
1149+
.addOnCompleteListener(
1150+
task -> {
1151+
if (!task.isSuccessful()) {
1152+
rejectPromiseWithExceptionMap(promise, task.getException());
1153+
return;
1154+
}
1155+
1156+
promise.resolve(null);
1157+
});
1158+
1159+
}
1160+
11331161
@ReactMethod
11341162
public void verifyPhoneNumberWithMultiFactorInfo(
11351163
final String appName, final String hintUid, final String sessionKey, final Promise promise) {
@@ -1280,6 +1308,42 @@ public void finalizeMultiFactorEnrollment(
12801308
});
12811309
}
12821310

1311+
@ReactMethod
1312+
public void finalizeTotpEnrollment(
1313+
final String appName,
1314+
final String totpSecret,
1315+
final String verificationCode,
1316+
@Nullable final String displayName,
1317+
final Promise promise) {
1318+
1319+
TotpSecret secret = mTotpSecrets.get(totpSecret);
1320+
if (secret == null) {
1321+
rejectPromiseWithCodeAndMessage(
1322+
promise, "invalid-multi-factor-secret", "can't find secret for provided key");
1323+
return;
1324+
}
1325+
1326+
TotpMultiFactorAssertion assertion =
1327+
TotpMultiFactorGenerator.getAssertionForEnrollment(secret, verificationCode);
1328+
1329+
FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
1330+
FirebaseAuth firebaseAuth = FirebaseAuth.getInstance(firebaseApp);
1331+
1332+
firebaseAuth
1333+
.getCurrentUser()
1334+
.getMultiFactor()
1335+
.enroll(assertion, displayName)
1336+
.addOnCompleteListener(
1337+
task -> {
1338+
if (!task.isSuccessful()) {
1339+
rejectPromiseWithExceptionMap(promise, task.getException());
1340+
return;
1341+
}
1342+
1343+
promise.resolve(null);
1344+
});
1345+
}
1346+
12831347
/**
12841348
* This method is intended to resolve a {@link PhoneAuthCredential} obtained through a
12851349
* multi-factor authentication flow. A credential can either be obtained using:
@@ -1335,6 +1399,73 @@ public void resolveMultiFactorSignIn(
13351399
resolveMultiFactorCredential(credential, session, promise);
13361400
}
13371401

1402+
@ReactMethod
1403+
public void resolveTotpSignIn(
1404+
final String appName,
1405+
final String sessionKey,
1406+
final String uid,
1407+
final String oneTimePassword,
1408+
final Promise promise) {
1409+
1410+
final MultiFactorAssertion assertion =
1411+
TotpMultiFactorGenerator.getAssertionForSignIn(uid, oneTimePassword);
1412+
1413+
final MultiFactorResolver resolver = mCachedResolvers.get(sessionKey);
1414+
if (resolver == null) {
1415+
// See https://firebase.google.com/docs/reference/node/firebase.auth.multifactorresolver for
1416+
// the error code
1417+
rejectPromiseWithCodeAndMessage(
1418+
promise,
1419+
"invalid-multi-factor-session",
1420+
"No resolver for session found. Is the session id correct?");
1421+
return;
1422+
}
1423+
1424+
1425+
resolver
1426+
.resolveSignIn(assertion)
1427+
.addOnCompleteListener(
1428+
task -> {
1429+
if (task.isSuccessful()) {
1430+
AuthResult authResult = task.getResult();
1431+
promiseWithAuthResult(authResult, promise);
1432+
} else {
1433+
promiseRejectAuthException(promise, task.getException());
1434+
}
1435+
});
1436+
1437+
}
1438+
1439+
@ReactMethod
1440+
public void generateTotpSecret(
1441+
final String appName,
1442+
final String sessionKey,
1443+
final Promise promise) {
1444+
1445+
final MultiFactorSession session = mMultiFactorSessions.get(sessionKey);
1446+
if (session == null) {
1447+
rejectPromiseWithCodeAndMessage(
1448+
promise,
1449+
"invalid-multi-factor-session",
1450+
"No resolver for session found. Is the session id correct?");
1451+
return;
1452+
}
1453+
1454+
TotpMultiFactorGenerator
1455+
.generateSecret(session)
1456+
.addOnCompleteListener(
1457+
task -> {
1458+
if (task.isSuccessful()) {
1459+
TotpSecret totpSecret = task.getResult();
1460+
WritableMap result = Arguments.createMap();
1461+
result.putString("secretKey", totpSecret.getSharedSecretKey());
1462+
promise.resolve(result);
1463+
} else {
1464+
promiseRejectAuthException(promise, task.getException());
1465+
}
1466+
});
1467+
}
1468+
13381469
@ReactMethod
13391470
public void confirmationResultConfirm(
13401471
String appName, final String verificationCode, final Promise promise) {

‎packages/auth/ios/RNFBAuth/RNFBAuthModule.m‎

Lines changed: 130 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
#if TARGET_OS_IOS
6060
static __strong NSMutableDictionary<NSString *, FIRMultiFactorResolver *> *cachedResolver;
6161
static __strong NSMutableDictionary<NSString *, FIRMultiFactorSession *> *cachedSessions;
62+
static __strong NSMutableDictionary<NSString *, FIRTOTPSecret *> *cachedTotpSecrets;
6263
#endif
6364

6465
@implementation RNFBAuthModule
@@ -82,6 +83,7 @@ - (id)init {
8283
#if TARGET_OS_IOS
8384
cachedResolver = [[NSMutableDictionary alloc] init];
8485
cachedSessions = [[NSMutableDictionary alloc] init];
86+
cachedTotpSecrets = [[NSMutableDictionary alloc] init];
8587
#endif
8688
});
8789
return self;
@@ -111,6 +113,7 @@ - (void)invalidate {
111113
#if TARGET_OS_IOS
112114
[cachedResolver removeAllObjects];
113115
[cachedSessions removeAllObjects];
116+
[cachedTotpSecrets removeAllObjects];
114117
#endif
115118
}
116119

@@ -968,6 +971,61 @@ - (void)invalidate {
968971
}];
969972
}
970973

974+
RCT_EXPORT_METHOD(resolveTotpSignIn
975+
: (FIRApp *)firebaseApp
976+
: (NSString *)sessionKey
977+
: (NSString *)uid
978+
: (NSString *)oneTimePassword
979+
: (RCTPromiseResolveBlock)resolve
980+
: (RCTPromiseRejectBlock)reject) {
981+
DLog(@"using instance resolve TotpSignIn: %@", firebaseApp.name);
982+
983+
FIRMultiFactorAssertion *assertion =
984+
[FIRTOTPMultiFactorGenerator assertionForSignInWithEnrollmentID:uid oneTimePassword:oneTimePassword];
985+
[cachedResolver[sessionKey] resolveSignInWithAssertion:assertion
986+
completion:^(FIRAuthDataResult *_Nullable authResult,
987+
NSError *_Nullable error) {
988+
DLog(@"authError: %@", error) if (error) {
989+
[self promiseRejectAuthException:reject
990+
error:error];
991+
}
992+
else {
993+
[self promiseWithAuthResult:resolve
994+
rejecter:reject
995+
authResult:authResult];
996+
}
997+
}];
998+
}
999+
1000+
RCT_EXPORT_METHOD(generateTotpSecret
1001+
: (FIRApp *)firebaseApp
1002+
: (NSString *)sessionKey
1003+
: (RCTPromiseResolveBlock)resolve
1004+
: (RCTPromiseRejectBlock)reject) {
1005+
DLog(@"using instance resolve generateTotpSecret: %@", firebaseApp.name);
1006+
1007+
FIRMultiFactorSession *session = cachedSessions[sessionKey];
1008+
DLog(@"using sessionKey: %@", sessionKey);
1009+
DLog(@"using session: %@", session);
1010+
[FIRTOTPMultiFactorGenerator generateSecretWithMultiFactorSession:session
1011+
completion:^(FIRTOTPSecret * _Nullable totpSecret, NSError * _Nullable error) {
1012+
DLog(@"authError: %@", error) if (error) {
1013+
[self promiseRejectAuthException:reject
1014+
error:error];
1015+
}
1016+
else {
1017+
NSString *secretKey = totpSecret.sharedSecretKey;
1018+
DLog(@"secretKey generated: %@", secretKey);
1019+
cachedTotpSecrets[secretKey] = totpSecret;
1020+
DLog(@"cachedSecret: %@", cachedTotpSecrets[secretKey]);
1021+
resolve(@{
1022+
@"secretKey": secretKey,
1023+
});
1024+
}
1025+
}];
1026+
1027+
}
1028+
9711029
RCT_EXPORT_METHOD(getSession
9721030
: (FIRApp *)firebaseApp
9731031
: (RCTPromiseResolveBlock)resolve
@@ -986,6 +1044,26 @@ - (void)invalidate {
9861044
}];
9871045
}
9881046

1047+
RCT_EXPORT_METHOD(unenrollMultiFactor
1048+
: (FIRApp *)firebaseApp
1049+
: (NSString *)factorUID
1050+
: (RCTPromiseResolveBlock)resolve
1051+
: (RCTPromiseRejectBlock)reject) {
1052+
DLog(@"using instance unenrollMultiFactor: %@", firebaseApp.name);
1053+
1054+
FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
1055+
[user.multiFactor unenrollWithFactorUID:factorUID completion:^(NSError * _Nullable error) {
1056+
if (error != nil) {
1057+
[self promiseRejectAuthException:reject error:error];
1058+
return;
1059+
}
1060+
1061+
resolve(nil);
1062+
return;
1063+
}];
1064+
1065+
}
1066+
9891067
RCT_EXPORT_METHOD(finalizeMultiFactorEnrollment
9901068
: (FIRApp *)firebaseApp
9911069
: (NSString *)verificationId
@@ -1015,6 +1093,35 @@ - (void)invalidate {
10151093
}];
10161094
}
10171095

1096+
RCT_EXPORT_METHOD(finalizeTotpEnrollment
1097+
: (FIRApp *)firebaseApp
1098+
: (NSString *)totpSecret
1099+
: (NSString *)verificationCode
1100+
: (NSString *_Nullable)displayName
1101+
: (RCTPromiseResolveBlock)resolve
1102+
: (RCTPromiseRejectBlock)reject) {
1103+
DLog(@"using instance finalizeTotpEnrollment: %@", firebaseApp.name);
1104+
1105+
FIRTOTPSecret *cachedTotpSecret = cachedTotpSecrets[totpSecret];
1106+
DLog(@"using totpSecretKey: %@", totpSecret);
1107+
DLog(@"using cachedSecret: %@", cachedTotpSecret);
1108+
FIRTOTPMultiFactorAssertion *assertion =
1109+
[FIRTOTPMultiFactorGenerator assertionForEnrollmentWithSecret:cachedTotpSecret oneTimePassword:verificationCode];
1110+
1111+
FIRUser *user = [FIRAuth authWithApp:firebaseApp].currentUser;
1112+
1113+
[user.multiFactor enrollWithAssertion:assertion displayName:displayName completion:^(NSError * _Nullable error) {
1114+
if (error != nil) {
1115+
[self promiseRejectAuthException:reject error:error];
1116+
return;
1117+
}
1118+
1119+
resolve(nil);
1120+
return;
1121+
}];
1122+
1123+
}
1124+
10181125
RCT_EXPORT_METHOD(verifyPhoneNumber
10191126
: (FIRApp *)firebaseApp
10201127
: (NSString *)phoneNumber
@@ -1739,18 +1846,29 @@ - (NSDictionary *)firebaseUserToDict:(FIRUser *)user {
17391846
NSMutableArray *enrolledFactors = [NSMutableArray array];
17401847

17411848
for (FIRPhoneMultiFactorInfo *hint in hints) {
1742-
NSString *enrollmentTime =
1743-
[[[NSISO8601DateFormatter alloc] init] stringFromDate:hint.enrollmentDate];
1744-
[enrolledFactors addObject:@{
1745-
@"uid" : hint.UID,
1746-
@"factorId" : [self getJSFactorId:(hint.factorID)],
1747-
@"displayName" : hint.displayName == nil ? [NSNull null] : hint.displayName,
1748-
@"enrollmentTime" : enrollmentTime,
1749-
// @deprecated enrollmentDate kept for backwards compatibility, please use enrollmentTime
1750-
@"enrollmentDate" : enrollmentTime,
1751-
// phoneNumber only present on FIRPhoneMultiFactorInfo
1752-
@"phoneNumber" : hint.phoneNumber == nil ? [NSNull null] : hint.phoneNumber,
1753-
}];
1849+
NSString *enrollmentTime =
1850+
[[[NSISO8601DateFormatter alloc] init] stringFromDate:hint.enrollmentDate];
1851+
if ([hint.factorID isEqualToString:@"phone"]) {
1852+
[enrolledFactors addObject:@{
1853+
@"uid" : hint.UID,
1854+
@"factorId" : [self getJSFactorId:(hint.factorID)],
1855+
@"displayName" : hint.displayName == nil ? [NSNull null] : hint.displayName,
1856+
@"enrollmentTime" : enrollmentTime,
1857+
// @deprecated enrollmentDate kept for backwards compatibility, please use enrollmentTime
1858+
@"enrollmentDate" : enrollmentTime,
1859+
// phoneNumber only present on FIRPhoneMultiFactorInfo
1860+
@"phoneNumber" : hint.phoneNumber == nil ? [NSNull null] : hint.phoneNumber,
1861+
}];
1862+
} else if ([hint.factorID isEqualToString:@"totp"]) {
1863+
[enrolledFactors addObject:@{
1864+
@"uid" : hint.UID,
1865+
@"factorId" : @"totp",
1866+
@"displayName" : hint.displayName == nil ? [NSNull null] : hint.displayName,
1867+
@"enrollmentTime" : enrollmentTime,
1868+
// @deprecated enrollmentDate kept for backwards compatibility, please use enrollmentTime
1869+
@"enrollmentDate" : enrollmentTime,
1870+
}];
1871+
}
17541872
}
17551873
return enrolledFactors;
17561874
}

‎packages/auth/lib/MultiFactorResolver.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@ export default class MultiFactorResolver {
99
}
1010

1111
resolveSignIn(assertion) {
12-
const { token, secret } = assertion;
13-
return this._auth.resolveMultiFactorSignIn(this.session, token, secret);
12+
const { token, secret, uid, verificationCode } = assertion;
13+
14+
if (token && secret) {
15+
return this._auth.resolveMultiFactorSignIn(this.session, token, secret);
16+
}
17+
18+
return this._auth.resolveTotpSignIn(this.session, uid, verificationCode);
1419
}
1520
}

0 commit comments

Comments
 (0)