Skip to content

Commit ecb4762

Browse files
russellwheatleyrussellwheatley
committed
revert: remove CI fixes that changed consumer integration
Restore the pull request to its prior SPM and test-app configuration.
1 parent 1da1636 commit ecb4762

41 files changed

Lines changed: 663 additions & 607 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/auth/ios/RNFBAuth/RNFBAuthHelper.h‎

Lines changed: 100 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848
reject:(RCTPromiseRejectBlock)reject;
4949

5050
+ (void)setAppVerificationDisabledForTesting:(NSString *)appName
51-
disabled:(BOOL)disabled
52-
resolve:(RCTPromiseResolveBlock)resolve
53-
reject:(RCTPromiseRejectBlock)reject;
51+
disabled:(BOOL)disabled
52+
resolve:(RCTPromiseResolveBlock)resolve
53+
reject:(RCTPromiseRejectBlock)reject;
5454

5555
+ (void)useUserAccessGroup:(NSString *)appName
56-
userAccessGroup:(NSString *)userAccessGroup
57-
resolve:(RCTPromiseResolveBlock)resolve
58-
reject:(RCTPromiseRejectBlock)reject;
56+
userAccessGroup:(NSString *)userAccessGroup
57+
resolve:(RCTPromiseResolveBlock)resolve
58+
reject:(RCTPromiseRejectBlock)reject;
5959

6060
+ (void)setLanguageCode:(NSString *)appName code:(NSString *)code;
6161

@@ -79,41 +79,41 @@
7979
reject:(RCTPromiseRejectBlock)reject;
8080

8181
+ (void)signInWithEmailAndPassword:(NSString *)appName
82-
email:(NSString *)email
83-
password:(NSString *)password
84-
resolve:(RCTPromiseResolveBlock)resolve
85-
reject:(RCTPromiseRejectBlock)reject;
82+
email:(NSString *)email
83+
password:(NSString *)password
84+
resolve:(RCTPromiseResolveBlock)resolve
85+
reject:(RCTPromiseRejectBlock)reject;
8686

8787
+ (NSNumber *)isSignInWithEmailLink:(NSString *)appName emailLink:(NSString *)emailLink;
8888

8989
+ (void)signInWithEmailLink:(NSString *)appName
90-
email:(NSString *)email
91-
emailLink:(NSString *)emailLink
92-
resolve:(RCTPromiseResolveBlock)resolve
93-
reject:(RCTPromiseRejectBlock)reject;
90+
email:(NSString *)email
91+
emailLink:(NSString *)emailLink
92+
resolve:(RCTPromiseResolveBlock)resolve
93+
reject:(RCTPromiseRejectBlock)reject;
9494

9595
+ (void)createUserWithEmailAndPassword:(NSString *)appName
96-
email:(NSString *)email
97-
password:(NSString *)password
98-
resolve:(RCTPromiseResolveBlock)resolve
99-
reject:(RCTPromiseRejectBlock)reject;
96+
email:(NSString *)email
97+
password:(NSString *)password
98+
resolve:(RCTPromiseResolveBlock)resolve
99+
reject:(RCTPromiseRejectBlock)reject;
100100

101101
+ (void)signInWithCustomToken:(NSString *)appName
102-
customToken:(NSString *)customToken
103-
resolve:(RCTPromiseResolveBlock)resolve
104-
reject:(RCTPromiseRejectBlock)reject;
102+
customToken:(NSString *)customToken
103+
resolve:(RCTPromiseResolveBlock)resolve
104+
reject:(RCTPromiseRejectBlock)reject;
105105

106106
+ (void)signInWithCredential:(NSString *)appName
107-
provider:(NSString *)provider
108-
authToken:(NSString *)authToken
109-
authSecret:(NSString *)authSecret
110-
resolve:(RCTPromiseResolveBlock)resolve
111-
reject:(RCTPromiseRejectBlock)reject;
107+
provider:(NSString *)provider
108+
authToken:(NSString *)authToken
109+
authSecret:(NSString *)authSecret
110+
resolve:(RCTPromiseResolveBlock)resolve
111+
reject:(RCTPromiseRejectBlock)reject;
112112

113113
+ (void)signInWithProvider:(NSString *)appName
114-
provider:(NSDictionary *)provider
115-
resolve:(RCTPromiseResolveBlock)resolve
116-
reject:(RCTPromiseRejectBlock)reject;
114+
provider:(NSDictionary *)provider
115+
resolve:(RCTPromiseResolveBlock)resolve
116+
reject:(RCTPromiseRejectBlock)reject;
117117

118118
#pragma mark - Current user
119119

@@ -131,10 +131,10 @@
131131
reject:(RCTPromiseRejectBlock)reject;
132132

133133
+ (void)verifyBeforeUpdateEmail:(NSString *)appName
134-
email:(NSString *)email
135-
actionCodeSettings:(NSDictionary *)actionCodeSettings
136-
resolve:(RCTPromiseResolveBlock)resolve
137-
reject:(RCTPromiseRejectBlock)reject;
134+
email:(NSString *)email
135+
actionCodeSettings:(NSDictionary *)actionCodeSettings
136+
resolve:(RCTPromiseResolveBlock)resolve
137+
reject:(RCTPromiseRejectBlock)reject;
138138

