Skip to content

Commit cab6626

Browse files
committed
Update ppm sso token file keys
Cf. r-lib/pak#848 (comment)
1 parent c76466a commit cab6626

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

R/ppm-sso.R

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ ppm_sso_logout <- function() {
7676
tokens <- try_catch_null({
7777
tokens <- suppressWarnings(tstoml::ts_read_toml(token_file_path))
7878
urls <- ts::ts_tree_unserialize(
79-
ts::ts_tree_select(tokens, list("connection", TRUE, "url"))
79+
ts::ts_tree_select(tokens, list("connections", TRUE, "address"))
8080
)
8181
idx <- which(urls == ppm_url)[1]
8282
tokens
@@ -87,7 +87,7 @@ ppm_sso_logout <- function() {
8787
}
8888

8989
tokens <- ts::ts_tree_delete(
90-
ts::ts_tree_select(tokens, list("connection", idx))
90+
ts::ts_tree_select(tokens, list("connections", idx))
9191
)
9292

9393
ts::ts_tree_write(tokens, token_file_path)
@@ -357,7 +357,7 @@ ppm_sso_get_existing_token <- function(ppm_url, valid = TRUE) {
357357
path <- ppm_sso_token_path()
358358
try_catch_null({
359359
ts_tokens <- suppressWarnings(tstoml::ts_read_toml(path))
360-
for (conn in ts_tokens[[list("connection", TRUE)]]) {
360+
for (conn in ts_tokens[[list("connections", TRUE)]]) {
361361
if (identical(conn$url, ppm_url)) {
362362
if (valid && !ppm_sso_can_authenticate(ppm_url, conn$token)) {
363363
return(NULL)
@@ -469,31 +469,31 @@ ppm_sso_write_token_to_file <- function(ppm_url, token) {
469469
token_file_path <- ppm_sso_token_path()
470470
mkdirp(dirname(token_file_path))
471471
new_conn <- list(
472-
url = ppm_url,
472+
address = ppm_url,
473473
token = token,
474-
method = "sso"
474+
auth_type = "sso"
475475
)
476476

477477
tokens <- try_catch_null({
478478
tokens <- suppressWarnings(tstoml::ts_read_toml(token_file_path))
479479
urls <- ts::ts_tree_unserialize(
480-
ts::ts_tree_select(tokens, list("connection", TRUE, "url"))
480+
ts::ts_tree_select(tokens, list("connections", TRUE, "address"))
481481
)
482482
idx <- which(urls == ppm_url)[1]
483483
tokens
484484
})
485485

486486
if (is.null(tokens)) {
487487
tokens <- tstoml::ts_parse_toml("")
488-
tokens <- ts::ts_tree_insert(tokens, key = "connection", list(new_conn))
488+
tokens <- ts::ts_tree_insert(tokens, key = "connections", list(new_conn))
489489
} else if (!is.na(idx)) {
490490
tokens <- ts::ts_tree_update(
491-
ts::ts_tree_select(tokens, list("connection", idx, "token")),
491+
ts::ts_tree_select(tokens, list("connections", idx, "token")),
492492
new_conn$token
493493
)
494494
} else {
495495
tokens <- ts::ts_tree_insert(
496-
ts::ts_tree_select(tokens, "connection"),
496+
ts::ts_tree_select(tokens, "connections"),
497497
list(new_conn)
498498
)
499499
}

0 commit comments

Comments
 (0)