Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ca4ceeb8
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,发现更多精彩内容 >>
提交
ca4ceeb8
编写于
3月 16, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #90074
上级
733f9f8c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
2 deletion
+20
-2
src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
.../platform/userDataSync/common/userDataSyncStoreService.ts
+20
-2
未找到文件。
src/vs/platform/userDataSync/common/userDataSyncStoreService.ts
浏览文件 @
ca4ceeb8
...
@@ -13,12 +13,19 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
...
@@ -13,12 +13,19 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import
{
IAuthenticationTokenService
}
from
'
vs/platform/authentication/common/authentication
'
;
import
{
IAuthenticationTokenService
}
from
'
vs/platform/authentication/common/authentication
'
;
import
{
IProductService
}
from
'
vs/platform/product/common/productService
'
;
import
{
IProductService
}
from
'
vs/platform/product/common/productService
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
getServiceMachineId
}
from
'
vs/platform/serviceMachineId/common/serviceMachineId
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
import
{
assign
}
from
'
vs/base/common/objects
'
;
export
class
UserDataSyncStoreService
extends
Disposable
implements
IUserDataSyncStoreService
{
export
class
UserDataSyncStoreService
extends
Disposable
implements
IUserDataSyncStoreService
{
_serviceBrand
:
any
;
_serviceBrand
:
any
;
readonly
userDataSyncStore
:
IUserDataSyncStore
|
undefined
;
readonly
userDataSyncStore
:
IUserDataSyncStore
|
undefined
;
private
readonly
commonHeadersPromise
:
Promise
<
{
[
key
:
string
]:
string
;
}
>
;
constructor
(
constructor
(
@
IProductService
productService
:
IProductService
,
@
IProductService
productService
:
IProductService
,
...
@@ -26,9 +33,17 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
...
@@ -26,9 +33,17 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
@
IRequestService
private
readonly
requestService
:
IRequestService
,
@
IRequestService
private
readonly
requestService
:
IRequestService
,
@
IAuthenticationTokenService
private
readonly
authTokenService
:
IAuthenticationTokenService
,
@
IAuthenticationTokenService
private
readonly
authTokenService
:
IAuthenticationTokenService
,
@
IUserDataSyncLogService
private
readonly
logService
:
IUserDataSyncLogService
,
@
IUserDataSyncLogService
private
readonly
logService
:
IUserDataSyncLogService
,
@
IEnvironmentService
environmentService
:
IEnvironmentService
,
@
IFileService
fileService
:
IFileService
,
@
IStorageService
storageService
:
IStorageService
,
)
{
)
{
super
();
super
();
this
.
userDataSyncStore
=
getUserDataSyncStore
(
productService
,
configurationService
);
this
.
userDataSyncStore
=
getUserDataSyncStore
(
productService
,
configurationService
);
this
.
commonHeadersPromise
=
getServiceMachineId
(
environmentService
,
fileService
,
storageService
)
.
then
(
uuid
=>
({
'
X-Sync-Client-Id
'
:
productService
.
version
,
'
X-Sync-Machine-Id
'
:
uuid
}));
}
}
async
getAllRefs
(
resource
:
SyncResource
):
Promise
<
IResourceRefHandle
[]
>
{
async
getAllRefs
(
resource
:
SyncResource
):
Promise
<
IResourceRefHandle
[]
>
{
...
@@ -174,8 +189,11 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
...
@@ -174,8 +189,11 @@ export class UserDataSyncStoreService extends Disposable implements IUserDataSyn
if
(
!
authToken
)
{
if
(
!
authToken
)
{
throw
new
UserDataSyncStoreError
(
'
No Auth Token Available
'
,
UserDataSyncErrorCode
.
Unauthorized
,
source
);
throw
new
UserDataSyncStoreError
(
'
No Auth Token Available
'
,
UserDataSyncErrorCode
.
Unauthorized
,
source
);
}
}
options
.
headers
=
options
.
headers
||
{};
options
.
headers
[
'
authorization
'
]
=
`Bearer
${
authToken
}
`
;
const
commonHeaders
=
await
this
.
commonHeadersPromise
;
options
.
headers
=
assign
(
options
.
headers
||
{},
commonHeaders
,
{
'
authorization
'
:
`Bearer
${
authToken
}
`
,
});
this
.
logService
.
trace
(
'
Sending request to server
'
,
{
url
:
options
.
url
,
type
:
options
.
type
,
headers
:
{
...
options
.
headers
,
...{
authorization
:
undefined
}
}
});
this
.
logService
.
trace
(
'
Sending request to server
'
,
{
url
:
options
.
url
,
type
:
options
.
type
,
headers
:
{
...
options
.
headers
,
...{
authorization
:
undefined
}
}
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录