From f0f49435771352c4d1e432351675d10d9e23c099 Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Thu, 7 Sep 2023 11:49:36 -0700 Subject: [PATCH] fix get auth token --- server/auth.go | 2 +- server/images.go | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/auth.go b/server/auth.go index 3e35178f..4238b252 100644 --- a/server/auth.go +++ b/server/auth.go @@ -103,7 +103,7 @@ func getAuthToken(ctx context.Context, redirData AuthRedirect, regOpts *Registry headers := make(http.Header) headers.Set("Authorization", sig) - resp, err := makeRequest(ctx, "GET", redirectURL, headers, nil, regOpts) + resp, err := makeRequest(ctx, "GET", redirectURL, headers, nil, nil) if err != nil { log.Printf("couldn't get token: %q", err) } diff --git a/server/images.go b/server/images.go index 1356c9e9..91819910 100644 --- a/server/images.go +++ b/server/images.go @@ -1313,10 +1313,12 @@ func makeRequest(ctx context.Context, method string, requestURL *url.URL, header req.Header = headers } - if regOpts.Token != "" { - req.Header.Set("Authorization", "Bearer "+regOpts.Token) - } else if regOpts.Username != "" && regOpts.Password != "" { - req.SetBasicAuth(regOpts.Username, regOpts.Password) + if regOpts != nil { + if regOpts.Token != "" { + req.Header.Set("Authorization", "Bearer "+regOpts.Token) + } else if regOpts.Username != "" && regOpts.Password != "" { + req.SetBasicAuth(regOpts.Username, regOpts.Password) + } } req.Header.Set("User-Agent", fmt.Sprintf("ollama/%s (%s %s) Go/%s", version.Version, runtime.GOARCH, runtime.GOOS, runtime.Version()))