Skip to content

Commit b4d406c

Browse files
committed
fix(admin): fix refresh token expired
1 parent 8d7b219 commit b4d406c

5 files changed

Lines changed: 28 additions & 7 deletions

File tree

server/go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,6 @@ github.com/jaronnie/genius v0.6.1 h1:Uc5DkO9YuyqcQLEz6jjpWF9dwHX7UKwOFVjZEdtYlHc
161161
github.com/jaronnie/genius v0.6.1/go.mod h1:FHpApD8c1nRZGJvIoD+1H7VydBvVOoTU95CcdAo38bY=
162162
github.com/jzero-io/jzero v0.62.0 h1:QYmpCUHhaNhSXAIk3iN9k3OhHI68Urq6SlnQPmK2S54=
163163
github.com/jzero-io/jzero v0.62.0/go.mod h1:1vGKcbnWnSAAv/oSV/V4jA2loEaEXzCdDjTsTyiS868=
164-
github.com/jzero-io/jzero-admin/core-engine v0.0.0-20251001092913-fbacc0fe7742 h1:Bll9RZQ78N5AlXCRqxsMdHOK82DsEhSa8yA4BPWPwCM=
165-
github.com/jzero-io/jzero-admin/core-engine v0.0.0-20251001092913-fbacc0fe7742/go.mod h1:9JbnJwSPx/CLFeIPrfUcUImuTzJxW22QvXIB9Ab15pw=
166-
github.com/jzero-io/jzero-admin/core-engine v0.0.0-20251009023811-76581e8c52ee h1:dEY34DWomKyfWSsoZD8wOb6AC0XeC5ak5JA1IcaWz6E=
167-
github.com/jzero-io/jzero-admin/core-engine v0.0.0-20251009023811-76581e8c52ee/go.mod h1:9JbnJwSPx/CLFeIPrfUcUImuTzJxW22QvXIB9Ab15pw=
168164
github.com/jzero-io/jzero-admin/core-engine v0.0.0-20251009025920-b409b73d89c1 h1:NQ4HovyF/hUTIqnybkNyrcTga3JXOzkawDDCEl8m2FA=
169165
github.com/jzero-io/jzero-admin/core-engine v0.0.0-20251009025920-b409b73d89c1/go.mod h1:9JbnJwSPx/CLFeIPrfUcUImuTzJxW22QvXIB9Ab15pw=
170166
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package auth
2+
3+
import "github.com/jzero-io/jzero/core/status"
4+
5+
const (
6+
RefreshTokenExpiredCode = 40102
7+
)
8+
9+
func RegisterAuth() {
10+
status.Register(RefreshTokenExpiredCode)
11+
}
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package errcodes
22

3-
import "github.com/jzero-io/jzero-admin/server/internal/errcodes/manage"
3+
import (
4+
"github.com/jzero-io/jzero-admin/server/internal/errcodes/auth"
5+
"github.com/jzero-io/jzero-admin/server/internal/errcodes/manage"
6+
)
47

58
func Register() {
69
manage.RegisterManage()
10+
auth.RegisterAuth()
711
}

server/internal/logic/auth/refresh_token.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,20 @@ import (
66
"time"
77

88
"github.com/golang-jwt/jwt/v4"
9+
"github.com/jzero-io/jzero/core/status"
10+
"github.com/pkg/errors"
911
"github.com/zeromicro/go-zero/core/logx"
1012
"github.com/zeromicro/go-zero/rest/token"
1113

14+
"github.com/jzero-io/jzero-admin/server/internal/errcodes/auth"
1215
"github.com/jzero-io/jzero-admin/server/internal/svc"
1316
types "github.com/jzero-io/jzero-admin/server/internal/types/auth"
1417
)
1518

19+
var (
20+
RefreshTokenExpiredErr = errors.New("refresh token expired")
21+
)
22+
1623
type RefreshToken struct {
1724
logx.Logger
1825
ctx context.Context
@@ -42,6 +49,9 @@ func (l *RefreshToken) RefreshToken(req *types.RefreshTokenRequest) (resp *types
4249
},
4350
}, l.svcCtx.MustGetConfig().Jwt.AccessSecret, "")
4451
if err != nil {
52+
if errors.Is(err, jwt.ErrTokenExpired) {
53+
return nil, status.Wrap(auth.RefreshTokenExpiredCode, RefreshTokenExpiredErr)
54+
}
4555
return nil, err
4656
}
4757

web/.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ VITE_ROUTER_HISTORY_MODE=history
3030
VITE_SERVICE_SUCCESS_CODE=200
3131

3232
# logout codes of backend service, when the code is received, the user will be logged out and redirected to login page
33-
VITE_SERVICE_LOGOUT_CODES=8888,8889
33+
VITE_SERVICE_LOGOUT_CODES=40102
3434

3535
# modal logout codes of backend service, when the code is received, the user will be logged out by displaying a modal
36-
VITE_SERVICE_MODAL_LOGOUT_CODES=7777,7778
36+
VITE_SERVICE_MODAL_LOGOUT_CODES=40103
3737

3838
# token expired codes of backend service, when the code is received, it will refresh the token and resend the request
3939
VITE_SERVICE_EXPIRED_TOKEN_CODES=40101

0 commit comments

Comments
 (0)