refactor(notation): use auth acesstoken when setting up notation authenticator

JasonTheDeveloper · JasonTheDeveloper · commit 5eed49be7adc · 2024-01-12T17:20:49.000+11:00
Signed-off-by: Jason &lt;jagoodse@microsoft.com&gt;
diff --git a/internal/oci/notation.go b/internal/oci/notation.go
@@ -162,11 +162,12 @@ func (v *NotaryVerifier) Verify(ctx context.Context, ref name.Reference) (bool,
 		}
 
 		credentialProvider = func(ctx context.Context, registry string) (oauth.Credential, error) {
-			if authConfig.Username != "" || authConfig.Password != "" || authConfig.IdentityToken != "" {
+			if authConfig.Username != "" || authConfig.Password != "" || authConfig.IdentityToken != "" || authConfig.RegistryToken != "" {
 				return oauth.Credential{
 					Username:     authConfig.Username,
 					Password:     authConfig.Password,
 					RefreshToken: authConfig.IdentityToken,
+					AccessToken:  authConfig.RegistryToken,
 				}, nil
 			}
 			return oauth.EmptyCredential, nil

Original file line number	Diff line number	Diff line change
`@@ -162,11 +162,12 @@ func (v *NotaryVerifier) Verify(ctx context.Context, ref name.Reference) (bool,`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`credentialProvider = func(ctx context.Context, registry string) (oauth.Credential, error) {`
`165`		`- if authConfig.Username != "" \|\| authConfig.Password != "" \|\| authConfig.IdentityToken != "" {`
	`165`	`+ if authConfig.Username != "" \|\| authConfig.Password != "" \|\| authConfig.IdentityToken != "" \|\| authConfig.RegistryToken != "" {`
`166`	`166`	`return oauth.Credential{`
`167`	`167`	`Username: authConfig.Username,`
`168`	`168`	`Password: authConfig.Password,`
`169`	`169`	`RefreshToken: authConfig.IdentityToken,`
	`170`	`+ AccessToken: authConfig.RegistryToken,`
`170`	`171`	`}, nil`
`171`	`172`	`}`
`172`	`173`	`return oauth.EmptyCredential, nil`