From 6ee4af7381fec1ee298c65967d32771bfb15a48a Mon Sep 17 00:00:00 2001
From: Evan Anderson <evan@eaanderson.com>
Date: Tue, 24 Jan 2023 17:59:55 -0600
Subject: [PATCH] Add InTune support

* Microsoft InTune is a device management/compliance checker
that some organizations use for accessing corporate resources.
When using an InTune enrolled device, Edge talks to the identity
service using dbus for seamless login to corporate resources, and
for conditional access enforcement. In order to support this, the
msalsdk-dbusclient shared library must be present. This commit adds
this library and its dependency (sd-bus) to the flatpak

* NOTE: This won't work until properly flatpak/xdg-dbus-proxy#21 is fixed
---
 apply_extra.sh          |  6 ++++++
 com.microsoft.Edge.yaml | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/apply_extra.sh b/apply_extra.sh
index bf0db4b..e5f77c5 100644
--- a/apply_extra.sh
+++ b/apply_extra.sh
@@ -9,4 +9,10 @@ bsdtar -Oxf edge.deb 'data.tar*' |
     ./opt/microsoft/msedge-beta
 rm edge.deb
 
+bsdtar -Oxf msalsdk.deb 'data.tar*' |
+  bsdtar -xf - \
+    --strip-components=3 \
+    ./usr/lib
+rm msalsdk.deb
+
 install -Dm755 /app/bin/stub_sandbox msedge-sandbox
diff --git a/com.microsoft.Edge.yaml b/com.microsoft.Edge.yaml
index 1860135..93e2e8a 100644
--- a/com.microsoft.Edge.yaml
+++ b/com.microsoft.Edge.yaml
@@ -23,6 +23,7 @@ finish-args:
   - --socket=wayland
   - --require-version=1.8.2
   - --system-talk-name=org.freedesktop.UPower
+  - --talk-name=com.microsoft.identity.broker1
   - --talk-name=org.freedesktop.FileManager1
   - --talk-name=org.freedesktop.Notifications
   - --talk-name=org.freedesktop.ScreenSaver
@@ -80,6 +81,22 @@ modules:
           type: git
           tag-pattern: ^v([\d.]+)$
 
+  - name: sdbus
+    buildsystem: cmake
+    config-opts:
+      - -DBUILD_DOC=false
+      - -DCMAKE_BUILD_TYPE=Release
+    sources:
+      - type: git
+        url: https://github.com/Kistler-Group/sdbus-cpp
+        tag: v1.2.0
+        commit: 751c1addc4fd2f949a466f488c1b7de2ca3b76dc
+        x-checker-data:
+          type: git
+          tag-pattern: ^v([\d.]+)$
+    cleanup:
+      - /include
+
   - name: edge
     buildsystem: simple
     build-commands:
@@ -106,6 +123,17 @@ modules:
           dist: stable
           component: main
         size: 140060726
+      - type: extra-data
+        url: https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/m/msalsdk-dbusclient/msalsdk-dbusclient_1.0.1_amd64.deb
+        sha256: 0153eb3710a35c6cdada01844cfd18ae55de12023a02396b4954eda8a6f65012
+        size: 9278
+        filename: msalsdk.deb
+        x-checker-data:
+          type: debian-repo
+          root: https://packages.microsoft.com/ubuntu/22.04/prod
+          dist: jammy
+          component: main
+          package-name: msalsdk-dbusclient
       - type: script
         dest-filename: stub_sandbox.sh
         commands: