From 88b3a51851652f696c9cd460cffd845b9de12dfc Mon Sep 17 00:00:00 2001 From: Nandan B N Date: Sun, 26 Nov 2023 12:09:33 +0530 Subject: [PATCH 1/2] fix: User should contain displayName property --- src/definitions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/definitions.ts b/src/definitions.ts index d576e9f..9180bb0 100644 --- a/src/definitions.ts +++ b/src/definitions.ts @@ -10,7 +10,7 @@ export interface User { id: string; email: string; - name: string; + displayName: string; familyName: string; givenName: string; imageUrl: string; From b4359249f8de327576aa453d87b269e90761b9bb Mon Sep 17 00:00:00 2001 From: reslear Date: Sun, 26 Nov 2023 16:18:01 +0100 Subject: [PATCH 2/2] unify and deprectate --- .../codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java | 2 ++ src/definitions.ts | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java index 577f5c5..d9c2f28 100644 --- a/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java +++ b/android/src/main/java/com/codetrixstudio/capacitor/GoogleAuth/GoogleAuth.java @@ -113,6 +113,8 @@ protected void signInResult(PluginCall call, ActivityResult result) { user.put("idToken", account.getIdToken()); user.put("authentication", authentication); + user.put("name", account.getDisplayName()); + // Deprecated: Use `user` instead of `displayName` user.put("displayName", account.getDisplayName()); user.put("email", account.getEmail()); user.put("familyName", account.getFamilyName()); diff --git a/src/definitions.ts b/src/definitions.ts index 9180bb0..7ddfe61 100644 --- a/src/definitions.ts +++ b/src/definitions.ts @@ -9,8 +9,11 @@ declare module '@capacitor/cli' { export interface User { id: string; email: string; - - displayName: string; + /** + * @deprecated use `name` instead + */ + displayName: string + name: string; familyName: string; givenName: string; imageUrl: string;