Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1a1ab8a4
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,发现更多精彩内容 >>
提交
1a1ab8a4
编写于
6月 12, 2020
作者:
R
Rachel Macfarlane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Better handling for MS auth provider when refresh token is not requested
上级
b3fb87f5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
1 deletion
+9
-1
extensions/microsoft-authentication/src/AADHelper.ts
extensions/microsoft-authentication/src/AADHelper.ts
+9
-1
未找到文件。
extensions/microsoft-authentication/src/AADHelper.ts
浏览文件 @
1a1ab8a4
...
@@ -87,6 +87,10 @@ export class AzureActiveDirectoryService {
...
@@ -87,6 +87,10 @@ export class AzureActiveDirectoryService {
try
{
try
{
const
sessions
=
this
.
parseStoredData
(
storedData
);
const
sessions
=
this
.
parseStoredData
(
storedData
);
const
refreshes
=
sessions
.
map
(
async
session
=>
{
const
refreshes
=
sessions
.
map
(
async
session
=>
{
if
(
!
session
.
refreshToken
)
{
return
Promise
.
resolve
();
}
try
{
try
{
await
this
.
refreshToken
(
session
.
refreshToken
,
session
.
scope
,
session
.
id
);
await
this
.
refreshToken
(
session
.
refreshToken
,
session
.
scope
,
session
.
id
);
}
catch
(
e
)
{
}
catch
(
e
)
{
...
@@ -148,7 +152,7 @@ export class AzureActiveDirectoryService {
...
@@ -148,7 +152,7 @@ export class AzureActiveDirectoryService {
const
sessions
=
this
.
parseStoredData
(
storedData
);
const
sessions
=
this
.
parseStoredData
(
storedData
);
let
promises
=
sessions
.
map
(
async
session
=>
{
let
promises
=
sessions
.
map
(
async
session
=>
{
const
matchesExisting
=
this
.
_tokens
.
some
(
token
=>
token
.
scope
===
session
.
scope
&&
token
.
sessionId
===
session
.
id
);
const
matchesExisting
=
this
.
_tokens
.
some
(
token
=>
token
.
scope
===
session
.
scope
&&
token
.
sessionId
===
session
.
id
);
if
(
!
matchesExisting
)
{
if
(
!
matchesExisting
&&
session
.
refreshToken
)
{
try
{
try
{
await
this
.
refreshToken
(
session
.
refreshToken
,
session
.
scope
,
session
.
id
);
await
this
.
refreshToken
(
session
.
refreshToken
,
session
.
scope
,
session
.
id
);
addedIds
.
push
(
session
.
id
);
addedIds
.
push
(
session
.
id
);
...
@@ -242,6 +246,10 @@ export class AzureActiveDirectoryService {
...
@@ -242,6 +246,10 @@ export class AzureActiveDirectoryService {
public
async
login
(
scope
:
string
):
Promise
<
vscode
.
AuthenticationSession2
>
{
public
async
login
(
scope
:
string
):
Promise
<
vscode
.
AuthenticationSession2
>
{
Logger
.
info
(
'
Logging in...
'
);
Logger
.
info
(
'
Logging in...
'
);
if
(
!
scope
.
includes
(
'
offline_access
'
))
{
Logger
.
info
(
'
Warning: The
\'
offline_access
\'
scope was not included, so the generated token will not be able to be refreshed.
'
);
}
return
new
Promise
(
async
(
resolve
,
reject
)
=>
{
return
new
Promise
(
async
(
resolve
,
reject
)
=>
{
if
(
vscode
.
env
.
uiKind
===
vscode
.
UIKind
.
Web
)
{
if
(
vscode
.
env
.
uiKind
===
vscode
.
UIKind
.
Web
)
{
resolve
(
this
.
loginWithoutLocalServer
(
scope
));
resolve
(
this
.
loginWithoutLocalServer
(
scope
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录