Skip to content

Auth rewrite #1254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
DellaBitta wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

Auth rewrite #1254

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3b736ad
initial Auth deprecations
DellaBitta Mar 10, 2023
86cc5bd
all three platforms build
DellaBitta Mar 10, 2023
e7ad4aa
FirebaseAuth.java and auth_test.cc fixes
DellaBitta Mar 12, 2023
16ec678
format
DellaBitta Mar 12, 2023
323d41d
bundle identifer
DellaBitta Mar 13, 2023
b247244
removed explicit from CurrentUserBlockListener constructor
DellaBitta Mar 13, 2023
c208b23
iOS support for multiple User objects (#1242)
DellaBitta Mar 19, 2023
3116021
Android compiles
DellaBitta Mar 23, 2023
166f0a7
Android builds and runs
DellaBitta Mar 24, 2023
ab8098b
Mutex locking on most user actions
DellaBitta Mar 26, 2023
093052b
standardized future creation and future impl naming
DellaBitta Mar 27, 2023
eac0334
moved error string to common implementation.
DellaBitta Mar 27, 2023
78a0702
removed env from SetUserImpl
DellaBitta Mar 27, 2023
0fd6f7b
Android Auth Google I/O rework (#1245)
DellaBitta Mar 27, 2023
116923a
merge from feature branch
DellaBitta Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions auth/src/android/auth_android.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ void Auth::DestroyPlatformAuth(AuthData* auth_data) {
// Auth methods which return User pointer.
SetImplFromLocalRef(env, nullptr,
&auth_data->deprecated_fields.android_user_impl);
SetUserImpl(env, auth_data, nullptr);
SetUserImpl(auth_data, nullptr);

auth_data->deprecated_fields.user_internal_deprecated = nullptr;

Expand Down Expand Up @@ -653,7 +653,7 @@ void Auth::SignOut() {
MutexLock lock(auth_data_->future_impl.mutex());
SetImplFromLocalRef(env, nullptr,
&auth_data_->deprecated_fields.android_user_impl);
SetUserImpl(env, auth_data_, nullptr);
SetUserImpl(auth_data_, nullptr);
}

Future<void> Auth::SendPasswordResetEmail(const char* email) {
Expand Down
4 changes: 2 additions & 2 deletions auth/src/android/common_android.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ void ReadSignInResult(jobject result, FutureCallbackData<SignInResult>* d,
// Auth class has not been updated at this point.
SetImplFromLocalRef(env, j_user,
&d->auth_data->deprecated_fields.android_user_impl);
SetUserImpl(env, d->auth_data,
SetUserImpl(d->auth_data,
static_cast<jobject>(
d->auth_data->deprecated_fields.android_user_impl));

Expand Down Expand Up @@ -527,7 +527,7 @@ void ReadUserFromSignInResult(jobject result, FutureCallbackData<User*>* d,
// Auth class has not been updated at this point.
SetImplFromLocalRef(env, j_user,
&d->auth_data->deprecated_fields.android_user_impl);
SetUserImpl(env, d->auth_data,
SetUserImpl(d->auth_data,
static_cast<jobject>(
d->auth_data->deprecated_fields.android_user_impl));
}
Expand Down
3 changes: 1 addition & 2 deletions auth/src/android/common_android.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,7 @@ void UpdateCurrentUser(JNIEnv* env, AuthData* auth_data);
/// Note: this function is only used to support DEPRECATED methods which return
/// User*. This functionality should be removed when those deprecated methods
/// are removed.
inline void SetUserImpl(JNIEnv* env, AuthData* _Nonnull auth_data,
jobject j_user) {
inline void SetUserImpl(AuthData* _Nonnull auth_data, jobject j_user) {
assert(auth_data->deprecated_fields.user_internal_deprecated);
auth_data->deprecated_fields.user_internal_deprecated
->set_native_user_object_deprecated(j_user);
Expand Down