lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Remove github-access-token in favor of access-token.

Browse source
This commit is contained in:
Kevin Quick 2020-09-29 16:20:54 -07:00
parent 66c3959e8c
commit 5e7838512e
No known key found for this signature in database
GPG key ID: E6D7733599CC0A21
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libfetchers/github.cc
View file

@ -147,17 +147,7 @@ struct GitArchiveInputScheme : InputScheme
auto tokens = settings.accessTokens.get(); auto tokens = settings.accessTokens.get();
auto pat = tokens.find(host); auto pat = tokens.find(host);
if (pat == tokens.end()) if (pat == tokens.end())
{
if ("github.com" == host)
{
auto oldcfg = settings.githubAccessToken.get();
if (!oldcfg.empty()) {
warn("using deprecated 'github-access-token' config value; please use 'access-tokens' instead");
return oldcfg;
}
}
return std::nullopt; return std::nullopt;
}
return pat->second; return pat->second;
} }

3
src/libstore/globals.hh
View file

@ -859,9 +859,6 @@ public:
are loaded as plugins (non-recursively). are loaded as plugins (non-recursively).
)"}; )"};
Setting<std::string> githubAccessToken{this, "", "github-access-token",
"GitHub access token to get access to GitHub data through the GitHub API for `github:<..>` flakes (deprecated, please use 'access-tokens' instead)."};
Setting<StringMap> accessTokens{this, {}, "access-tokens", Setting<StringMap> accessTokens{this, {}, "access-tokens",
R"( R"(
Access tokens used to access protected GitHub, GitLab, or Access tokens used to access protected GitHub, GitLab, or