Skip to content

Cookie login bug #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 55 commits into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
da877b2
Merge pull request #132 from ccagml/main
ccagml Dec 21, 2022
ce9b4ad
Merge pull request #134 from ccagml/main
ccagml Jan 3, 2023
feacd40
Merge pull request #137 from ccagml/main
ccagml Jan 11, 2023
4cf06c3
Merge pull request #138 from ccagml/main
ccagml Jan 11, 2023
5f6a631
Merge pull request #139 from ccagml/main
ccagml Jan 11, 2023
b522309
Merge pull request #140 from ccagml/main
ccagml Jan 12, 2023
d4d22a5
Merge pull request #141 from ccagml/main
ccagml Jan 12, 2023
101957d
Merge pull request #144 from ccagml/main
ccagml Jan 16, 2023
110b2bb
Merge pull request #145 from ccagml/main
ccagml Jan 17, 2023
2083f10
Merge pull request #146 from ccagml/main
ccagml Jan 19, 2023
357a9bd
Merge pull request #147 from ccagml/main
ccagml Jan 19, 2023
f91da73
Merge pull request #152 from ccagml/main
ccagml Jan 22, 2023
fe7198d
Merge pull request #153 from ccagml/main
ccagml Jan 23, 2023
a6fa562
Merge pull request #156 from ccagml/main
ccagml Jan 25, 2023
b35f402
Merge pull request #157 from ccagml/main
ccagml Jan 25, 2023
495bd3a
Merge pull request #160 from ccagml/main
ccagml Jan 26, 2023
808ea42
Merge pull request #161 from ccagml/main
ccagml Jan 28, 2023
683c1e8
Merge pull request #162 from ccagml/main
ccagml Jan 28, 2023
4c61752
Merge pull request #163 from ccagml/main
ccagml Jan 28, 2023
7301574
Merge pull request #167 from ccagml/main
ccagml Jan 29, 2023
7afb9f2
Merge pull request #168 from ccagml/main
ccagml Jan 29, 2023
09b5f42
Merge pull request #170 from ccagml/main
ccagml Jan 29, 2023
0470ab3
Merge pull request #171 from ccagml/main
ccagml Jan 30, 2023
b3bb049
Merge pull request #174 from ccagml/main
ccagml Feb 1, 2023
5f56d5c
Merge pull request #175 from ccagml/main
ccagml Feb 6, 2023
a58647d
Merge pull request #176 from ccagml/main
ccagml Feb 6, 2023
ddf158a
Merge pull request #179 from ccagml/main
ccagml Feb 6, 2023
5209156
Merge pull request #181 from ccagml/main
ccagml Feb 6, 2023
8e9d404
Merge pull request #182 from ccagml/main
ccagml Feb 6, 2023
8612624
Merge pull request #184 from ccagml/main
ccagml Feb 11, 2023
51450b2
Merge pull request #185 from ccagml/main
ccagml Feb 15, 2023
9cd2338
Merge pull request #186 from ccagml/main
ccagml Feb 16, 2023
f5a7a5b
Merge pull request #187 from ccagml/main
ccagml Feb 16, 2023
42361e2
Merge pull request #189 from ccagml/main
ccagml Feb 17, 2023
09d7657
Merge pull request #191 from ccagml/main
ccagml Feb 18, 2023
2cc3a02
Merge pull request #194 from ccagml/main
ccagml Feb 25, 2023
1ce3176
Merge pull request #195 from ccagml/main
ccagml Feb 27, 2023
d6abb5e
Merge pull request #196 from ccagml/main
ccagml Feb 28, 2023
f77cfb1
Merge pull request #199 from ccagml/main
ccagml Mar 2, 2023
988b0ae
Merge pull request #201 from ccagml/main
ccagml Mar 4, 2023
b5fab71
Merge pull request #208 from ccagml/main
ccagml Mar 27, 2023
987b7fe
Merge pull request #213 from ccagml/main
ccagml Apr 7, 2023
afbf1b0
Merge pull request #215 from ccagml/main
ccagml Apr 11, 2023
c76c10b
Merge pull request #216 from ccagml/main
ccagml Apr 11, 2023
27c8b28
Merge pull request #217 from ccagml/main
ccagml Apr 11, 2023
4ab37cf
Merge pull request #218 from ccagml/main
ccagml Apr 12, 2023
4aa4b14
Merge pull request #220 from ccagml/main
ccagml Apr 23, 2023
fafd178
Merge pull request #224 from ccagml/main
ccagml May 18, 2023
bcc71fa
Merge pull request #228 from ccagml/main
ccagml Jun 5, 2023
cc75d5d
Merge pull request #232 from ccagml/main
ccagml Jul 14, 2023
1fc5697
Merge pull request #233 from ccagml/main
ccagml Jul 18, 2023
2d8751e
Merge pull request #235 from ccagml/main
ccagml Jul 20, 2023
c076cc6
Merge pull request #238 from ccagml/main
ccagml Jul 29, 2023
8582379
Merge pull request #241 from ccagml/main
ccagml Sep 18, 2023
b6e75fa
bug fix: 修复 cookie 登录后重启 vscode 无法自动登录
sealye09 Sep 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/rpc/factory/api/userApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class UserApi extends ApiBase {
// show current user
user = sessionUtils.getUser();
if (user) {
reply.info(JSON.stringify({ code: 100, user_name: user.name }));
reply.info(JSON.stringify({ code: 100, user_name: user.login }));
} else return reply.info(JSON.stringify({ code: -7, msg: "You are not login yet?" }));
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/service/StatusBarService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ class StatusBarService implements Disposable {

public async getLoginStatus(): Promise<void> {
try {
const result: string = await executeService.getUserInfo();
this.currentUser = this.tryParseUserName(result);
const result: any = await executeService.getUserInfo();
// BUG: this.tryParseUserName(result)拿到的是对象,而不是字符串
// this.currentUser = this.tryParseUserName(result);
this.currentUser = { ...result, user_name: result.login };
this.userStatus = UserStatus.SignedIn;
if (this.currentUser == undefined) {
this.userStatus = UserStatus.SignedOut;
Expand Down