-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Return tokens on successful sign in with an IDP #362
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
auth/src/main/java/com/firebase/ui/auth/IdpResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * Copyright 2016 Google Inc. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the | ||
| * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.firebase.ui.auth; | ||
|
|
||
| import android.content.Intent; | ||
| import android.os.Parcel; | ||
| import android.os.Parcelable; | ||
| import android.support.annotation.Nullable; | ||
| import com.firebase.ui.auth.ui.ExtraConstants; | ||
|
|
||
| /** | ||
| * A container that encapsulates the result of authenticating with an Identity Provider. | ||
| */ | ||
| public class IdpResponse implements Parcelable { | ||
|
|
||
| private final String mProviderId; | ||
| @Nullable private final String mEmail; | ||
| private final String mToken; | ||
| private final String mSecret; | ||
|
|
||
| public IdpResponse(String providerId, @Nullable String email) { | ||
| this(providerId, email, null, null); | ||
| } | ||
|
|
||
| public IdpResponse( | ||
| String providerId, @Nullable String email, @Nullable String token) { | ||
| this(providerId, email, token, null); | ||
| } | ||
|
|
||
| public IdpResponse( | ||
| String providerId, | ||
| @Nullable String email, | ||
| @Nullable String token, | ||
| @Nullable String secret) { | ||
| mProviderId = providerId; | ||
| mEmail = email; | ||
| mToken = token; | ||
| mSecret = secret; | ||
| } | ||
|
|
||
| public static final Creator<IdpResponse> CREATOR = new Creator<IdpResponse>() { | ||
| @Override | ||
| public IdpResponse createFromParcel(Parcel in) { | ||
| return new IdpResponse( | ||
| in.readString(), | ||
| in.readString(), | ||
| in.readString(), | ||
| in.readString() | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public IdpResponse[] newArray(int size) { | ||
| return new IdpResponse[size]; | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Get the type of provider. e.g. {@link AuthUI#GOOGLE_PROVIDER} | ||
| */ | ||
| public String getProviderType() { | ||
| return mProviderId; | ||
| } | ||
|
|
||
| /** | ||
| * Get the token received as a result of logging in with the specified IDP | ||
| */ | ||
| @Nullable | ||
| public String getIdpToken() { | ||
| return mToken; | ||
| } | ||
|
|
||
| /** | ||
| * Twitter only. Return the token secret received as a result of logging in with Twitter. | ||
| */ | ||
| @Nullable | ||
| public String getIdpSecret() { | ||
| return mSecret; | ||
| } | ||
|
|
||
| /** | ||
| * Get the email used to sign in. | ||
| */ | ||
| @Nullable | ||
| public String getEmail() { | ||
| return mEmail; | ||
| } | ||
|
|
||
| @Override | ||
| public int describeContents() { | ||
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| public void writeToParcel(Parcel dest, int flags) { | ||
| dest.writeString(mProviderId); | ||
| dest.writeString(mEmail); | ||
| dest.writeString(mToken); | ||
| dest.writeString(mSecret); | ||
| } | ||
|
|
||
| /** | ||
| * Extract the {@link IdpResponse} from the flow's result intent. | ||
| * @param resultIntent The intent which {@code onActivityResult} was called with. | ||
| * @return The IdpResponse containing the token(s) from signing in with the Idp | ||
| */ | ||
| @Nullable | ||
| public static IdpResponse fromResultIntent(Intent resultIntent) { | ||
| return resultIntent.getParcelableExtra(ExtraConstants.EXTRA_IDP_RESPONSE); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NonNull? Also is there any case this would not be
FirebaseAuth.getInstance().getCurrentUser().getEmail()? Would prefer not to duplicate if so.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's actually nullable (because Twitter always has to be special). We need to record the email on the
IdpResponsebecause we can be in the state where the user has signed in to the IDP but were unable to sign in to Firebase and we need to know the email to to find the existing account to link.