Skip to content

Dev to master #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexanderC merged 6 commits into from
Apr 6, 2016
Merged

Dev to master #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af72954
Merge pull request #317 from MitocGroup/issue_316
Apr 5, 2016
8aa1441
Publish new patch version
mgoria Apr 5, 2016
d366360
Fix deep-security for local env
mgoria Apr 5, 2016
9eef812
Resolve conflicts
mgoria Apr 5, 2016
2c9c2c0
Fix deep-security for local env
mgoria Apr 6, 2016
59676f4
Merge
mgoria Apr 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/deep-framework/browser/framework.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/deep-framework/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "deep-framework",
"version": "1.9.8",
"version": "1.9.9",
"description": "DEEP Framework",
"keywords": [
"digital enterprise end-to-end platform",
Expand Down
14 changes: 9 additions & 5 deletions src/deep-security/lib/Security.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class Security extends Kernel.ContainerAware {
let globals = kernel.config.globals;

this._identityPoolId = kernel.config.identityPoolId;
this._identityProviders = kernel.config.identityProviders || globals.security.identityProviders || {};
this._identityProviders = kernel.config.identityProviders || {};
this._userProviderEndpoint = globals.userProviderEndpoint || null;

callback();
Expand All @@ -82,9 +82,13 @@ export class Security extends Kernel.ContainerAware {
* @returns {Token}
*/
login(providerName, identityMetadata, callback) {
let identityProvider = new IdentityProvider(this._identityProviders, providerName, identityMetadata);
let identityProvider = null;
let TokenImplementation = LocalToken;

let TokenImplementation = this._localBackend ? LocalToken : Token;
if (!this._localBackend) {
TokenImplementation = Token;
identityProvider = new IdentityProvider(this._identityProviders, providerName, identityMetadata);
}

this._token = TokenImplementation.createFromIdentityProvider(this._identityPoolId, identityProvider);

Expand Down Expand Up @@ -172,11 +176,11 @@ export class Security extends Kernel.ContainerAware {
this._logRumEvent({
eventName: 'logout',
});

if (this._token) {
this._token.destroy();
}

this._token = null;

return this;
Expand Down
2 changes: 1 addition & 1 deletion src/deep-security/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "deep-security",
"version": "1.8.4",
"version": "1.8.5",
"description": "DEEP Security Library",
"keywords": [
"digital enterprise end-to-end platform",
Expand Down