Skip to content

Commit ee5603b

Browse files
mlynchmlynch
committed
Update to latest package
1 parent 8d6ac68 commit ee5603b

File tree

7 files changed

+116
-135
lines changed

7 files changed

+116
-135
lines changed

‎package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@capacitor/haptics": "1.0.2",
1010
"@capacitor/ios": "3.2.2",
1111
"@capacitor/keyboard": "1.0.2",
12-
"@ionic-enterprise/intune": "^1.0.5",
12+
"@ionic-enterprise/intune": "^1.1.0-next.4",
1313
"@ionic/react": "^5.5.0",
1414
"@ionic/react-router": "^5.5.0",
1515
"@testing-library/jest-dom": "^5.11.9",

‎src/App.tsx

+37-38
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,51 @@
1-
import { Redirect, Route } from 'react-router';
2-
import { useHistory } from 'react-router';
3-
import { IonApp, IonRouterOutlet } from '@ionic/react';
4-
import { IonReactRouter } from '@ionic/react-router';
5-
import Home from './pages/Home';
1+
import { Redirect, Route } from "react-router";
2+
import { useHistory } from "react-router";
3+
import { IonApp, IonRouterOutlet } from "@ionic/react";
4+
import { IonReactRouter } from "@ionic/react-router";
5+
import Home from "./pages/Home";
66

77
/* Core CSS required for Ionic components to work properly */
8-
import '@ionic/react/css/core.css';
8+
import "@ionic/react/css/core.css";
99

1010
/* Basic CSS for apps built with Ionic */
11-
import '@ionic/react/css/normalize.css';
12-
import '@ionic/react/css/structure.css';
13-
import '@ionic/react/css/typography.css';
11+
import "@ionic/react/css/normalize.css";
12+
import "@ionic/react/css/structure.css";
13+
import "@ionic/react/css/typography.css";
1414

1515
/* Optional CSS utils that can be commented out */
16-
import '@ionic/react/css/padding.css';
17-
import '@ionic/react/css/float-elements.css';
18-
import '@ionic/react/css/text-alignment.css';
19-
import '@ionic/react/css/text-transformation.css';
20-
import '@ionic/react/css/flex-utils.css';
21-
import '@ionic/react/css/display.css';
16+
import "@ionic/react/css/padding.css";
17+
import "@ionic/react/css/float-elements.css";
18+
import "@ionic/react/css/text-alignment.css";
19+
import "@ionic/react/css/text-transformation.css";
20+
import "@ionic/react/css/flex-utils.css";
21+
import "@ionic/react/css/display.css";
2222

2323
/* Theme variables */
24-
import './theme/variables.css';
25-
import Login from './pages/Login';
26-
import { useEffect } from 'react';
27-
import IntuneMAM from './IntuneMAM';
28-
import Splash from './pages/Splash';
24+
import "./theme/variables.css";
25+
import Login from "./pages/Login";
26+
import { useEffect } from "react";
27+
import Splash from "./pages/Splash";
2928

3029
const App: React.FC = () => {
3130
return (
32-
<IonApp>
33-
<IonReactRouter>
34-
<IonRouterOutlet>
35-
<Route exact path="/splash">
36-
<Splash />
37-
</Route>
38-
<Route exact path="/home">
39-
<Home />
40-
</Route>
41-
<Route exact path="/login">
42-
<Login />
43-
</Route>
44-
<Route exact path="/">
45-
<Redirect to="/splash" />
46-
</Route>
47-
</IonRouterOutlet>
48-
</IonReactRouter>
49-
</IonApp>
31+
<IonApp>
32+
<IonReactRouter>
33+
<IonRouterOutlet>
34+
<Route exact path="/splash">
35+
<Splash />
36+
</Route>
37+
<Route exact path="/home">
38+
<Home />
39+
</Route>
40+
<Route exact path="/login">
41+
<Login />
42+
</Route>
43+
<Route exact path="/">
44+
<Redirect to="/splash" />
45+
</Route>
46+
</IonRouterOutlet>
47+
</IonReactRouter>
48+
</IonApp>
5049
);
5150
};
5251

