Fix samples (#165)

* Fix users and groups samples

* Update teams samples

Author: calebkiage

samples/3-UsersAndGroups.md

@@ -28,6 +28,15 @@ mgc users list --select "id, displayName, OfficeLocation, BusinessPhones" --quer
 
 ### Update the location of the user
 
+Powershell:
+
+```powershell
+$body = ConvertTo-Json '{"officeLocation": "NewLocation"}'
+mgc users item patch --user-id <UserId> --body $body
+```
+
+Bash:
+
 ```sh
 mgc users item patch --user-id <UserId> --body '{"officeLocation": "NewLocation"}'
 ```
@@ -70,6 +79,15 @@ mgc users item messages list --user-id <UserId> --filter "contains(subject,'Mark
 
 ### New Group
 
+Powershell:
+
+```powershell
+$body = ConvertTo-Json '{"displayName": "PowerFam", "mailEnabled": false, "mailNickName": "powerfam", "securityEnabled": true}'
+mgc groups create --body $body
+```
+
+Bash:
+
 ```sh
 mgc groups create --body '{"displayName": "PowerFam", "mailEnabled": false, "mailNickName": "powerfam", "securityEnabled": true}'
 ```
@@ -82,6 +100,16 @@ mgc groups item delete --group-id <GroupId>
 
 ### Create a new User
 
+PowerShell:
+
+```powershell
+$body = ConvertTo-Json '{"displayName": "Bob Brown", "accountEnabled": true, "passwordProfile": {"password": "password"},\
+        "mailNickname": "Bob.Brown", "userPrincipalName": "bob.brown@{tenantdomain}"}'
+mgc users create --body $body
+```
+
+Bash:
+
 ```sh
 mgc users create --body '{"displayName": "Bob Brown", "accountEnabled": true, "passwordProfile": {"password": "password"},\
         "mailNickname": "Bob.Brown", "userPrincipalName": "bob.brown@{tenantdomain}"}'

samples/4-Teams.md

@@ -1,39 +1,90 @@
 ### Create a new team
 
+PowerShell:
+
+```powershell
+$TeamName = "2020 Interns"
+$body = ConvertTo-Json '{"displayName": $TeamName, "description": $TeamName, "additionalProperties": { "[email protected]": "https://graph.microsoft.com/v1.0/teamsTemplates('standard')"}}'
+mgc teams create --body $body
+```
+
+Bash:
+
 ```sh
-mgc teams create --body '{"displayName": "2020 Interns", "description": "2020 Interns", \
+TeamName = "2020 Interns"
+mgc teams create --body '{"displayName": $TeamName, "description": $TeamName,
     "additionalProperties": {
-        "[email protected]" = "https://graph.microsoft.com/v1.0/teamsTemplates('standard')"
+        "[email protected]": "https://graph.microsoft.com/v1.0/teamsTemplates('standard')"
     }}'
 ```
 
 ### Filter groups by displayName and resourceProvisioningOptions to find team
 
+PowerShell:
+
+```powershell
+$InternsTeam = mgc groups list --filter "StartsWith(DisplayName, '$TeamName')" --query "value[?contains(resourceProvisioningOptions, 'Team')]"
+```
+
+Bash:
+
 ```sh
-mgc groups list --filter "StartsWith(DisplayName, '$TeamName')" --query "value[?contains(resourceProvisioningOptions, 'Team')]"
+InternsTeam=$(mgc groups list --filter "StartsWith(DisplayName, '$TeamName')" --query "value[?contains(resourceProvisioningOptions, 'Team')]")
 ```
 
 ### Add team owner
 
+PowerShell:
+
+```powershell
+$teamOwner=mgc users get --user-id "{TEAM_OWNER_UPN}"
+mgc teams item members create --team-id $InternsTeam.id --body '{"additionalProperties": {
+        "@odata.type": "#microsoft.graph.aadUserConversationMember",
+        "[email protected]": "https://graph.microsoft.com/v1.0/users/" + $teamOwner.id
+    }, "roles": ["owner"]}'
+```
+
+Bash:
+
 ```sh
