From fa9f880ee6d4f2a3de9d621297ca8189997d8473 Mon Sep 17 00:00:00 2001 From: Jason Teplitz Date: Mon, 27 Jun 2016 23:54:28 -0400 Subject: [PATCH] fix(auth): Return provider data --- src/providers/auth_backend.ts | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/providers/auth_backend.ts b/src/providers/auth_backend.ts index 18a3434c8..b32f621bf 100644 --- a/src/providers/auth_backend.ts +++ b/src/providers/auth_backend.ts @@ -46,10 +46,10 @@ export interface FirebaseAuthState { provider: AuthProviders; auth: firebase.User; expires?: number; - github?: CommonOAuthCredential; - google?: GoogleCredential; - twitter?: TwitterCredential; - facebook?: CommonOAuthCredential; + github?: firebase.UserInfo; + google?: firebase.UserInfo; + twitter?: firebase.UserInfo; + facebook?: firebase.UserInfo; anonymous?: boolean; } @@ -69,7 +69,8 @@ export interface TwitterCredential extends CommonOAuthCredential { export type OAuthCredential = CommonOAuthCredential | GoogleCredential | TwitterCredential; -export function authDataToAuthState(authData: firebase.User, providerData?: OAuthCredential): FirebaseAuthState { +export function authDataToAuthState(authData: firebase.User): FirebaseAuthState { + let providerData = authData.providerData[0]; if (!authData) return null; let providerId; let { uid } = authData; @@ -80,24 +81,24 @@ export function authDataToAuthState(authData: firebase.User, providerData?: OAut authState.anonymous = true; return authState; } else { - providerId = authData.providerData[0].providerId; + providerId = providerData.providerId; } switch (providerId) { case 'github.com': - authState.github = providerData; + authState.github = providerData; authState.provider = AuthProviders.Github; break; case 'twitter.com': - authState.twitter = providerData; + authState.twitter = providerData; authState.provider = AuthProviders.Twitter; break; case 'facebook.com': - authState.facebook = providerData; + authState.facebook = providerData; authState.provider = AuthProviders.Facebook; break; case 'google.com': - authState.google = providerData; + authState.google = providerData; authState.provider = AuthProviders.Google; break; case 'password':