fix(session): aded firstName and lastName

Author: cnlangzi

auth_db.go

@@ -19,6 +19,30 @@ func (a *Auth) createBuilder() *sqle.Builder {
 	return sqle.New().Input("prefix", a.prefix)
 }
 
+func (a *Auth) getUserByID(ctx context.Context, uid shardid.ID) (User, error) {
+	var u User
+
+	err := a.db.On(uid).
+		QueryRowBuilder(ctx, a.createBuilder().
+			Select("<prefix>user").
+			Where("id = {id}").Param("id", uid.Int64)).
+		Bind(&u)
+
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return u, ErrUserNotFound
+		}
+		a.logger.Error("auth: getUserByID",
+			slog.String("pos", "user"),
+			slog.String("tag", "db"),
+			slog.Int64("user_id", uid.Int64),
+			slog.Any("err", err))
+		return u, ErrBadDatabase
+	}
+
+	return u, nil
+}
+
 func (a *Auth) getUserByEmail(ctx context.Context, email string) (User, error) {
 	var u User
 
@@ -739,9 +763,11 @@ func (a *Auth) checkSignInCode(ctx context.Context, userID shardid.ID, code stri
 	return nil
 }
 
-func (a *Auth) createSession(ctx context.Context, userID shardid.ID) (Session, error) {
+func (a *Auth) createSession(ctx context.Context, userID shardid.ID, firstName, lastName string) (Session, error) {
 	s := Session{
-		UserID: userID.Int64,
+		UserID:    userID.Int64,
+		FirstName: firstName,
+		LastName:  lastName,
 	}
 
 	now := time.Now()

auth_session.go

@@ -59,5 +59,10 @@ func (a *Auth) RefreshSession(ctx context.Context, refreshToken string) (Session
 
 	go a.deleteUserToken(ctx, uid, refreshToken) // nolint: errcheck
 
-	return a.createSession(ctx, uid)
+	u, err := a.getUserByID(ctx, uid)
+	if err != nil {
+		return noSession, err
+	}
+
+	return a.createSession(ctx, uid, u.FirstName, u.FirstName)
 }

auth_signin.go

@@ -11,7 +11,7 @@ func (a *Auth) SignIn(ctx context.Context, email, passwd string, option LoginOpt
 
 	if err == nil {
 		if verifyHash(a.hash(), u.Passwd, passwd, u.Salt) {
-			return a.createSession(ctx, u.ID)
+			return a.createSession(ctx, u.ID, u.FirstName, u.LastName)
 		}
 
 		return noSession, ErrPasswdNotMatched
@@ -23,7 +23,7 @@ func (a *Auth) SignIn(ctx context.Context, email, passwd string, option LoginOpt
 			return noSession, err
 		}
 
-		return a.createSession(ctx, u.ID)
+		return a.createSession(ctx, u.ID, u.FirstName, u.LastName)
 	}
 
 	return noSession, err
@@ -36,7 +36,7 @@ func (a *Auth) SignInMobile(ctx context.Context, mobile, passwd string, option L
 
 	if err == nil {
 		if verifyHash(a.hash(), u.Passwd, passwd, u.Salt) {
-			return a.createSession(ctx, u.ID)
+			return a.createSession(ctx, u.ID, u.FirstName, u.LastName)
 		}
 
 		return noSession, ErrPasswdNotMatched
@@ -48,7 +48,7 @@ func (a *Auth) SignInMobile(ctx context.Context, mobile, passwd string, option L
 			return noSession, err
 		}
 
-		return a.createSession(ctx, u.ID)
+		return a.createSession(ctx, u.ID, u.FirstName, u.LastName)
 	}
 
 	return noSession, err

auth_signin_with_code.go

@@ -23,17 +23,17 @@ func (a *Auth) CreateSignInCode(ctx context.Context, email string, option LoginO
 
 // SignInWithCode sign in with email and code.
 func (a *Auth) SignInWithCode(ctx context.Context, email, code string) (Session, error) {
-	id, err := a.getUserIDByEmail(ctx, email)
+	u, err := a.getUserByEmail(ctx, email)
 	if err != nil {
 		return noSession, err
 	}
 
-	err = a.checkSignInCode(ctx, id, code)
+	err = a.checkSignInCode(ctx, u.ID, code)
 	if err != nil {
 		return noSession, err
 	}
 
-	return a.createSession(ctx, id)
+	return a.createSession(ctx, u.ID, u.FirstName, u.LastName)
 }
 
 // CreateSignInMobileCode create a code for signing in by mobile
@@ -54,15 +54,15 @@ func (a *Auth) CreateSignInMobileCode(ctx context.Context, mobile string, option
 
 // SignInMobileWithCode sign in with mobile and code.
 func (a *Auth) SignInMobileWithCode(ctx context.Context, mobile, code string) (Session, error) {
-	id, err := a.getUserIDByMobile(ctx, mobile)
+	u, err := a.getUserByMobile(ctx, mobile)
 	if err != nil {
 		return noSession, err
 	}
 
-	err = a.checkSignInCode(ctx, id, code)
+	err = a.checkSignInCode(ctx, u.ID, code)
 	if err != nil {
 		return noSession, err
 	}
 
-	return a.createSession(ctx, id)
+	return a.createSession(ctx, u.ID, u.FirstName, u.LastName)
 }

auth_signin_with_otp.go

@@ -9,13 +9,13 @@ import (
 // SignInWithOTP sign in with email and otp.
 func (a *Auth) SignInWithOTP(ctx context.Context, email, otp string) (Session, error) {
 
-	id, err := a.getUserIDByEmail(ctx, email)
+	u, err := a.getUserByEmail(ctx, email)
 
 	if err != nil {
 		return noSession, ErrEmailNotFound
 	}
 
-	pd, err := a.getUserProfileData(ctx, id)
+	pd, err := a.getUserProfileData(ctx, u.ID)
 	if err != nil {
 		return noSession, err
 	}
@@ -24,19 +24,19 @@ func (a *Auth) SignInWithOTP(ctx context.Context, email, otp string) (Session, e
 		return noSession, ErrOTPNotMatched
 	}
 
-	return a.createSession(ctx, id)
+	return a.createSession(ctx, u.ID, u.FirstName, u.LastName)
 
 }
 
 // SignInMobileWithOTP sign in with mobile and otp.
 func (a *Auth) SignInMobileWithOTP(ctx context.Context, mobile, otp string) (Session, error) {
-	id, err := a.getUserIDByMobile(ctx, mobile)
+	u, err := a.getUserByMobile(ctx, mobile)
 
 	if err != nil {
 		return noSession, ErrMobileNotFound
 	}
 
-	pd, err := a.getUserProfileData(ctx, id)
+	pd, err := a.getUserProfileData(ctx, u.ID)
 	if err != nil {
 		return noSession, err
 	}
@@ -45,5 +45,5 @@ func (a *Auth) SignInMobileWithOTP(ctx context.Context, mobile, otp string) (Ses
 		return noSession, ErrOTPNotMatched
 	}
 
-	return a.createSession(ctx, id)
+	return a.createSession(ctx, u.ID, u.FirstName, u.LastName)
 }

session.go

@@ -8,6 +8,8 @@ import (
 
 type Session struct {
 	UserID       int64  `json:"userID,omitempty"`
+	FirstName    string `json:"firstName,omitempty"`
+	LastName     string `json:"lastName,omitempty"`
 	AccessToken  string `json:"accessToken,omitempty"`
 	RefreshToken string `json:"refreshToken,omitempty"`
 }