139139
+ (void)updateEmail:(NSString *)appName
140140
email:(NSString *)email
@@ -202,98 +202,96 @@
202202
reject:(RCTPromiseRejectBlock)reject;
203203

204204
+ (void)fetchSignInMethodsForEmail:(NSString *)appName
205-
email:(NSString *)email
206-
resolve:(RCTPromiseResolveBlock)resolve
207-
reject:(RCTPromiseRejectBlock)reject;
205+
email:(NSString *)email
206+
resolve:(RCTPromiseResolveBlock)resolve
207+
reject:(RCTPromiseRejectBlock)reject;
208208

209209
#pragma mark - Action codes
210210

211211
+ (void)confirmPasswordReset:(NSString *)appName
212-
code:(NSString *)code
213-
newPassword:(NSString *)newPassword
214-
resolve:(RCTPromiseResolveBlock)resolve
215-
reject:(RCTPromiseRejectBlock)reject;
212+
code:(NSString *)code
213+
newPassword:(NSString *)newPassword
214+
resolve:(RCTPromiseResolveBlock)resolve
215+
reject:(RCTPromiseRejectBlock)reject;
216216

217217
+ (void)applyActionCode:(NSString *)appName
218-
code:(NSString *)code
219-
resolve:(RCTPromiseResolveBlock)resolve
220-
reject:(RCTPromiseRejectBlock)reject;
218+
code:(NSString *)code
219+
resolve:(RCTPromiseResolveBlock)resolve
220+
reject:(RCTPromiseRejectBlock)reject;
221221

222222
+ (void)checkActionCode:(NSString *)appName
223-
code:(NSString *)code
224-
resolve:(RCTPromiseResolveBlock)resolve
225-
reject:(RCTPromiseRejectBlock)reject;
223+
code:(NSString *)code
224+
resolve:(RCTPromiseResolveBlock)resolve
225+
reject:(RCTPromiseRejectBlock)reject;
226226

227227
+ (void)revokeToken:(NSString *)appName
228228
authorizationCode:(NSString *)authorizationCode
229229
resolve:(RCTPromiseResolveBlock)resolve
230230
reject:(RCTPromiseRejectBlock)reject;
231231

232232
+ (void)sendPasswordResetEmail:(NSString *)appName
233+
email:(NSString *)email
234+
actionCodeSettings:(NSDictionary *)actionCodeSettings
235+
resolve:(RCTPromiseResolveBlock)resolve
236+
reject:(RCTPromiseRejectBlock)reject;
237+
238+
+ (void)sendSignInLinkToEmail:(NSString *)appName
233239
email:(NSString *)email
234240
actionCodeSettings:(NSDictionary *)actionCodeSettings
235241
resolve:(RCTPromiseResolveBlock)resolve
236242
reject:(RCTPromiseRejectBlock)reject;
237243

238-
+ (void)sendSignInLinkToEmail:(NSString *)appName
239-
email:(NSString *)email
240-
actionCodeSettings:(NSDictionary *)actionCodeSettings
241-
resolve:(RCTPromiseResolveBlock)resolve
242-
reject:(RCTPromiseRejectBlock)reject;
243-
244244
+ (void)verifyPasswordResetCode:(NSString *)appName
245-
code:(NSString *)code
246-
resolve:(RCTPromiseResolveBlock)resolve
247-
reject:(RCTPromiseRejectBlock)reject;
245+
code:(NSString *)code
246+
resolve:(RCTPromiseResolveBlock)resolve
247+
reject:(RCTPromiseRejectBlock)reject;
248248

249249
#pragma mark - Phone auth / multi-factor (iOS only)
250250

251251
#if TARGET_OS_IOS
252252
+ (void)signInWithPhoneNumber:(NSString *)appName
253-
phoneNumber:(NSString *)phoneNumber
254-
forceResend:(BOOL)forceResend
255-
resolve:(RCTPromiseResolveBlock)resolve
256-
reject:(RCTPromiseRejectBlock)reject;
253+
phoneNumber:(NSString *)phoneNumber
254+
forceResend:(BOOL)forceResend
255+
resolve:(RCTPromiseResolveBlock)resolve
256+
reject:(RCTPromiseRejectBlock)reject;
257257

258258
+ (void)verifyPhoneNumberWithMultiFactorInfo:(NSString *)appName
259-
hintUid:(NSString *)hintUid
260-
sessionKey:(NSString *)sessionKey
261-
resolve:(RCTPromiseResolveBlock)resolve
262-
reject:(RCTPromiseRejectBlock)reject;
259+
hintUid:(NSString *)hintUid
260+
sessionKey:(NSString *)sessionKey
261+
resolve:(RCTPromiseResolveBlock)resolve
262+
reject:(RCTPromiseRejectBlock)reject;
263263

