Skip to content

Commit 59236f1

Browse files
abeisgoatabeisgoat
committed
Adds FirebaseLoginError
1 parent 202e400 commit 59236f1

File tree

10 files changed

+41
-48
lines changed

10 files changed

+41
-48
lines changed

‎app/src/main/java/com/firebase/uidemo/RecyclerViewDemoActivity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.firebase.client.Query;
2323
import com.firebase.ui.auth.core.FirebaseLoginBaseActivity;
2424
import com.firebase.ui.FirebaseRecyclerViewAdapter;
25+
import com.firebase.ui.auth.core.FirebaseLoginError;
2526

2627
public class RecyclerViewDemoActivity extends FirebaseLoginBaseActivity {
2728

@@ -147,12 +148,12 @@ public void onFirebaseLogout() {
147148
}
148149

149150
@Override
150-
public void onFirebaseLoginProviderError(FirebaseError firebaseError) {
151+
public void onFirebaseLoginProviderError(FirebaseLoginError firebaseError) {
151152
Log.i(TAG, "Login provider error: " + firebaseError.toString());
152153
}
153154

154155
@Override
155-
public void onFirebaseLoginUserError(FirebaseError firebaseError) {
156+
public void onFirebaseLoginUserError(FirebaseLoginError firebaseError) {
156157
Log.i(TAG, "Login user error: " + firebaseError.toString());
157158
}
158159

‎library/src/main/java/com/firebase/ui/auth/core/FirebaseAuthHelper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ private void authenticateRefWithOAuthFirebasetoken(FirebaseOAuthToken token, fin
2929
Firebase.AuthResultHandler authResultHandler = new Firebase.AuthResultHandler() {
3030
@Override
3131
public void onAuthenticated(AuthData authData) {
32-
Log.d("Helper", "GO GO GO");
3332
handler.onSuccess(authData);
3433
}
3534

3635
@Override
3736
public void onAuthenticationError(FirebaseError firebaseError) {
38-
handler.onProviderError(new FirebaseError(0, "Make sure " + getProviderName() + " login is enabled and configured in your Firebase."));
37+
handler.onProviderError(new FirebaseLoginError(FirebaseErrors.PROVIDER_NOT_ENABLED, "Make sure " + getProviderName() + " login is enabled and configured in your Firebase."));
3938
}
4039
};
4140

‎library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginBaseActivity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public abstract class FirebaseLoginBaseActivity extends AppCompatActivity {
3333

3434
protected abstract void onFirebaseLogout();
3535

36-
protected abstract void onFirebaseLoginProviderError(FirebaseError firebaseError);
36+
protected abstract void onFirebaseLoginProviderError(FirebaseLoginError firebaseError);
3737

38-
protected abstract void onFirebaseLoginUserError(FirebaseError firebaseError);
38+
protected abstract void onFirebaseLoginUserError(FirebaseLoginError firebaseError);
3939

4040
/**
4141
* Subclasses of this activity must implement this method and return a valid Firebase reference that
@@ -104,12 +104,12 @@ public void onSuccess(AuthData data) {
104104
}
105105

106106
@Override
107-
public void onUserError(FirebaseError err) {
107+
public void onUserError(FirebaseLoginError err) {
108108
onFirebaseLoginUserError(err);
109109
}
110110

111111
@Override
112-
public void onProviderError(FirebaseError err) {
112+
public void onProviderError(FirebaseLoginError err) {
113113
onFirebaseLoginProviderError(err);
114114
}
115115
};

‎library/src/main/java/com/firebase/ui/auth/core/FirebaseLoginDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ public void onSuccess(AuthData auth) {
9797
}
9898

9999
@Override
100-
public void onUserError(FirebaseError err) {
100+
public void onUserError(FirebaseLoginError err) {
101101
handler.onUserError(err);
102102
}
103103

104104
@Override
105-
public void onProviderError(FirebaseError err) {
105+
public void onProviderError(FirebaseLoginError err) {
106106
handler.onProviderError(err);
107107
}
108108
};

‎library/src/main/java/com/firebase/ui/auth/core/FirebaseStatuses.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎library/src/main/java/com/firebase/ui/auth/core/TokenAuthHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
public interface TokenAuthHandler {
77
void onSuccess(AuthData auth);
8-
void onUserError(FirebaseError err);
9-
void onProviderError(FirebaseError err);
8+
void onUserError(FirebaseLoginError err);
9+
void onProviderError(FirebaseLoginError err);
1010
}

‎library/src/main/java/com/firebase/ui/auth/facebook/FacebookAuthHelper.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
import com.facebook.login.LoginManager;
1515
import com.facebook.login.LoginResult;
1616
import com.firebase.client.Firebase;
17-
import com.firebase.client.FirebaseError;
1817
import com.firebase.ui.auth.core.FirebaseAuthHelper;
18+
import com.firebase.ui.auth.core.FirebaseErrors;
19+
import com.firebase.ui.auth.core.FirebaseLoginError;
1920
import com.firebase.ui.auth.core.FirebaseOAuthToken;
20-
import com.firebase.ui.auth.core.FirebaseStatuses;
2121
import com.firebase.ui.auth.core.TokenAuthHandler;
2222

2323
import java.util.Arrays;
@@ -60,12 +60,12 @@ public void onSuccess(LoginResult loginResult) {
6060

6161
@Override
6262
public void onCancel() {
63-
mHandler.onUserError(new FirebaseError(0, "User closed login prompt."));
63+
mHandler.onUserError(new FirebaseLoginError(FirebaseErrors.LOGIN_CANCELLED, "User closed login dialog"));
6464
}
6565

6666
@Override
6767
public void onError(FacebookException ex) {
68-
mHandler.onProviderError(new FirebaseError(1, ex.toString()));
68+
mHandler.onProviderError(new FirebaseLoginError(FirebaseErrors.MISC_PROVIDER_ERROR, ex.toString()));
6969
}
7070
}
7171
);
@@ -80,12 +80,12 @@ public void onError(FacebookException ex) {
8080
} catch (NullPointerException e) {}
8181

8282
if (facebookAppId == null) {
83-
mHandler.onProviderError(new FirebaseError(FirebaseStatuses.PROVIDER_ERROR, "Invalid Facebook Application ID, is it set in your AndroidManifest.xml?"));
83+
mHandler.onProviderError(new FirebaseLoginError(FirebaseErrors.MISSING_PROVIDER_APP_ID, "Missing Facebook Application ID, is it set in your AndroidManifest.xml?"));
8484
return;
8585
}
8686

8787
if (facebookAppId.compareTo("") == 0) {
88-
mHandler.onProviderError(new FirebaseError(FirebaseStatuses.PROVIDER_ERROR, "Invalid Facebook Application ID, is it set in your res/values/strings.xml?"));
88+
mHandler.onProviderError(new FirebaseLoginError(FirebaseErrors.INVALID_PROVIDER_APP_ID, "Invalid Facebook Application ID, is it set in your res/values/strings.xml?"));
8989
return;
9090
}
9191

‎library/src/main/java/com/firebase/ui/auth/password/PasswordAuthHelper.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import com.firebase.client.Firebase;
88
import com.firebase.client.FirebaseError;
99
import com.firebase.ui.auth.core.FirebaseAuthHelper;
10+
import com.firebase.ui.auth.core.FirebaseErrors;
11+
import com.firebase.ui.auth.core.FirebaseLoginError;
1012
import com.firebase.ui.auth.core.TokenAuthHandler;
1113

1214
public class PasswordAuthHelper extends FirebaseAuthHelper {
@@ -33,7 +35,7 @@ public void onAuthenticated(AuthData authData) {
3335
}
3436
@Override
3537
public void onAuthenticationError(FirebaseError firebaseError) {
36-
mHandler.onUserError(firebaseError);
38+
mHandler.onUserError(new FirebaseLoginError(FirebaseErrors.MISC_PROVIDER_ERROR, firebaseError.toString()));
3739
}
3840
});
3941
}

‎library/src/main/java/com/firebase/ui/auth/twitter/TwitterAuthHelper.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
import android.content.Intent;
66

77
import com.firebase.client.Firebase;
8-
import com.firebase.client.FirebaseError;
98
import com.firebase.ui.auth.core.FirebaseAuthHelper;
9+
import com.firebase.ui.auth.core.FirebaseErrors;
10+
import com.firebase.ui.auth.core.FirebaseLoginError;
1011
import com.firebase.ui.auth.core.FirebaseOAuthToken;
11-
import com.firebase.ui.auth.core.FirebaseStatuses;
12+
import com.firebase.ui.auth.core.FirebaseActions;
1213
import com.firebase.ui.auth.core.TokenAuthHandler;
1314

1415
public class TwitterAuthHelper extends FirebaseAuthHelper {
@@ -27,7 +28,7 @@ public TwitterAuthHelper(Context context, Firebase ref, TokenAuthHandler handler
2728
}
2829

2930
public void login() {
30-
mActivity.startActivityForResult(new Intent(mActivity, TwitterPromptActivity.class), FirebaseStatuses.LOGIN);
31+
mActivity.startActivityForResult(new Intent(mActivity, TwitterPromptActivity.class), FirebaseActions.LOGIN);
3132
}
3233

3334
public void logout() {
@@ -38,17 +39,17 @@ public void logout() {
3839
public Firebase getFirebaseRef() { return mRef; }
3940

4041
public void onActivityResult(int requestCode, int resultCode, Intent data) {
41-
if (resultCode == FirebaseStatuses.SUCCESS) {
42+
if (resultCode == FirebaseActions.SUCCESS) {
4243
FirebaseOAuthToken token = new FirebaseOAuthToken(
4344
PROVIDER_NAME,
4445
data.getStringExtra("oauth_token"),
4546
data.getStringExtra("oauth_token_secret"),
4647
data.getStringExtra("user_id"));
4748
onFirebaseTokenReceived(token, mHandler);
48-
} else if (resultCode == FirebaseStatuses.USER_ERROR) {
49-
mHandler.onUserError(new FirebaseError(0, data.getStringExtra("error")));
50-
} else if (resultCode == FirebaseStatuses.PROVIDER_ERROR) {
51-
mHandler.onProviderError(new FirebaseError(0, data.getStringExtra("error")));
49+
} else if (resultCode == FirebaseActions.USER_ERROR) {
50+
mHandler.onUserError(new FirebaseLoginError(data.getIntExtra("code", 0), data.getStringExtra("error")));
51+
} else if (resultCode == FirebaseActions.PROVIDER_ERROR) {
52+
mHandler.onProviderError(new FirebaseLoginError(data.getIntExtra("code", 0), data.getStringExtra("error")));
5253
}
5354
}
5455
}

‎library/src/main/java/com/firebase/ui/auth/twitter/TwitterPromptActivity.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
import android.webkit.WebView;
1111
import android.webkit.WebViewClient;
1212

13-
import com.firebase.ui.auth.core.FirebaseStatuses;
13+
import com.firebase.ui.auth.core.FirebaseActions;
14+
import com.firebase.ui.auth.core.FirebaseErrors;
1415

1516
import twitter4j.Twitter;
1617
import twitter4j.TwitterException;
@@ -26,7 +27,7 @@ public class TwitterPromptActivity extends Activity {
2627

2728
@Override
2829
public void onBackPressed() {
29-
sendResultError(FirebaseStatuses.USER_ERROR, "User closed login prompt.");
30+
sendResultError(FirebaseActions.USER_ERROR, FirebaseErrors.LOGIN_CANCELLED, "User closed login prompt.");
3031
super.onBackPressed();
3132
}
3233

@@ -46,12 +47,12 @@ protected void onCreate(Bundle savedInstanceState) {
4647
} catch (NullPointerException e) {}
4748

4849
if (twitterKey == null || twitterSecret == null) {
49-
sendResultError(FirebaseStatuses.PROVIDER_ERROR, "Invalid Twitter key/secret, are they set in your AndroidManifest.xml?");
50+
sendResultError(FirebaseActions.PROVIDER_ERROR, FirebaseErrors.MISSING_PROVIDER_APP_KEY, "Missing Twitter key/secret, are they set in your AndroidManifest.xml?");
5051
return;
5152
}
5253

5354
if (twitterKey.compareTo("") == 0|| twitterSecret.compareTo("") == 0) {
54-
sendResultError(FirebaseStatuses.PROVIDER_ERROR, "Invalid Twitter key/secret, are they set in your res/values/strings.xml?");
55+
sendResultError(FirebaseActions.PROVIDER_ERROR, FirebaseErrors.INVALID_PROVIDER_APP_KEY, "Invalid Twitter key/secret, are they set in your res/values/strings.xml?");
5556
return;
5657
}
5758

@@ -75,7 +76,7 @@ protected RequestToken doInBackground(Void... params) {
7576
try {
7677
token = mTwitter.getOAuthRequestToken("oauth://cb");
7778
} catch (TwitterException te) {
78-
sendResultError(FirebaseStatuses.PROVIDER_ERROR, te.toString());
79+
sendResultError(FirebaseActions.PROVIDER_ERROR, FirebaseErrors.MISC_PROVIDER_ERROR, te.toString());
7980
}
8081
return token;
8182
}
@@ -90,7 +91,7 @@ public void onPageFinished(final WebView view, final String url) {
9091
if (url.contains("oauth_verifier")) {
9192
getTwitterOAuthTokenAndLogin(token, Uri.parse(url).getQueryParameter("oauth_verifier"));
9293
} else if (url.contains("denied")) {
93-
sendResultError(FirebaseStatuses.USER_ERROR, "User denied access to their account.");
94+
sendResultError(FirebaseActions.USER_ERROR, FirebaseErrors.LOGIN_CANCELLED, "User denied access to their account.");
9495
}
9596
}
9697
}
@@ -108,7 +109,7 @@ protected AccessToken doInBackground(Void... params) {
108109
try {
109110
accessToken = mTwitter.getOAuthAccessToken(requestToken, oauthVerifier);
110111
} catch (TwitterException te) {
111-
sendResultError(FirebaseStatuses.PROVIDER_ERROR, te.toString());
112+
sendResultError(FirebaseActions.PROVIDER_ERROR, FirebaseErrors.MISC_PROVIDER_ERROR, te.toString());
112113
}
113114
return accessToken;
114115
}
@@ -120,15 +121,16 @@ protected void onPostExecute(AccessToken token) {
120121
resultIntent.putExtra("oauth_token_secret", token.getTokenSecret());
121122
resultIntent.putExtra("user_id", token.getUserId() + "");
122123

123-
setResult(FirebaseStatuses.SUCCESS, resultIntent);
124+
setResult(FirebaseActions.SUCCESS, resultIntent);
124125
finish();
125126
}
126127
}.execute();
127128
}
128129

129-
private void sendResultError(Integer status, String err) {
130+
private void sendResultError(Integer status, int errCode, String err) {
130131
Intent resultIntent = new Intent();
131132
resultIntent.putExtra("error", err);
133+
resultIntent.putExtra("code", errCode);
132134
setResult(status, resultIntent);
133135
finish();
134136
}

0 commit comments

Comments
 (0)