Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
eee9122c
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eee9122c
编写于
2月 26, 2020
作者:
R
Rachel Macfarlane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
accessToken -> getAccessToken, fixes #91570
上级
8d19b698
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
12 addition
and
12 deletion
+12
-12
extensions/github-authentication/src/github.ts
extensions/github-authentication/src/github.ts
+3
-3
extensions/vscode-account/src/AADHelper.ts
extensions/vscode-account/src/AADHelper.ts
+1
-1
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+1
-1
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+1
-1
src/vs/workbench/api/browser/mainThreadAuthentication.ts
src/vs/workbench/api/browser/mainThreadAuthentication.ts
+2
-2
src/vs/workbench/api/common/extHostAuthentication.ts
src/vs/workbench/api/common/extHostAuthentication.ts
+3
-3
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
...vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+1
-1
未找到文件。
extensions/github-authentication/src/github.ts
浏览文件 @
eee9122c
...
...
@@ -71,7 +71,7 @@ export class GitHubAuthenticationProvider {
id
:
session
.
id
,
accountName
:
session
.
accountName
,
scopes
:
session
.
scopes
,
a
ccessToken
:
()
=>
Promise
.
resolve
(
session
.
accessToken
)
getA
ccessToken
:
()
=>
Promise
.
resolve
(
session
.
accessToken
)
};
});
}
catch
(
e
)
{
...
...
@@ -84,7 +84,7 @@ export class GitHubAuthenticationProvider {
private
async
storeSessions
():
Promise
<
void
>
{
const
sessionData
:
SessionData
[]
=
await
Promise
.
all
(
this
.
_sessions
.
map
(
async
session
=>
{
const
resolvedAccessToken
=
await
session
.
a
ccessToken
();
const
resolvedAccessToken
=
await
session
.
getA
ccessToken
();
return
{
id
:
session
.
id
,
accountName
:
session
.
accountName
,
...
...
@@ -111,7 +111,7 @@ export class GitHubAuthenticationProvider {
const
userInfo
=
await
this
.
_githubServer
.
getUserInfo
(
token
);
return
{
id
:
userInfo
.
id
,
a
ccessToken
:
()
=>
Promise
.
resolve
(
token
),
getA
ccessToken
:
()
=>
Promise
.
resolve
(
token
),
accountName
:
userInfo
.
accountName
,
scopes
:
scopes
};
...
...
extensions/vscode-account/src/AADHelper.ts
浏览文件 @
eee9122c
...
...
@@ -184,7 +184,7 @@ export class AzureActiveDirectoryService {
private
convertToSession
(
token
:
IToken
):
vscode
.
AuthenticationSession
{
return
{
id
:
token
.
sessionId
,
a
ccessToken
:
()
=>
this
.
resolveAccessToken
(
token
),
getA
ccessToken
:
()
=>
this
.
resolveAccessToken
(
token
),
accountName
:
token
.
accountName
,
scopes
:
token
.
scope
.
split
(
'
'
)
};
...
...
src/vs/editor/common/modes.ts
浏览文件 @
eee9122c
...
...
@@ -1373,7 +1373,7 @@ export interface RenameProvider {
*/
export
interface
AuthenticationSession
{
id
:
string
;
a
ccessToken
():
Thenable
<
string
>
;
getA
ccessToken
():
Thenable
<
string
>
;
accountName
:
string
;
}
...
...
src/vs/vscode.proposed.d.ts
浏览文件 @
eee9122c
...
...
@@ -20,7 +20,7 @@ declare module 'vscode' {
export
interface
AuthenticationSession
{
id
:
string
;
a
ccessToken
():
Thenable
<
string
>
;
getA
ccessToken
():
Thenable
<
string
>
;
accountName
:
string
;
scopes
:
string
[]
}
...
...
src/vs/workbench/api/browser/mainThreadAuthentication.ts
浏览文件 @
eee9122c
...
...
@@ -25,7 +25,7 @@ export class MainThreadAuthenticationProvider {
return
{
id
:
session
.
id
,
accountName
:
session
.
accountName
,
a
ccessToken
:
()
=>
this
.
_proxy
.
$getSessionAccessToken
(
this
.
id
,
session
.
id
)
getA
ccessToken
:
()
=>
this
.
_proxy
.
$getSessionAccessToken
(
this
.
id
,
session
.
id
)
};
});
}
...
...
@@ -35,7 +35,7 @@ export class MainThreadAuthenticationProvider {
return
{
id
:
session
.
id
,
accountName
:
session
.
accountName
,
a
ccessToken
:
()
=>
this
.
_proxy
.
$getSessionAccessToken
(
this
.
id
,
session
.
id
)
getA
ccessToken
:
()
=>
this
.
_proxy
.
$getSessionAccessToken
(
this
.
id
,
session
.
id
)
};
});
}
...
...
src/vs/workbench/api/common/extHostAuthentication.ts
浏览文件 @
eee9122c
...
...
@@ -34,7 +34,7 @@ export class AuthenticationProviderWrapper implements vscode.AuthenticationProvi
id
:
session
.
id
,
accountName
:
session
.
accountName
,
scopes
:
session
.
scopes
,
a
ccessToken
:
async
()
=>
{
getA
ccessToken
:
async
()
=>
{
const
isAllowed
=
await
this
.
_proxy
.
$getSessionsPrompt
(
this
.
_provider
.
id
,
this
.
displayName
,
...
...
@@ -45,7 +45,7 @@ export class AuthenticationProviderWrapper implements vscode.AuthenticationProvi
throw
new
Error
(
'
User did not consent to token access.
'
);
}
return
session
.
a
ccessToken
();
return
session
.
getA
ccessToken
();
}
};
});
...
...
@@ -137,7 +137,7 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
const
sessions
=
await
authProvider
.
getSessions
();
const
session
=
sessions
.
find
(
session
=>
session
.
id
===
sessionId
);
if
(
session
)
{
return
session
.
a
ccessToken
();
return
session
.
getA
ccessToken
();
}
throw
new
Error
(
`Unable to find session with id:
${
sessionId
}
`
);
...
...
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
浏览文件 @
eee9122c
...
...
@@ -226,7 +226,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
if
(
account
)
{
try
{
const
token
=
await
account
.
a
ccessToken
();
const
token
=
await
account
.
getA
ccessToken
();
this
.
authTokenService
.
setToken
(
token
);
this
.
authenticationState
.
set
(
AuthStatus
.
SignedIn
);
}
catch
(
e
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录