@@ -45,17 +45,19 @@ const AuthState = ({ children }) => {
45
45
sameSite : true ,
46
46
maxAge : 3600 ,
47
47
} ) ;
48
- } , [ firebaseToken ] ) ;
48
+ } , [ user , firebaseToken , refreshToken ] ) ;
49
49
50
50
const loginWithToken = async ( _token ) => {
51
51
const credential = GoogleAuthProvider . credential ( _token ) ;
52
52
53
53
const res = await signInWithCredential ( auth , credential ) ;
54
54
55
55
const { user, _tokenResponse } = res ;
56
- setUser ( user ) ;
56
+
57
+ GraphClient . setLink ( getApolloLink ( user . accessToken ) ) ;
57
58
setFirebaseToken ( user . accessToken ) ;
58
59
setRefreshToken ( user . refreshToken ) ;
60
+ setUser ( user ) ;
59
61
60
62
if ( getAdditionalUserInfo ( res ) . isNewUser ) {
61
63
try {
@@ -65,6 +67,15 @@ const AuthState = ({ children }) => {
65
67
authenticationEndpoint : `${ process . env . NEXT_PUBLIC_SERVER_ADDRESS } ${ process . env . NEXT_PUBLIC_IMAGEKIT_AUTHENTICATION_ENDPOINT } ` ,
66
68
} ) ;
67
69
70
+ const newAccount = await GraphClient . mutate ( {
71
+ mutation : registerUser ,
72
+ variables : {
73
+ fullName : user . displayName ,
74
+ email : user . email ,
75
+ } ,
76
+ } ) ;
77
+ console . log ( 'Account Created ' , newAccount ) ;
78
+
68
79
const userPicture = await ( await fetch ( user . photoURL ) ) . blob ( ) ;
69
80
70
81
if ( ! [ 'image/png' , 'image/jpeg' ] . includes ( userPicture . type ) ) {
@@ -73,25 +84,16 @@ const AuthState = ({ children }) => {
73
84
74
85
const imageUpload = await imagekit
75
86
. upload ( {
76
- file : userPicture ,
87
+ file : user . photoURL ,
77
88
folder : '/user' ,
78
- fileName : `${ user . uid } .${
89
+ fileName : `${ newAccount . data . registerUser . id } .${
79
90
userPicture . type . toString ( ) . split ( '/' ) [ 1 ]
80
91
} `,
81
92
tags : [ user . uid , 'user' , 'profilePicture' ] ,
82
93
} )
83
94
. then ( ( result ) => {
84
95
console . log ( 'Upload Success' , result ) ;
85
96
} ) ;
86
-
87
- const newAccount = await GraphClient . mutate ( {
88
- mutation : registerUser ,
89
- variables : {
90
- fullName : user . displayName ,
91
- email : user . email ,
92
- } ,
93
- } ) ;
94
- console . log ( 'Account Created ' , newAccount ) ;
95
97
} catch ( err ) {
96
98
console . log ( err ) ;
97
99
}
0 commit comments