264264
+ (void)verifyPhoneNumberForMultiFactor:(NSString *)appName
265-
phoneNumber:(NSString *)phoneNumber
266-
sessionKey:(NSString *)sessionKey
267-
resolve:(RCTPromiseResolveBlock)resolve
268-
reject:(RCTPromiseRejectBlock)reject;
265+
phoneNumber:(NSString *)phoneNumber
266+
sessionKey:(NSString *)sessionKey
267+
resolve:(RCTPromiseResolveBlock)resolve
268+
reject:(RCTPromiseRejectBlock)reject;
269269

270270
+ (void)resolveMultiFactorSignIn:(NSString *)appName
271-
session:(NSString *)session
272-
verificationId:(NSString *)verificationId
273-
verificationCode:(NSString *)verificationCode
274-
resolve:(RCTPromiseResolveBlock)resolve
275-
reject:(RCTPromiseRejectBlock)reject;
271+
session:(NSString *)session
272+
verificationId:(NSString *)verificationId
273+
verificationCode:(NSString *)verificationCode
274+
resolve:(RCTPromiseResolveBlock)resolve
275+
reject:(RCTPromiseRejectBlock)reject;
276276

277277
+ (void)resolveTotpSignIn:(NSString *)appName
278-
sessionKey:(NSString *)sessionKey
279-
uid:(NSString *)uid
280-
oneTimePassword:(NSString *)oneTimePassword
281-
resolve:(RCTPromiseResolveBlock)resolve
282-
reject:(RCTPromiseRejectBlock)reject;
283-
284-
+ (void)generateTotpSecret:(NSString *)appName
285278
sessionKey:(NSString *)sessionKey
279+
uid:(NSString *)uid
280+
oneTimePassword:(NSString *)oneTimePassword
286281
resolve:(RCTPromiseResolveBlock)resolve
287282
reject:(RCTPromiseRejectBlock)reject;
288283

284+
+ (void)generateTotpSecret:(NSString *)appName
285+
sessionKey:(NSString *)sessionKey
286+
resolve:(RCTPromiseResolveBlock)resolve
287+
reject:(RCTPromiseRejectBlock)reject;
288+
289289
+ (NSString *)generateQrCodeUrl:(NSString *)appName
290-
secretKey:(NSString *)secretKey
291-
account:(NSString *)account
292-
issuer:(NSString *)issuer;
290+
secretKey:(NSString *)secretKey
291+
account:(NSString *)account
292+
issuer:(NSString *)issuer;
293293

294-
+ (void)openInOtpApp:(NSString *)appName
295-
secretKey:(NSString *)secretKey
296-
qrCodeUri:(NSString *)qrCodeUri;
294+
+ (void)openInOtpApp:(NSString *)appName secretKey:(NSString *)secretKey qrCodeUri:(NSString *)qrCodeUri;
297295

298296
+ (void)getSession:(NSString *)appName
299297
resolve:(RCTPromiseResolveBlock)resolve
@@ -305,29 +303,29 @@
305303
reject:(RCTPromiseRejectBlock)reject;
306304

307305
+ (void)finalizeMultiFactorEnrollment:(NSString *)appName
308-
verificationId:(NSString *)verificationId
309-
verificationCode:(NSString *)verificationCode
310-
displayName:(NSString *_Nullable)displayName
311-
resolve:(RCTPromiseResolveBlock)resolve
312-
reject:(RCTPromiseRejectBlock)reject;
306+
verificationId:(NSString *)verificationId
307+
verificationCode:(NSString *)verificationCode
308+
displayName:(NSString *_Nullable)displayName
309+
resolve:(RCTPromiseResolveBlock)resolve
310+
reject:(RCTPromiseRejectBlock)reject;
313311

314312
+ (void)finalizeTotpEnrollment:(NSString *)appName
315-
totpSecret:(NSString *)totpSecret
316-
verificationCode:(NSString *)verificationCode
317-
displayName:(NSString *_Nullable)displayName
318-
resolve:(RCTPromiseResolveBlock)resolve
319-
reject:(RCTPromiseRejectBlock)reject;
313+
totpSecret:(NSString *)totpSecret
314+
verificationCode:(NSString *)verificationCode
315+
displayName:(NSString *_Nullable)displayName
316+
resolve:(RCTPromiseResolveBlock)resolve
317+
reject:(RCTPromiseRejectBlock)reject;
320318

321319
+ (void)verifyPhoneNumber:(NSString *)appName
322-
phoneNumber:(NSString *)phoneNumber
323-
requestKey:(NSString *)requestKey
324-
timeout:(double)timeout
325-
forceResend:(BOOL)forceResend;
320+
phoneNumber:(NSString *)phoneNumber
321+
requestKey:(NSString *)requestKey
322+
timeout:(double)timeout
323+
forceResend:(BOOL)forceResend;
326324

327325
+ (void)confirmationResultConfirm:(NSString *)appName
328-
verificationCode:(NSString *)verificationCode
329-
resolve:(RCTPromiseResolveBlock)resolve
330-
reject:(RCTPromiseRejectBlock)reject;
326+
verificationCode:(NSString *)verificationCode
327+
resolve:(RCTPromiseResolveBlock)resolve
328+
reject:(RCTPromiseRejectBlock)reject;
331329
#endif
332330

333331
#pragma mark - Constants

0 commit comments

Comments
 (0)