sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reuse getAuthenticatedContext

Browse Source
This commit is contained in:
Benedikt Kulmann
2020-10-24 06:21:52 +02:00
parent 0f03d8c52c
commit 70b47484f5
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accounts/pkg/indexer/index/cs3/autoincrement.go
+4 -12
View File
@@ -99,12 +99,10 @@ func (idx *Autoincrement) Init() error {
idx.storageProvider = client
ctx := context.Background()
tk, err := idx.authenticate(ctx)
ctx, err := idx.getAuthenticatedContext(context.Background())
if err != nil {
return err
}
ctx = metadata.AppendToOutgoingContext(ctx, token.TokenHeader, tk)
if err := idx.makeDirIfNotExists(ctx, idx.indexBaseDir); err != nil {
return err
@@ -170,14 +168,12 @@ func (idx *Autoincrement) Remove(id string, v string) error {
return err
}
ctx := context.Background()
t, err := idx.authenticate(ctx)
ctx, err := idx.getAuthenticatedContext(context.Background())
if err != nil {
return err
}
deletePath := path.Join("/meta", idx.indexRootDir, v)
ctx = metadata.AppendToOutgoingContext(ctx, token.TokenHeader, t)
resp, err := idx.storageProvider.Delete(ctx, &provider.DeleteRequest{
Ref: &provider.Reference{
Spec: &provider.Reference_Path{Path: deletePath},
@@ -211,13 +207,11 @@ func (idx *Autoincrement) Update(id, oldV, newV string) error {
// Search allows for glob search on the index.
func (idx *Autoincrement) Search(pattern string) ([]string, error) {
ctx := context.Background()
t, err := idx.authenticate(ctx)
ctx, err := idx.getAuthenticatedContext(context.Background())
if err != nil {
return nil, err
}
ctx = metadata.AppendToOutgoingContext(ctx, token.TokenHeader, t)
res, err := idx.storageProvider.ListContainer(ctx, &provider.ListContainerRequest{
Ref: &provider.Reference{
Spec: &provider.Reference_Path{Path: path.Join("/meta", idx.indexRootDir)},
@@ -326,13 +320,11 @@ func (idx *Autoincrement) authenticate(ctx context.Context) (token string, err e
}
func (idx *Autoincrement) next() (int, error) {
ctx := context.Background()
t, err := idx.authenticate(ctx)
ctx, err := idx.getAuthenticatedContext(context.Background())
if err != nil {
return -1, err
}
ctx = metadata.AppendToOutgoingContext(ctx, token.TokenHeader, t)
res, err := idx.storageProvider.ListContainer(ctx, &provider.ListContainerRequest{
Ref: &provider.Reference{
Spec: &provider.Reference_Path{Path: path.Join("/meta", idx.indexRootDir)},