Skip to content

Commit 77bc5c4

Browse files
mlynchmlynch
committed
Some updates
1 parent db8919f commit 77bc5c4

File tree

12 files changed

+116
-22390
lines changed

12 files changed

+116
-22390
lines changed

‎android/app/build.gradle

-8
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ dependencies {
4141

4242
apply plugin: 'com.microsoft.intune.mam'
4343

44-
intunemam {
45-
includeExternalLibraries = [
46-
"androidx.*",
47-
"com.getcapacitor.*"
48-
]
49-
}
50-
51-
5244
apply from: 'capacitor.build.gradle'
5345

5446
try {

‎android/app/capacitor.build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ android {
1010
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1111
dependencies {
1212
implementation project(':capacitor-app')
13+
implementation project(':capacitor-camera')
1314
implementation project(':capacitor-haptics')
1415
implementation project(':capacitor-keyboard')
1516
implementation project(':ionic-enterprise-intune')

‎android/app/src/main/AndroidManifest.xml

+11-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@
3030
android:name="com.ionicframework.intune.IntuneApplication"
3131
>
3232

33+
<meta-data
34+
android:name="com.microsoft.intune.mam.aad.Authority"
35+
android:value="https://login.microsoftonline.com/453daf0a-cd18-4085-bfd7-fb9431630f11/v2.0" />
36+
<meta-data
37+
android:name="com.microsoft.intune.mam.aad.ClientID"
38+
android:value="f80e2e59-01b2-4f88-be80-4895a63eae7" />
39+
40+
3341
<activity
3442
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
3543
android:name="io.ionic.starter.MainActivity"
@@ -64,7 +72,7 @@
6472
-->
6573
<data
6674
android:host="io.ionic.starter"
67-
android:path="/uHU+Ui09K1zPjWX4mZFggrgz+rk="
75+
android:path="/5Lmt5lmx4ECI4NqjLePe1rm/ji0="
6876
android:scheme="msauth" />
6977
</intent-filter>
7078
</activity>
@@ -83,4 +91,6 @@
8391
<!-- Permissions -->
8492

8593
<uses-permission android:name="android.permission.INTERNET" />
94+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
95+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
8696
</manifest>

‎android/app/src/main/assets/capacitor.plugins.json

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
"pkg": "@capacitor/app",
44
"classpath": "com.capacitorjs.plugins.app.AppPlugin"
55
},
6+
{
7+
"pkg": "@capacitor/camera",
8+
"classpath": "com.capacitorjs.plugins.camera.CameraPlugin"
9+
},
610
{
711
"pkg": "@capacitor/haptics",
812
"classpath": "com.capacitorjs.plugins.haptics.HapticsPlugin"

‎android/app/src/main/res/raw/auth_config.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"client_id": "f80e2e59-01b2-4f88-be80-4895a63eae7e",
33
"authorization_user_agent": "DEFAULT",
4-
"redirect_uri": "msauth://io.ionic.starter/uHU%2BUi09K1zPjWX4mZFggrgz%2Brk%3D",
4+
"redirect_uri": "msauth://io.ionic.starter/5Lmt5lmx4ECI4NqjLePe1rm%2Fji0%3D",
55
"broker_redirect_uri_registered": true,
6+
"client_capabilities": "protapp",
67
"authorities": [
78
{
89
"type": "AAD",
@@ -12,4 +13,4 @@
1213
}
1314
}
1415
]
15-
}
16+
}

‎android/capacitor.settings.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/
55
include ':capacitor-app'
66
project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
77

8+
include ':capacitor-camera'
9+
project(':capacitor-camera').projectDir = new File('../node_modules/@capacitor/camera/android')
10+
811
include ':capacitor-haptics'
912
project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
1013

‎ios/App/App.xcodeproj/project.pbxproj

+7-3
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
504EC3031FED79650016851F = {
167167
CreatedOnToolsVersion = 9.2;
168168
LastSwiftMigration = 1100;
169-
ProvisioningStyle = Automatic;
169+
ProvisioningStyle = Manual;
170170
};
171171
};
172172
};
@@ -388,14 +388,16 @@
388388
buildSettings = {
389389
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
390390
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
391-
CODE_SIGN_STYLE = Automatic;
391+
CODE_SIGN_IDENTITY = "iPhone Distribution";
392+
CODE_SIGN_STYLE = Manual;
392393
DEVELOPMENT_TEAM = 9YN2HU59K8;
393394
INFOPLIST_FILE = App/Info.plist;
394395
IPHONEOS_DEPLOYMENT_TARGET = 12.3;
395396
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
396397
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
397398
PRODUCT_BUNDLE_IDENTIFIER = io.ionic.intuneDemo2;
398399
PRODUCT_NAME = "$(TARGET_NAME)";
400+
PROVISIONING_PROFILE_SPECIFIER = "Max Intune Test";
399401
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
400402
SWIFT_VERSION = 5.0;
401403
TARGETED_DEVICE_FAMILY = "1,2";
@@ -408,13 +410,15 @@
408410
buildSettings = {
409411
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
410412
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
411-
CODE_SIGN_STYLE = Automatic;
413+
CODE_SIGN_IDENTITY = "iPhone Distribution";
414+
CODE_SIGN_STYLE = Manual;
412415
DEVELOPMENT_TEAM = 9YN2HU59K8;
413416
INFOPLIST_FILE = App/Info.plist;
414417
IPHONEOS_DEPLOYMENT_TARGET = 12.3;
415418
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
416419
PRODUCT_BUNDLE_IDENTIFIER = io.ionic.intuneDemo2;
417420
PRODUCT_NAME = "$(TARGET_NAME)";
421+
PROVISIONING_PROFILE_SPECIFIER = "Max Intune Test";
418422
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
419423
SWIFT_VERSION = 5.0;
420424
TARGETED_DEVICE_FAMILY = "1,2";

‎ios/App/App/Info.plist

+17-11
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,22 @@
8282
</array>
8383
<key>UIViewControllerBasedStatusBarAppearance</key>
8484
<true/>
85-
<key>IntuneMAMSettings</key>
86-
<dict>
87-
<key>AutoEnrollOnLaunch</key>
88-
<true />
89-
<key>ADALClientId</key>
90-
<string>f80e2e59-01b2-4f88-be80-4895a63eae7e</string>
91-
<key>ADALAuthority</key>
92-
<string>https://login.microsoftonline.com/453daf0a-cd18-4085-bfd7-fb9431630f11</string>
93-
<key>ADALRedirectUri</key>
94-
<string>msauth.io.ionic.intuneDemo2://auth</string>
95-
</dict>
85+
<key>NSPhotoLibraryAddUsageDescription</key>
86+
<string>Access photos</string>
87+
<key>NSCameraUsageDescription</key>
88+
<string>Take photos</string>
89+
<key>NSPhotoLibraryUsageDescription</key>
90+
<string>Photo access</string>
91+
<key>IntuneMAMSettings</key>
92+
<dict>
93+
<key>AutoEnrollOnLaunch</key>
94+
<true/>
95+
<key>ADALClientId</key>
96+
<string>f80e2e59-01b2-4f88-be80-4895a63eae7e</string>
97+
<key>ADALAuthority</key>
98+
<string>https://login.microsoftonline.com/453daf0a-cd18-4085-bfd7-fb9431630f11</string>
99+
<key>ADALRedirectUri</key>
100+
<string>msauth.io.ionic.intuneDemo2://auth</string>
101+
</dict>
96102
</dict>
97103
</plist>

‎ios/App/Podfile

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ def capacitor_pods
1010
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
1111
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
1212
pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
13+
pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera'
1314
pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
1415
pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
1516
pod 'IonicEnterpriseIntune', :path => '../../node_modules/@ionic-enterprise/intune'

0 commit comments

Comments
 (0)