Skip to content

Commit

Permalink
Merge pull request #2 from mastfissh/LBO-13
Browse files Browse the repository at this point in the history
LBO-13
  • Loading branch information
mastfissh authored Mar 21, 2017
2 parents 1b2e94f + 85dcc36 commit 634f2fb
Show file tree
Hide file tree
Showing 9 changed files with 39,972 additions and 32 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ bower_components
build
.tmp
.idea
es6
lib
umd
node_modules
npm-debug.log
coverage
13 changes: 2 additions & 11 deletions dist/stormpath-sdk-react.js
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ return /******/ (function(modules) { // webpackBootstrap
this.initialized = true;

var tokenStore = null;
var userService = null;
var sessionStore = new _stores.SessionStore();

if (!options.endpoints) {
Expand All @@ -276,15 +275,7 @@ return /******/ (function(modules) { // webpackBootstrap

var baseUri = options.endpoints.baseUri;

if (baseUri && !_utils2.default.isSameHost(baseUri, window.location.href)) {
tokenStore = new _stores.TokenStore(options.storage, 'stormpath:token');
userService = new _services.ClientApiUserService(options.endpoints);

userService.setToken('access_token', tokenStore.get('access_token'));
userService.setToken('refresh_token', tokenStore.get('refresh_token'));
} else {
userService = new _services.UserService(options.endpoints);
}
var userService = new _services.UserService(options.endpoints);

var userStore = new _stores.UserStore(userService, sessionStore);

Expand Down Expand Up @@ -939,7 +930,7 @@ return /******/ (function(modules) { // webpackBootstrap
// Only set the X-Stormpath-Agent header if we're on the same domain as the requested URI.
// This because we want to avoid CORS requests that require you to have to whitelist the X-Stormpath-Agent header.
if (this.forceAgentHeader || _utils2.default.isRelativeUri(uri) || _utils2.default.isSameHost(uri, window.location.href)) {
headers['X-Stormpath-Agent'] = 'stormpath-sdk-react/' + ("2.0.1") + ' react/' + _react2.default.version;
headers['X-Stormpath-Agent'] = 'stormpath-sdk-react/' + ("3.0.0") + ' react/' + _react2.default.version;
}

makeHttpRequest(method, uri, body, headers, function (err, result) {
Expand Down
14 changes: 7 additions & 7 deletions dist/stormpath-sdk-react.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 634f2fb

Please sign in to comment.