Skip to content
This repository has been archived by the owner on May 1, 2019. It is now read-only.

Commit

Permalink
Merge pull request #93 from auth0/fixes
Browse files Browse the repository at this point in the history
Fixes
  • Loading branch information
gnandretta committed Jan 18, 2016
2 parents 853d9a6 + 02158c7 commit b7cf988
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## unreleased

### Changed

- Some font alternatives are provided instead of defaulting to sans-serif immediately on systems without Avenir.

### Fixed

- Pass `authParams` option in a social login.

## [2.2.0] - 2016-01-14

### Changed
Expand Down
2 changes: 1 addition & 1 deletion css/index.styl
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ breakpoint(point, value = 0)
transform none

.auth0-lock.auth0-lock
font-family "Avenir", sans-serif
font-family "Avenir Next", Avenir, -apple-system, BlinkMacSystemFont, Roboto, Hevetica, sans-serif
text-rendering optimizeLegibility
pointer-events none
position fixed
Expand Down
6 changes: 3 additions & 3 deletions src/social/actions.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Map } from 'immutable';
import { getEntity, read, swap, updateEntity } from '../store/index';
import { closeLock } from '../lock/actions';
import WebAPI from '../lock/web_api';
Expand All @@ -8,16 +9,15 @@ export function signIn(id, connection) {

const lock = read(getEntity, "lock", id);

const options = {
const options = l.login.authParams(lock).merge(Map({
connection: connection.name,
popup: l.ui.popup(lock),
popupOptions: l.ui.popupOptions(lock),
redirect: !l.ui.popup(lock),
responseType: l.login.responseType(lock),
callbackURL: l.login.callbackURL(lock),
forceJSONP: l.login.forceJSONP(lock)
// sso: false
};
})).toJS();

if (l.ui.popup(lock) && connection.strategy === "facebook") {
options.display = "popup";
Expand Down

0 comments on commit b7cf988

Please sign in to comment.