Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8eb9cdab
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8eb9cdab
编写于
9月 02, 2020
作者:
R
Rachel Macfarlane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #105955, make sure auth provider registration completes when getSession is called
上级
355fbca8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
13 deletion
+35
-13
extensions/github-authentication/src/extension.ts
extensions/github-authentication/src/extension.ts
+2
-2
src/vs/workbench/services/authentication/browser/authenticationService.ts
.../services/authentication/browser/authenticationService.ts
+33
-11
未找到文件。
extensions/github-authentication/src/extension.ts
浏览文件 @
8eb9cdab
...
@@ -22,7 +22,7 @@ export async function activate(context: vscode.ExtensionContext) {
...
@@ -22,7 +22,7 @@ export async function activate(context: vscode.ExtensionContext) {
return
loginService
.
manuallyProvideToken
();
return
loginService
.
manuallyProvideToken
();
}));
}));
vscode
.
authentication
.
registerAuthenticationProvider
({
context
.
subscriptions
.
push
(
vscode
.
authentication
.
registerAuthenticationProvider
({
id
:
'
github
'
,
id
:
'
github
'
,
label
:
'
GitHub
'
,
label
:
'
GitHub
'
,
supportsMultipleAccounts
:
false
,
supportsMultipleAccounts
:
false
,
...
@@ -70,7 +70,7 @@ export async function activate(context: vscode.ExtensionContext) {
...
@@ -70,7 +70,7 @@ export async function activate(context: vscode.ExtensionContext) {
throw
e
;
throw
e
;
}
}
}
}
});
})
)
;
return
;
return
;
}
}
...
...
src/vs/workbench/services/authentication/browser/authenticationService.ts
浏览文件 @
8eb9cdab
...
@@ -432,24 +432,46 @@ export class AuthenticationService extends Disposable implements IAuthentication
...
@@ -432,24 +432,46 @@ export class AuthenticationService extends Disposable implements IAuthentication
}
}
}
}
async
getSessions
(
id
:
string
):
Promise
<
ReadonlyArray
<
AuthenticationSession
>>
{
private
async
tryActivateProvider
(
providerId
:
string
):
Promise
<
MainThreadAuthenticationProvider
>
{
await
this
.
extensionService
.
activateByEvent
(
getAuthenticationProviderActivationEvent
(
id
));
await
this
.
extensionService
.
activateByEvent
(
getAuthenticationProviderActivationEvent
(
providerId
));
let
provider
=
this
.
_authenticationProviders
.
get
(
providerId
);
if
(
provider
)
{
return
provider
;
}
const
authProvider
=
this
.
_authenticationProviders
.
get
(
id
);
// When activate has completed, the extension has made the call to `registerAuthenticationProvider`.
if
(
authProvider
)
{
// However, activate cannot block on this, so the renderer may not have gotten the event yet.
const
didRegister
:
Promise
<
MainThreadAuthenticationProvider
>
=
new
Promise
((
resolve
,
_
)
=>
{
this
.
onDidRegisterAuthenticationProvider
(
e
=>
{
if
(
e
.
id
===
providerId
)
{
resolve
(
this
.
_authenticationProviders
.
get
(
providerId
));
}
});
});
const
didTimeout
:
Promise
<
MainThreadAuthenticationProvider
>
=
new
Promise
((
_
,
reject
)
=>
{
setTimeout
(()
=>
{
reject
();
},
2000
);
});
return
Promise
.
race
([
didRegister
,
didTimeout
]);
}
async
getSessions
(
id
:
string
):
Promise
<
ReadonlyArray
<
AuthenticationSession
>>
{
try
{
const
authProvider
=
this
.
_authenticationProviders
.
get
(
id
)
||
await
this
.
tryActivateProvider
(
id
);
return
await
authProvider
.
getSessions
();
return
await
authProvider
.
getSessions
();
}
else
{
}
catch
(
_
)
{
throw
new
Error
(
`No authentication provider '
${
id
}
' is currently registered.`
);
throw
new
Error
(
`No authentication provider '
${
id
}
' is currently registered.`
);
}
}
}
}
async
login
(
id
:
string
,
scopes
:
string
[]):
Promise
<
AuthenticationSession
>
{
async
login
(
id
:
string
,
scopes
:
string
[]):
Promise
<
AuthenticationSession
>
{
await
this
.
extensionService
.
activateByEvent
(
getAuthenticationProviderActivationEvent
(
id
));
try
{
const
authProvider
=
this
.
_authenticationProviders
.
get
(
id
)
||
await
this
.
tryActivateProvider
(
id
);
const
authProvider
=
this
.
_authenticationProviders
.
get
(
id
);
return
await
authProvider
.
login
(
scopes
);
if
(
authProvider
)
{
}
catch
(
_
)
{
return
authProvider
.
login
(
scopes
);
}
else
{
throw
new
Error
(
`No authentication provider '
${
id
}
' is currently registered.`
);
throw
new
Error
(
`No authentication provider '
${
id
}
' is currently registered.`
);
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录