Skip to content

Commit 2442485

Browse files
authored
Doc fix (#36)
* doc fix * update actions
1 parent 983aaaa commit 2442485

File tree

12 files changed

+21
-16
lines changed

12 files changed

+21
-16
lines changed

.github/workflows/check-standard.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
config:
1818
- {os: windows-latest, r: 'release'}
1919
- {os: macOS-latest, r: 'release'}
20-
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
20+
- {os: ubuntu-24.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
2121

2222
env:
2323
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
2424
RSPM: ${{ matrix.config.rspm }}
2525

2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2828
with:
2929
fetch-depth: 0 # required for mirroring, see https://stackoverflow.com/a/64272409/474349
3030

@@ -54,11 +54,11 @@ jobs:
5454

5555
- name: Cache R packages
5656
if: runner.os != 'Windows'
57-
uses: actions/cache@v2
57+
uses: actions/cache@v3
5858
with:
5959
path: ${{ env.R_LIBS_USER }}
6060
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
61-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
61+
# restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-5-
6262

6363
- name: Install system dependencies
6464
if: runner.os == 'Linux'
@@ -85,7 +85,7 @@ jobs:
8585

8686
- name: Upload check results
8787
if: failure()
88-
uses: actions/upload-artifact@main
88+
uses: actions/upload-artifact@v4
8989
with:
9090
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
9191
path: check

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: AzureGraph
22
Title: Simple Interface to 'Microsoft Graph'
3-
Version: 1.3.4
3+
Version: 1.3.5
44
Authors@R: c(
55
person("Hong", "Ooi", , "[email protected]", role = c("aut", "cre")),
66
person("Microsoft", role="cph")
@@ -27,4 +27,4 @@ Suggests:
2727
rmarkdown,
2828
testthat
2929
Roxygen: list(markdown=TRUE, r6=FALSE, old_usage=TRUE)
30-
RoxygenNote: 7.1.1
30+
RoxygenNote: 7.3.1

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# AzureGraph 1.3.5
2+
3+
- Update documentation links for CRAN
4+
15
# AzureGraph 1.3.4
26

37
- Fix handling of OneDrive/SharePoint paths and other URLs that contain "#". Thanks to Jonathan Carroll (@jonocarroll).

R/batch.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public=list(
101101

102102
#' Call the Graph API batch endpoint
103103
#'
104-
#' @param token An Azure OAuth token, of class [AzureToken].
104+
#' @param token An Azure OAuth token, of class [AzureAuth::AzureToken].
105105
#' @param requests A list of [graph_request] objects, representing individual requests to the Graph API.
106106
#' @param depends_on An optional named vector, or TRUE. See below.
107107
#' @param api_version The API version to use, which will form part of the URL sent to the host.

R/call_graph.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#' Call the Microsoft Graph REST API
22
#'
3-
#' @param token An Azure OAuth token, of class [AzureToken].
3+
#' @param token An Azure OAuth token, of class [AzureAuth::AzureToken].
44
#' @param operation The operation to perform, which will form part of the URL path.
55
#' @param options A named list giving the URL query parameters.
66
#' @param api_version The API version to use, which will form part of the URL sent to the host.

R/graph_login.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#' @param ... Other arguments passed to `ms_graph$new()`.
1919
#'
2020
#' @details
21-
#' `create_graph_login` creates a login client to authenticate with Microsoft Graph, using the supplied arguments. The authentication token is obtained using [get_azure_token], which automatically caches and reuses tokens for subsequent sessions.
21+
#' `create_graph_login` creates a login client to authenticate with Microsoft Graph, using the supplied arguments. The authentication token is obtained using [AzureAuth::get_azure_token], which automatically caches and reuses tokens for subsequent sessions.
2222
#'
2323
#' For interactive use, you would normally _not_ supply the `username` and `password` arguments. Omitting them will prompt `create_graph_login` to authenticate you with AAD using your browser, which is the recommended method. If you don't have a browser available to your R session, for example if you're using RStudio Server or Azure Databricks, you can specify `auth_type="device_code`".
2424
#'

R/ms_graph.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#' - `password`: if `auth_type == "client_credentials"`, the app secret; if `auth_type == "resource_owner"`, your account password.
3535
#' - `username`: if `auth_type == "resource_owner"`, your username.
3636
#' - `certificate`: If `auth_type == "client_credentials", a certificate to authenticate with. This is a more secure alternative to using an app secret.
37-
#' - `auth_type`: The OAuth authentication method to use, one of "client_credentials", "authorization_code", "device_code" or "resource_owner". See [get_azure_token] for how the default method is chosen, along with some caveats.
37+
#' - `auth_type`: The OAuth authentication method to use, one of "client_credentials", "authorization_code", "device_code" or "resource_owner". See [AzureAuth::get_azure_token] for how the default method is chosen, along with some caveats.
3838
#' - `version`: The Azure Active Directory (AAD) version to use for authenticating.
3939
#' - `host`: your Microsoft Graph host. Defaults to `https://graph.microsoft.com/`.
4040
#' - `aad_host`: Azure Active Directory host for authentication. Defaults to `https://login.microsoftonline.com/`. Change this if you are using a government or private cloud.

man/call_batch_endpoint.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/call_graph.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/find_class_generator.Rd

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)