‎src/IntuneMAM.ts

-54
This file was deleted.

‎src/pages/Home.tsx

+50-22
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
1-
import { IonButton, IonContent, IonHeader, IonPage, IonTitle, IonToolbar, useIonViewWillEnter } from '@ionic/react';
2-
import { useCallback, useEffect, useState } from 'react';
3-
import { useHistory } from 'react-router';
4-
import ExploreContainer from '../components/ExploreContainer';
5-
import IntuneMAM, { IntuneMAMAppConfig, IntuneMAMGroupName, IntuneMAMPolicy, IntuneMAMUser, IntuneMAMVersionInfo } from '../IntuneMAM';
6-
import './Home.css';
1+
import {
2+
IonButton,
3+
IonContent,
4+
IonHeader,
5+
IonPage,
6+
IonTitle,
7+
IonToolbar,
8+
useIonViewWillEnter,
9+
} from "@ionic/react";
10+
import { useCallback, useEffect, useState } from "react";
11+
import { useHistory } from "react-router";
12+
import ExploreContainer from "../components/ExploreContainer";
13+
import {
14+
IntuneMAM,
15+
IntuneMAMAppConfig,
16+
IntuneMAMGroupName,
17+
IntuneMAMPolicy,
18+
IntuneMAMUser,
19+
IntuneMAMVersionInfo,
20+
} from "@ionic-enterprise/intune";
21+
import "./Home.css";
722

