fix: fix GitHub account bind related prompt

songquanpeng · Nov 11, 2022 · b69d5ec · b69d5ec
1 parent 5e28092
commit b69d5ec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/controller/github.go b/controller/github.go
@@ -172,6 +172,9 @@ func GitHubBind(c *gin.Context) {
 		})
 		return
 	}
-	c.Redirect(http.StatusSeeOther, "/setting")
+	c.JSON(http.StatusOK, gin.H{
+		"success": true,
+		"message": "bind",
+	})
 	return
 }
diff --git a/web/src/components/GitHubOAuth.js b/web/src/components/GitHubOAuth.js
@@ -17,10 +17,15 @@ const GitHubOAuth = () => {
     const res = await API.get(`/api/oauth/github?code=${code}`);
     const { success, message, data } = res.data;
     if (success) {
-      userDispatch({ type: 'login', payload: data });
-      localStorage.setItem('user', JSON.stringify(data));
-      navigate('/');
-      showSuccess('登录成功！');
+      if (message === 'bind') {
+        showSuccess('绑定成功！');
+        navigate('/setting');
+      } else {
+        userDispatch({ type: 'login', payload: data });
+        localStorage.setItem('user', JSON.stringify(data));
+        showSuccess('登录成功！');
+        navigate('/');
+      }
     } else {
       showError(message);
       if (count === 0) {