Skip to content

firstName + lastName #9

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

Open
gerhardolivier wants to merge 1 commit into
base: master
Choose a base branch
from
Open

firstName + lastName #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion src/entities/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ export class SocialUser {
name: string;
image: string;
token?: string;
idToken?: string
idToken?: string;
firstName?: string;
lastName?: string;
}

export class LoginProviderClass {
Expand Down
6 changes: 4 additions & 2 deletions src/providers/facebook-login-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class FacebookLoginProvider extends BaseLoginProvider {
FB.getLoginStatus(function (response: any) {
if (response.status === 'connected') {
const accessToken = FB.getAuthResponse()['accessToken'];
FB.api('/me?fields=name,email,picture', (res: any) => {
FB.api('/me?fields=name,email,picture,first_name,last_name', (res: any) => {
resolve(FacebookLoginProvider.drawUser(Object.assign({}, {token: accessToken}, res)));
});
}
Expand All @@ -43,6 +43,8 @@ export class FacebookLoginProvider extends BaseLoginProvider {
let user: SocialUser = new SocialUser();
user.id = response.id;
user.name = response.name;
user.firstName = response.first_name;
user.lastName = response.last_name;
user.email = response.email;
user.token = response.token;
user.image = 'https://graph.facebook.com/' + response.id + '/picture?type=normal';
Expand All @@ -54,7 +56,7 @@ export class FacebookLoginProvider extends BaseLoginProvider {
FB.login((response: any) => {
if (response.authResponse) {
const accessToken = FB.getAuthResponse()['accessToken'];
FB.api('/me?fields=name,email,picture', (res: any) => {
FB.api('/me?fields=name,email,picture,first_name,last_name', (res: any) => {
resolve(FacebookLoginProvider.drawUser(Object.assign({}, {token: accessToken}, res)));
});
}
Expand Down
22 changes: 12 additions & 10 deletions src/providers/google-login-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ export class GoogleLoginProvider extends BaseLoginProvider {
initialize(): Promise<SocialUser> {
return new Promise((resolve, reject) => {
this.loadScript(this.loginProviderObj, () => {
gapi.load('auth2', () => {
this.auth2 = gapi.auth2.init({
client_id: this.clientId,
scope: 'email'
});
gapi.load('auth2', () => {
this.auth2 = gapi.auth2.init({
client_id: this.clientId,
scope: 'email'
});

this.auth2.then(() => {
if (this.auth2.isSignedIn.get()) {
resolve(this.drawUser());
}
});
this.auth2.then(() => {
if (this.auth2.isSignedIn.get()) {
resolve(this.drawUser());
}
});
});
});
});
}
Expand All @@ -41,6 +41,8 @@ export class GoogleLoginProvider extends BaseLoginProvider {
let authResponseObj = this.auth2.currentUser.get().getAuthResponse(true);
user.id = profile.getId();
user.name = profile.getName();
user.firstName = profile.getGivenName();
user.lastName = profile.getFamilyName();
user.email = profile.getEmail();
user.image = profile.getImageUrl();
user.token = authResponseObj.access_token;
Expand Down