823
const Home: React.FC = () => {
924
const history = useHistory();
@@ -19,11 +34,11 @@ const Home: React.FC = () => {
1934
async function getInitialData() {
2035
setVersion(await IntuneMAM.sdkVersion());
2136

22-
IntuneMAM.addListener('appConfigChange', () => {
23-
console.log('App config change here');
37+
IntuneMAM.addListener("appConfigChange", () => {
38+
console.log("App config change here");
2439
});
25-
IntuneMAM.addListener('policyChange', () => {
26-
console.log('Policy change here');
40+
IntuneMAM.addListener("policyChange", () => {
41+
console.log("Policy change here");
2742
});
2843
}
2944
getInitialData();
@@ -33,15 +48,19 @@ const Home: React.FC = () => {
3348
async function getToken() {
3449
if (user && user.upn) {
3550
try {
36-
const tokenInfo = await (IntuneMAM as any).acquireTokenSilent({
51+
const tokenInfo = await IntuneMAM.acquireTokenSilent({
3752
scopes: ["https://graph.microsoft.com/.default"],
38-
...user
53+
...user,
3954
});
4055
setTokenInfo(tokenInfo);
41-
console.log('Got token info', tokenInfo);
56+
console.log("Got token info", tokenInfo);
4257
} catch {
43-
console.error('Unable to silently acquire token, getting interactive');
44-
const tokenInfo = await (IntuneMAM as any).acquireToken();
58+
console.error(
59+
"Unable to silently acquire token, getting interactive"
60+
);
61+
const tokenInfo = await IntuneMAM.acquireToken({
62+
scopes: ["https://graph.microsoft.com/.default"],
63+
});
4564
setTokenInfo(tokenInfo);
4665
}
4766
}
@@ -74,7 +93,7 @@ const Home: React.FC = () => {
7493
if (user) {
7594
await IntuneMAM.deRegisterAndUnenrollAccount(user);
7695
}
77-
history.replace('/');
96+
history.replace("/");
7897
}, [user]);
7998

8099
return (
@@ -90,15 +109,24 @@ const Home: React.FC = () => {
90109
<IonTitle size="large">Blank</IonTitle>
91110
</IonToolbar>
92111
</IonHeader>
93-
<h2>{user?.upn || 'No user'}</h2>
112+
<h2>{user?.upn || "No user"}</h2>
94113
<h5>Token info:</h5>
95-
<textarea style={{ height: '200px', width: '100%', display: 'block'}} value={JSON.stringify(tokenInfo ?? {}, null, 2)} />
96-
<h5>Intune MAM Version: {version?.version || 'No version'}</h5>
97-
<h5>Group name: {groupName?.value || 'No group name'}</h5>
114+
<textarea
115+
style={{ height: "200px", width: "100%", display: "block" }}
116+
value={JSON.stringify(tokenInfo ?? {}, null, 2)}
117+
/>
118+
<h5>Intune MAM Version: {version?.version || "No version"}</h5>
119+
<h5>Group name: {groupName?.value || "No group name"}</h5>
98120
<h5>Policy:</h5>
99-
<textarea style={{ height: '200px', width: '100%', display: 'block'}} value={JSON.stringify(policy ?? {}, null, 2)} />
121+
<textarea
122+
style={{ height: "200px", width: "100%", display: "block" }}
123+
value={JSON.stringify(policy ?? {}, null, 2)}
124+
/>
100125
<h5>App Config:</h5>
101-
<textarea style={{ height: '200px', width: '100%', display: 'block'}} value={JSON.stringify(appConfig ?? {}, null, 2)} />
126+
<textarea
127+
style={{ height: "200px", width: "100%", display: "block" }}
128+
value={JSON.stringify(appConfig ?? {}, null, 2)}
129+
/>
102130
<IonButton onClick={showConsole}>Show Diagnostics Console</IonButton>
103131
<IonButton onClick={logout}>Log out</IonButton>
104132
</IonContent>

‎src/pages/Login.tsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import {
99
import { useCallback, useEffect, useState } from "react";
1010
import "./Home.css";
1111

12-
import IntuneMAM from "../IntuneMAM";
12+
import { IntuneMAM } from "@ionic-enterprise/intune";
13+
1314
import { useHistory } from "react-router";
1415

1516
const Login: React.FC = () => {
@@ -25,13 +26,13 @@ const Login: React.FC = () => {
2526
});
2627

2728
const login = useCallback(async () => {
28-
var authInfo = await (IntuneMAM as any).acquireToken({
29+
var authInfo = await IntuneMAM.acquireToken({
2930
scopes: ["https://graph.microsoft.com/.default"],
3031
});
3132

3233
console.log("Got auth info", authInfo);
3334

34-
await (IntuneMAM as any).registerAndEnrollAccount({
35+
await IntuneMAM.registerAndEnrollAccount({
3536
upn: authInfo.upn,
3637
});
3738

‎src/pages/Splash.tsx

+17-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
import { IonButton, IonContent, IonHeader, IonPage, IonTitle, IonToolbar } from '@ionic/react';
2-
import { useHistory } from 'react-router';
3-
import { useCallback, useEffect } from 'react';
4-
import ExploreContainer from '../components/ExploreContainer';
5-
import './Home.css';
1+
import {
2+
IonButton,
3+
IonContent,
4+
IonHeader,
5+
IonPage,
6+
IonTitle,
7+
IonToolbar,
8+
} from "@ionic/react";
9+
import { useHistory } from "react-router";
10+
import { useCallback, useEffect } from "react";
11+
import ExploreContainer from "../components/ExploreContainer";
12+
import "./Home.css";
613

7-
import IntuneMAM from '../IntuneMAM';
14+
import { IntuneMAM } from "@ionic-enterprise/intune";
815

916
const Splash: React.FC = () => {
1017
const history = useHistory();
@@ -14,11 +21,11 @@ const Splash: React.FC = () => {
1421
const user = await IntuneMAM.enrolledAccount();
1522

1623
if (user.upn) {
17-
console.log('Got user, going home');
18-
setTimeout(() => history.replace('/home'), 500);
24+
console.log("Got user, going home");
25+
setTimeout(() => history.replace("/home"), 500);
1926
} else {
20-
console.log('No user, logging in');
21-
setTimeout(() => history.replace('/login'), 500);
27+
console.log("No user, logging in");
28+
setTimeout(() => history.replace("/login"), 500);
2229
}
2330
}
2431

0 commit comments

Comments
 (0)