Worklytics · eschultink · Dec 4, 2024 · Nov 12, 2024 · Nov 12, 2024 · Dec 4, 2024
diff --git a/...es/microsoft-365/msft-teams/example-api-responses/original/Users_onlineMeetings_v1.0.json b/...es/microsoft-365/msft-teams/example-api-responses/original/Users_onlineMeetings_v1.0.json
@@ -28,7 +28,7 @@
             "displayName": "Tyler Stein"
           }
         },
-        "upn": "upn-value"
+        "upn": "foo@some-domain.com"
       }
     ],
     "organizer": {
@@ -57,4 +57,4 @@
   },
   "isEntryExitAnnounced": true,
   "allowedPresenters": "everyone"
-}
+}
diff --git a/...s/microsoft-365/msft-teams/example-api-responses/sanitized/Users_onlineMeetings_v1.0.json b/...s/microsoft-365/msft-teams/example-api-responses/sanitized/Users_onlineMeetings_v1.0.json
@@ -26,8 +26,7 @@
             "@odata.type":"#microsoft.graph.identity",
             "id":"112f7296-5ca-bae8-6a692b15d4b8"
           }
-        },
-        "upn":"upn-value"
+        }
       }
     ],
     "organizer":{
@@ -37,8 +36,7 @@
           "@odata.type":"#microsoft.graph.identity",
           "id":"5810cedeb-b2c1-e9bd5d53ec96"
         }
-      },
-      "upn":"upn-value"
+      }
     }
   },
   "startDateTime":"2018-05-30T00:30:00Z",
@@ -52,4 +50,4 @@
   },
   "isEntryExitAnnounced":true,
   "allowedPresenters":"everyone"
-}
+}
diff --git a/...xample-api-responses/sanitized_no-userIds/Users_onlineMeetings_attendanceReport_v1.0.json b/...xample-api-responses/sanitized_no-userIds/Users_onlineMeetings_attendanceReport_v1.0.json
@@ -9,7 +9,7 @@
       "totalAttendanceInSeconds":1152,
       "role":"Presenter",
       "identity":{
-        "id":"dc17674c-81d9-4adb-bfb2-8f6a442e4623",
+        "id":"{\"scope\":\"azure-ad\",\"hash\":\"MwYK48L-UYMIsFrz1EHA4xX8hwfxJQfyg_L-vtEV1Mc\"}",
         "tenantId":null
       },
       "attendanceIntervals":[

diff --git a/...-365/msft-teams/example-api-responses/sanitized_no-userIds/Users_onlineMeetings_v1.0.json b/...-365/msft-teams/example-api-responses/sanitized_no-userIds/Users_onlineMeetings_v1.0.json
@@ -21,17 +21,15 @@
           "user":{
             "id":"{\"scope\":\"azure-ad\",\"hash\":\"KvrBhIhPrAEMwI320CqhyGSfgVmKedObWZ5X380uX04\"}"
           }
-        },
-        "upn":"upn-value"
+        }
       }
     ],
     "organizer":{
       "identity":{
         "user":{
           "id":"{\"scope\":\"azure-ad\",\"hash\":\"OkGYJKhA8lYaD0IJw3YHj8cB9qiSMw6MA_70P99wa3o\"}"
         }
-      },
-      "upn":"upn-value"
+      }
     }
   },
   "startDateTime":"2018-05-30T00:30:00Z",
@@ -45,4 +43,4 @@
   },
   "isEntryExitAnnounced":true,
   "allowedPresenters":"everyone"
-}
+}
diff --git a/docs/sources/microsoft-365/msft-teams/msft-teams.yaml b/docs/sources/microsoft-365/msft-teams/msft-teams.yaml
@@ -221,6 +221,7 @@ endpoints:
           - "$..joinInformation"
           - "$..joinMeetingIdSettings.isPasscodeRequired"
           - "$..joinMeetingIdSettings.passcode"
+          - "$..upn"
   - pathTemplate: "/v1.0/users/{userId}/onlineMeetings/{meetingId}/attendanceReports"
     allowedQueryParams:
       - "$select"
@@ -248,6 +249,7 @@ endpoints:
           - "$..joinInformation"
           - "$..joinMeetingIdSettings.isPasscodeRequired"
           - "$..joinMeetingIdSettings.passcode"
+          - "$..upn"
   - pathTemplate: "/v1.0/users/{userId}/onlineMeetings/{meetingId}/attendanceReports/{reportId}"
     allowedQueryParams:
       - "$select"
