Skip to content

Commit 4d4d921

Browse files
Merge branch 'oauth' of github.com:StoDevX/AAO-React-Native into v2.0.0-RC2
2 parents e7b208c + 66d920d commit 4d4d921

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

lib/courses.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// @flow
22
import {
3-
api,
4-
loadLoginCredentials,
5-
sisLogin,
6-
isLoggedIn,
3+
api,
4+
isLoggedIn,
75
} from '../lib/login'
86
import { AsyncStorage, NetInfo } from 'react-native'
97

lib/financials.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// @flow
22
import {
3-
api,
4-
loadLoginCredentials,
5-
sisLogin,
6-
isLoggedIn,
3+
api,
4+
loadLoginCredentials,
5+
isLoggedIn,
76
} from '../lib/login'
87
import { AsyncStorage, NetInfo } from 'react-native'
98

@@ -87,6 +86,7 @@ async function getFinancialDataFromServer(): Promise<FinancialDataShapeType> {
8786
}
8887

8988

89+
// TODO: come up with a better story around auth for olecard
9090
export default async function getWeeklyMealsRemaining() {
9191
let {username, password} = await loadLoginCredentials()
9292
let form = buildFormData({

views/settings/login.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
View,
1010
Text,
1111
AsyncStorage,
12+
Navigator,
1213
} from 'react-native'
1314
import startsWith from 'lodash/startsWith'
1415

@@ -23,6 +24,7 @@ const AUTH_REJECTED_URL = 'https://www.stolaf.edu/sis/login.cfm?error=access_den
2324

2425
export default class SISLoginView extends React.Component {
2526
static propTypes = {
27+
navigator: React.PropTypes.instanceOf(Navigator),
2628
onLoginComplete: React.PropTypes.func,
2729
};
2830

0 commit comments

Comments
 (0)