Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
sahat committed Mar 11, 2016
2 parents 547f10a + 5c0d33c commit 3062dcb
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ angular.module('MyApp', ['satellizer'])
$authProvider.facebook({
clientId: 'Facebook App ID'
});

// if used solely on the client side, set responseType to "token"
$authProvider.facebook({
clientId: 'Facebook App ID',
responseType: 'token'
});

$authProvider.google({
clientId: 'Google Client ID'
Expand Down Expand Up @@ -600,7 +606,7 @@ $auth.signup(user)

#### `$auth.authenticate(name, [userData])`

Starts the OAuth 1.0 or the OAuth 2.0 authorization flow by opening a popup window.
Starts the OAuth 1.0 or the OAuth 2.0 authorization flow by opening a popup window. If used client side, [`responseType: "token"`](#authentication-flow) is required in the provider setup to get the actual access token.

##### Parameters

Expand Down

0 comments on commit 3062dcb

Please sign in to comment.