@@ -275,6 +277,7 @@ endpoints:
           - "$..joinInformation"
           - "$..joinMeetingIdSettings.isPasscodeRequired"
           - "$..joinMeetingIdSettings.passcode"
+          - "$..upn"
   - pathRegex: "^/v1.0/users/?[^/]*"
     allowedQueryParams:
       - "$top"

diff --git a/docs/sources/microsoft-365/msft-teams/msft-teams_no-userIds.yaml b/docs/sources/microsoft-365/msft-teams/msft-teams_no-userIds.yaml
@@ -243,6 +243,10 @@ endpoints:
         jsonPaths:
           - "$..emailAddress"
         encoding: "JSON"
+      - !<pseudonymize>
+        jsonPaths:
+          - "$..identity.id"
+        encoding: "JSON"
       - !<pseudonymize>
         jsonPaths:
           - "$..user.id"
@@ -255,6 +259,7 @@ endpoints:
           - "$..joinInformation"
           - "$..joinMeetingIdSettings.isPasscodeRequired"
           - "$..joinMeetingIdSettings.passcode"
+          - "$..upn"
       - !<redact>
         jsonPaths:
           - "$..['@odata.context']"
@@ -272,6 +277,10 @@ endpoints:
         jsonPaths:
           - "$..emailAddress"
         encoding: "JSON"
+      - !<pseudonymize>
+        jsonPaths:
+          - "$..identity.id"
+        encoding: "JSON"
       - !<pseudonymize>
         jsonPaths:
           - "$..user.id"
@@ -284,6 +293,7 @@ endpoints:
           - "$..joinInformation"
           - "$..joinMeetingIdSettings.isPasscodeRequired"
           - "$..joinMeetingIdSettings.passcode"
+          - "$..upn"
       - !<redact>
         jsonPaths:
           - "$..['@odata.context']"
@@ -305,6 +315,10 @@ endpoints:
         jsonPaths:
           - "$..emailAddress"
         encoding: "JSON"
+      - !<pseudonymize>
+        jsonPaths:
+          - "$..identity.id"
+        encoding: "JSON"
       - !<tokenize>
         jsonPaths:
           - "$.['@odata.nextLink', '@odata.prevLink', 'sessions@odata.nextLink']"
@@ -316,6 +330,7 @@ endpoints:
           - "$..joinInformation"
           - "$..joinMeetingIdSettings.isPasscodeRequired"
           - "$..joinMeetingIdSettings.passcode"
+          - "$..upn"
           - "$..['@odata.context']"
           - "$..['@odata.type']"
   - pathRegex: "^/v1.0/users(/p~[a-zA-Z0-9_-]+?)?[^/]*"

diff --git a/docs/sources/slack/discovery.yaml b/docs/sources/slack/discovery.yaml
@@ -11,6 +11,10 @@ endpoints:
       - !<pseudonymize>
         jsonPaths:
           - "$.users[*].id"
+        includeReversible: true
+        encoding: "URL_SAFE_TOKEN"
+      - !<pseudonymize>
+        jsonPaths:
           - "$.users[*].profile.email"
           - "$.users[*].profile.guest_invited_by"
         encoding: "JSON"
@@ -20,6 +24,11 @@ endpoints:
           - "$.users[*].profile['title','phone','skype','first_name','last_name','real_name','real_name_normalized','display_name','display_name_normalized']"
           - "$.users[*].profile['fields','pronouns','status_text','status_emoji','status_emoji_display_info','status_expiration','avatar_hash']"
           - "$.users[*].profile['image_original','is_custom_image','image_24','image_32','image_48','image_72','image_192','image_512','image_1024','status_text_canonical']"
+  - pathTemplate: "/api/discovery.user.conversations"
+    transforms:
+      - !<redact>
+        jsonPaths:
+          - "$.channels[*]['name','topic','purpose']"
   - pathTemplate: "/api/discovery.conversations.list"
     transforms:
       - !<redact>
@@ -44,6 +53,7 @@ endpoints:
       - !<pseudonymize>
         jsonPaths:
           - "$.messages[*].user"
+          - "$.messages[*].inviter"
           - "$.messages[*].files[*].user"
           - "$.messages[*].reactions[*].users[*]"
           - "$.messages[*].replies[*].user"

