Merge to publish

CODE_OF_CONDUCT.md

@@ -0,0 +1,10 @@
+# Microsoft Open Source Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+
+Resources:
+
+- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
+- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
+- Contact [[email protected]](mailto:[email protected]) with questions or concerns
+- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support)

app-auth/graphapponlytutorial/app/build.gradle

@@ -22,9 +22,9 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
 
     // This dependency is used by the application.
-    implementation 'com.google.guava:guava:31.1-jre'
-    implementation 'com.azure:azure-identity:1.11.1'
-    implementation 'com.microsoft.graph:microsoft-graph:5.77.0'
+    implementation 'com.google.guava:guava:33.2.1-jre'
+    implementation 'com.azure:azure-identity:1.13.0'
+    implementation 'com.microsoft.graph:microsoft-graph:6.13.0'
 }
 // </DependenciesSnippet>
 

app-auth/graphapponlytutorial/app/src/main/java/graphapponlytutorial/App.java

@@ -10,8 +10,8 @@
 import java.util.Scanner;
 
 import com.microsoft.graph.models.User;
-import com.microsoft.graph.requests.UserCollectionPage;
 // </ImportSnippet>
+import com.microsoft.graph.models.UserCollectionResponse;
 
 public class App {
     // <MainSnippet>
@@ -102,16 +102,16 @@ private static void displayAccessToken() {
     // <ListUsersSnippet>
     private static void listUsers() {
         try {
-            final UserCollectionPage users = Graph.getUsers();
+            final UserCollectionResponse users = Graph.getUsers();
 
             // Output each user's details
-            for (User user: users.getCurrentPage()) {
-                System.out.println("User: " + user.displayName);
-                System.out.println("  ID: " + user.id);
-                System.out.println("  Email: " + user.mail);
+            for (User user: users.getValue()) {
+                System.out.println("User: " + user.getDisplayName());
+                System.out.println("  ID: " + user.getId());
+                System.out.println("  Email: " + user.getMail());
             }
 
-            final Boolean moreUsersAvailable = users.getNextPage() != null;
+            final Boolean moreUsersAvailable = users.getOdataNextLink() != null;
             System.out.println("\nMore users available? " + moreUsersAvailable);
         } catch (Exception e) {
             System.out.println("Error getting users");

app-auth/graphapponlytutorial/app/src/main/java/graphapponlytutorial/Graph.java

@@ -4,25 +4,21 @@
 // <ImportSnippet>
 package graphapponlytutorial;
 
-import java.util.List;
 import java.util.Properties;
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.credential.TokenRequestContext;
 import com.azure.identity.ClientSecretCredential;
 import com.azure.identity.ClientSecretCredentialBuilder;
-import com.microsoft.graph.authentication.TokenCredentialAuthProvider;
-import com.microsoft.graph.requests.GraphServiceClient;
-import com.microsoft.graph.requests.UserCollectionPage;
-
-import okhttp3.Request;
+import com.microsoft.graph.models.UserCollectionResponse;
+import com.microsoft.graph.serviceclient.GraphServiceClient;
 // </ImportSnippet>
 
 public class Graph {
     // <AppOnyAuthConfigSnippet>
     private static Properties _properties;
     private static ClientSecretCredential _clientSecretCredential;
-    private static GraphServiceClient<Request> _appClient;
+    private static GraphServiceClient _appClient;
 
     public static void initializeGraphForAppOnlyAuth(Properties properties) throws Exception {
         // Ensure properties isn't null
@@ -45,14 +41,8 @@ public static void initializeGraphForAppOnlyAuth(Properties properties) throws E
         }
 
         if (_appClient == null) {
-            final TokenCredentialAuthProvider authProvider =
-                new TokenCredentialAuthProvider(
-                    // Use the .default scope when using app-only auth
-                    List.of("https://graph.microsoft.com/.default"), _clientSecretCredential);
-
-            _appClient = GraphServiceClient.builder()
-                .authenticationProvider(authProvider)
-                .buildClient();
+            _appClient = new GraphServiceClient(_clientSecretCredential,
+                    new String[] { "https://graph.microsoft.com/.default" });
         }
     }
     // </AppOnyAuthConfigSnippet>
@@ -76,18 +66,17 @@ public static String getAppOnlyToken() throws Exception {
     // </GetAppOnlyTokenSnippet>
 
     // <GetUsersSnippet>
-    public static UserCollectionPage getUsers() throws Exception {
+    public static UserCollectionResponse getUsers() throws Exception {
         // Ensure client isn't null
         if (_appClient == null) {
             throw new Exception("Graph has not been initialized for app-only auth");
         }
 
-        return _appClient.users()
-            .buildRequest()
-            .select("displayName,id,mail")
-            .top(25)
-            .orderBy("displayName")
-            .get();
+        return _appClient.users().get(requestConfig -> {
+            requestConfig.queryParameters.select = new String[] { "displayName", "id", "mail" };
+            requestConfig.queryParameters.top = 25;
+            requestConfig.queryParameters.orderby = new String[] { "displayName" };
+        });
     }
     // </GetUsersSnippet>
 

app-auth/graphapponlytutorial/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

app-auth/graphapponlytutorial/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

app-auth/graphapponlytutorial/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

user-auth/graphtutorial/app/build.gradle

@@ -22,9 +22,9 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
 
     // This dependency is used by the application.
-    implementation 'com.google.guava:guava:31.1-jre'
-    implementation 'com.azure:azure-identity:1.11.1'
-    implementation 'com.microsoft.graph:microsoft-graph:5.77.0'
+    implementation 'com.google.guava:guava:33.2.1-jre'
+    implementation 'com.azure:azure-identity:1.13.0'
+    implementation 'com.microsoft.graph:microsoft-graph:6.13.0'
 }
 // </DependenciesSnippet>
 

user-auth/graphtutorial/app/src/main/java/graphtutorial/App.java

@@ -13,8 +13,8 @@
 import java.util.Scanner;
 
 import com.microsoft.graph.models.Message;
+import com.microsoft.graph.models.MessageCollectionResponse;
 import com.microsoft.graph.models.User;
-import com.microsoft.graph.requests.MessageCollectionPage;
 // </ImportSnippet>
 
 public class App {
@@ -105,8 +105,8 @@ private static void greetUser() {
             final User user = Graph.getUser();
             // For Work/school accounts, email is in mail property
             // Personal accounts, email is in userPrincipalName
-            final String email = user.mail == null ? user.userPrincipalName : user.mail;
-            System.out.println("Hello, " + user.displayName + "!");
+            final String email = user.getMail() == null ? user.getUserPrincipalName() : user.getMail();
+            System.out.println("Hello, " + user.getDisplayName() + "!");
             System.out.println("Email: " + email);
         } catch (Exception e) {
             System.out.println("Error getting user");
@@ -130,20 +130,20 @@ private static void displayAccessToken() {
     // <ListInboxSnippet>
     private static void listInbox() {
         try {
-            final MessageCollectionPage messages = Graph.getInbox();
+            final MessageCollectionResponse messages = Graph.getInbox();
 
             // Output each message's details
-            for (Message message: messages.getCurrentPage()) {
-                System.out.println("Message: " + message.subject);
-                System.out.println("  From: " + message.from.emailAddress.name);
-                System.out.println("  Status: " + (message.isRead ? "Read" : "Unread"));
-                System.out.println("  Received: " + message.receivedDateTime
+            for (Message message: messages.getValue()) {
+                System.out.println("Message: " + message.getSubject());
+                System.out.println("  From: " + message.getFrom().getEmailAddress().getName());
+                System.out.println("  Status: " + (message.getIsRead() ? "Read" : "Unread"));
+                System.out.println("  Received: " + message.getReceivedDateTime()
                     // Values are returned in UTC, convert to local time zone
                     .atZoneSameInstant(ZoneId.systemDefault()).toLocalDateTime()
                     .format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT)));
             }
 
-            final Boolean moreMessagesAvailable = messages.getNextPage() != null;
+            final Boolean moreMessagesAvailable = messages.getOdataNextLink() != null;
             System.out.println("\nMore messages available? " + moreMessagesAvailable);
         } catch (Exception e) {
             System.out.println("Error getting inbox");
@@ -158,7 +158,7 @@ private static void sendMail() {
             // Send mail to the signed-in user
             // Get the user for their email address
             final User user = Graph.getUser();
-            final String email = user.mail == null ? user.userPrincipalName : user.mail;
+            final String email = user.getMail() == null ? user.getUserPrincipalName() : user.getMail();
 
             Graph.sendMail("Testing Microsoft Graph", "Hello world!", email);
             System.out.println("\nMail sent.");