-mgc users get --user-id "{TEAM_OWNER_UPN}"
-mgc teams item members create --team-id <TeamId> --body '{"additionalProperties": {\
-        "@odata.type": "#microsoft.graph.aadUserConversationMember",\
-        "[email protected]": "https://graph.microsoft.com/v1.0/users/" + $teamOwner.id\
+teamOwnerId=$(mgc users get --user-id "{TEAM_OWNER_UPN}" | grep -o '"id": "[^"]*' | grep -o '[^"]*$')
+teamId=$(echo $InternsTeam | grep -o '"id": "[^"]*' | grep -o '[^"]*$')
+
+mgc teams item members create --team-id $teamId --body '{"additionalProperties": {
+        "@odata.type": "#microsoft.graph.aadUserConversationMember",
+        "[email protected]": "https://graph.microsoft.com/v1.0/users/" + $teamOwnerId
     }, "roles": ["owner"]}'
 ```
 
 ### Send a welcome message to the channel
 
+PowerShell:
+
+```powershell
+$PrimaryChannel = mgc teams item primary-channel get --team-id $InternsTeam.id
+$body = ConvertTo-Json '{"body": {"content": "Welcome to Teams!"}}'
+mgc teams item channels item messages create --team-id $InternsTeam.id --channel-id $PrimaryChannel.id --body $body
+```
+
+Bash:
+
 ```sh
-mgc teams item primary-channel get --team-id <TeamId>
-mgc teams item channels item messages create --team-id <TeamId> --channel-id <ChannelId> --body '{"body": {"content": "Welcome to Teams!"}}'
+PrimaryChannelId=$(mgc teams item primary-channel get --team-id $teamId | grep -o '"id": "[^"]*' | grep -o '[^"]*$')
+mgc teams item channels item messages create --team-id $teamId --channel-id $PrimaryChannelId --body '{"body": {"content": "Welcome to Teams!"}}'
 ```
 
 ### Delete team
 
+PowerShell:
+
+```powershell
+mgc groups delete --group-id $InternsTeam.id
+```
+
+Bash:
+
 ```sh
-mgc groups delete --group-id <GroupId>
+mgc groups delete --group-id $teamId
 ```
 
 ### Teams Chat snippets
@@ -58,8 +109,22 @@ mgc chats item messages create --chat-id <ChatId> --body '{"body": {"content": "
 
 #### Mention a user in a channel message
 
+PowerShell:
+
+```powershell
+$user = mgc users item get --user-id <UserId> --select "id, displayName, userIdentityType"
+$body = ConvertTo-Json '{"body": {"contentType": "html", "content": "Welcome to the channel <at id=\'0\'>${user.displayName}</at>!"}, "mentions": [{"id": 0, "mentionText": "${user.displayName}", "mentioned": {"user": {"id": "${user.id}", "displayName": "${user.displayName}", "userIdentityType": "${user.userIdentityType}"}}}]}'
+mgc teams item channels item messages create --team-id <TeamId> --channel-id $PrimaryChannel.id \
+    --body $body
+```
+
+Bash:
+
 ```sh
-mgc users item get --user-id <UserId> --select "id, displayName, userIdentityType"
-mgc teams item channels item messages create --team-id <TeamId> --channel-id <ChannelId> \
-    --body $'{"body": {"contentType": "html", "content": "Welcome to the channel <at id=\'0\'>[DisplayName]</at>!"}, "mentions": [{"id": 0, "mentionText": "[DisplayName]", "mentioned": {"user": {"id": "[id]", "displayName": "[DisplayName]", "userIdentityType": "aadUser"}}}]}'
+user=$(mgc users item get --user-id <UserId> --select "id, displayName, userIdentityType")
+userId=$(echo $user | grep -o '"id": "[^"]*' | grep -o '[^"]*$')
+userDisplayName=$(echo $user | grep -o '"displayName": "[^"]*' | grep -o '[^"]*$')
+userIdentityType=$(echo $user | grep -o '"userIdentityType": "[^"]*' | grep -o '[^"]*$')
+mgc teams item channels item messages create --team-id <TeamId> --channel-id $PrimaryChannelId \
+    --body '{"body": {"contentType": "html", "content": "Welcome to the channel <at id=\'0\'>${userDisplayName}</at>!"}, "mentions": [{"id": 0, "mentionText": "${userDisplayName}", "mentioned": {"user": {"id": "${userId}", "displayName": "${userDisplayName}", "userIdentityType": "${userIdentityType}"}}}]}'
 ```