diff --git a/docs/sources/slack/example-api-responses/original/discovery-user-conversations.json b/docs/sources/slack/example-api-responses/original/discovery-user-conversations.json
@@ -0,0 +1,36 @@
+{
+  "ok": true,
+  "offset": "D123ABC890",
+  "channels": [
+    {
+      "id": "G123ABC456",
+      "team_id": "T0123ABC456",
+      "date_joined": 1538411458,
+      "date_left": 0,
+      "is_private": true,
+      "is_im": false,
+      "is_mpim": false,
+      "is_ext_shared": false
+    },
+    {
+      "id": "D0123ABC456",
+      "team_id": "E0123ABC456",
+      "date_joined": 1538411250,
+      "date_left": 0,
+      "is_private": true,
+      "is_im": true,
+      "is_mpim": false,
+      "is_ext_shared": false
+    },
+    {
+      "id": "C123ABC892",
+      "team_id": "T0123ABC456",
+      "date_joined": 1538411250,
+      "date_left": 1538411359,
+      "is_private": false,
+      "is_im": false,
+      "is_mpim": false,
+      "is_ext_shared": false
+    }
+  ]
+}
diff --git a/docs/sources/slack/example-api-responses/sanitized/discovery-user-conversations.json b/docs/sources/slack/example-api-responses/sanitized/discovery-user-conversations.json
@@ -0,0 +1,36 @@
+{
+  "ok":true,
+  "offset":"D123ABC890",
+  "channels":[
+    {
+      "id":"G123ABC456",
+      "team_id":"T0123ABC456",
+      "date_joined":1538411458,
+      "date_left":0,
+      "is_private":true,
+      "is_im":false,
+      "is_mpim":false,
+      "is_ext_shared":false
+    },
+    {
+      "id":"D0123ABC456",
+      "team_id":"E0123ABC456",
+      "date_joined":1538411250,
+      "date_left":0,
+      "is_private":true,
+      "is_im":true,
+      "is_mpim":false,
+      "is_ext_shared":false
+    },
+    {
+      "id":"C123ABC892",
+      "team_id":"T0123ABC456",
+      "date_joined":1538411250,
+      "date_left":1538411359,
+      "is_private":false,
+      "is_im":false,
+      "is_mpim":false,
+      "is_ext_shared":false
+    }
+  ]
+}
diff --git a/docs/sources/slack/example-api-responses/sanitized/discovery-users-list.json b/docs/sources/slack/example-api-responses/sanitized/discovery-users-list.json
@@ -2,7 +2,7 @@
   "ok":true,
   "users":[
     {
-      "id":"{\"scope\":\"slack\",\"hash\":\"BZcy5qhkyGyUTWR9hC_my2o6pHLKA4C8MHUHRy1K5Ts\"}",
+      "id":"p~BZcy5qhkyGyUTWR9hC_my2o6pHLKA4C8MHUHRy1K5TuugNC6SKYHB4eIKRZ4cFOg",
       "deleted":false,
       "color":"e7392d",
       "tz":"America/Los_Angeles",
@@ -27,7 +27,7 @@
       ]
     },
     {
-      "id":"{\"scope\":\"slack\",\"hash\":\"fyCnHbAdterJaFBMVnh6bo_qduSAt-k18eEgbYN_FqI\"}",
+      "id":"p~fyCnHbAdterJaFBMVnh6bo_qduSAt-k18eEgbYN_FqLZ-38BzAOn6weILvGYSJN4",
       "deleted":false,
       "color":"4bbe2e",
       "tz":"America/Los_Angeles",
@@ -53,7 +53,7 @@
       ]
     },
     {
-      "id":"{\"scope\":\"slack\",\"hash\":\"mJlhl3xv52fNY6wyUps5mBYPCl1nVWHT442eQ7v-lJw\"}",
+      "id":"p~mJlhl3xv52fNY6wyUps5mBYPCl1nVWHT442eQ7v-lJyurnRXe1xte4bUgJLOS0DP",
       "deleted":false,
       "color":"9f69e7",
       "tz":"America/Los_Angeles",
@@ -78,4 +78,4 @@
       ]
     }
   ]
-}
+}
diff --git a/infra/examples-dev/aws-all/google-workspace.tf b/infra/examples-dev/aws-all/google-workspace.tf
@@ -8,7 +8,7 @@ provider "google" {
 
 module "worklytics_connectors_google_workspace" {
   source = "../../modules/worklytics-connectors-google-workspace"
-  # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.61"
+  # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-google-workspace?ref=v0.4.62"
 
   providers = {
     google = google.google_workspace

diff --git a/infra/examples-dev/aws-all/main.tf b/infra/examples-dev/aws-all/main.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3, < 1.10"
+  required_version = ">= 1.3, < 1.11"
 
   required_providers {
     # for the infra that will host Psoxy instances
@@ -21,7 +21,7 @@ terraform {
 # general cases
 module "worklytics_connectors" {
   source = "../../modules/worklytics-connectors"
-  # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.61"
+  # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors?ref=v0.4.62"
 
   enabled_connectors               = var.enabled_connectors
   jira_cloud_id                    = var.jira_cloud_id
@@ -101,7 +101,7 @@ locals {
 
 module "psoxy" {
   source = "../../modules/aws-host"
-  # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=v0.4.61"
+  # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-host?ref=v0.4.62"
 
   environment_name                     = var.environment_name
   aws_account_id                       = var.aws_account_id
@@ -159,7 +159,7 @@ module "connection_in_worklytics" {
   for_each = local.all_instances
 
   source = "../../modules/worklytics-psoxy-connection-aws"
-  # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-aws?ref=v0.4.61"
+  # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-psoxy-connection-aws?ref=v0.4.62"
 
   psoxy_instance_id    = each.key
   worklytics_host      = var.worklytics_host

diff --git a/infra/examples-dev/aws-all/msft-365.tf b/infra/examples-dev/aws-all/msft-365.tf
@@ -2,7 +2,7 @@
 
 module "worklytics_connectors_msft_365" {
   source = "../../modules/worklytics-connectors-msft-365"
-  # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.61"
+  # source = "git::https://github.com/worklytics/psoxy//infra/modules/worklytics-connectors-msft-365?ref=v0.4.62"
 
   enabled_connectors                         = var.enabled_connectors
   environment_id                             = var.environment_name
@@ -48,7 +48,7 @@ module "cognito_identity_pool" {
   count = local.msft_365_enabled ? 1 : 0 # only provision identity pool if MSFT-365 connectors are enabled
 
   source = "../../modules/aws-cognito-pool"
-  # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.4.61"
+  # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-pool?ref=v0.4.62"
 
   developer_provider_name = local.developer_provider_name
   name                    = "${local.env_qualifier}-azure-ad-federation"
@@ -71,7 +71,7 @@ module "cognito_identity" {
   count = local.msft_365_enabled ? 1 : 0 # only provision identity pool if MSFT-365 connectors are enabled
 
   source = "../../modules/aws-cognito-identity-cli"
-  # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=v0.4.61"
+  # source = "git::https://github.com/worklytics/psoxy//infra/modules/aws-cognito-identity-cli?ref=v0.4.62"
 
   aws_region       = data.aws_region.current.id
   aws_role         = var.aws_assume_role_arn
@@ -108,7 +108,7 @@ module "msft_connection_auth_federation" {
   for_each = local.provision_entraid_apps ? local.enabled_to_entraid_object : local.shared_to_entraid_object
 
   source = "../../modules/azuread-federated-credentials"
-  # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.61"
+  # source = "git::https://github.com/worklytics/psoxy//infra/modules/azuread-federated-credentials?ref=v0.4.62"
 
   application_object_id = each.value.connector_id
   display_name          = "${local.env_qualifier}AccessFromAWS"

diff --git a/infra/examples-dev/aws-google-workspace/main.tf b/infra/examples-dev/aws-google-workspace/main.tf
@@ -59,7 +59,7 @@ data "google_project" "psoxy-google-connectors" {
 
 module "psoxy" {
   source = "../../modular-examples/aws-google-workspace"
-  # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-google-workspace?ref=v0.4.61"
+  # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-google-workspace?ref=v0.4.62"
 
   aws_account_id                 = var.aws_account_id
   aws_assume_role_arn            = var.aws_assume_role_arn # role that can test the instances (lambdas)

diff --git a/infra/examples-dev/aws-msft-365/main.tf b/infra/examples-dev/aws-msft-365/main.tf
@@ -51,7 +51,7 @@ provider "azuread" {
 
 module "psoxy" {
   source = "../../modular-examples/aws-msft-365"
-  # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-msft-365?ref=v0.4.61"
+  # source = "git::https://github.com/worklytics/psoxy//infra/modular-examples/aws-msft-365?ref=v0.4.62"
 
   aws_account_id                 = var.aws_account_id
   aws_assume_role_arn            = var.aws_assume_role_arn # role that can test the instances (lambdas)