ember-auth-source 4.0.1 → 4.1.0
Sign up to get free protection for your applications and to get access to all the features.
- data/dist/ember-auth.js +47 -11
- metadata +3 -3
data/dist/ember-auth.js
CHANGED
@@ -541,9 +541,11 @@
|
|
541
541
|
rememberTokenKey: null,
|
542
542
|
rememberPeriod: 14,
|
543
543
|
rememberAutoRecall: true,
|
544
|
+
rememberAutoRecallRouteScope: 'auth',
|
544
545
|
rememberStorage: 'cookie',
|
545
546
|
urlAuthentication: false,
|
546
|
-
urlAuthenticationParamsKey: null
|
547
|
+
urlAuthenticationParamsKey: null,
|
548
|
+
urlAuthenticationRouteScope: 'auth'
|
547
549
|
});
|
548
550
|
|
549
551
|
}).call(this);
|
@@ -551,14 +553,14 @@
|
|
551
553
|
Auth.Route = Em.Route.extend(Em.Evented, {
|
552
554
|
redirect: function() {
|
553
555
|
if (Auth.get('authToken')) {
|
554
|
-
return;
|
556
|
+
return this._super.apply(this, arguments);
|
555
557
|
}
|
556
558
|
if (Auth.Config.get('urlAuthentication')) {
|
557
559
|
Auth.Module.UrlAuthentication.authenticate({
|
558
560
|
async: false
|
559
561
|
});
|
560
562
|
if (Auth.get('authToken')) {
|
561
|
-
return;
|
563
|
+
return this._super.apply(this, arguments);
|
562
564
|
}
|
563
565
|
}
|
564
566
|
if (Auth.Config.get('rememberMe') && Auth.Config.get('rememberAutoRecall')) {
|
@@ -566,14 +568,39 @@
|
|
566
568
|
async: false
|
567
569
|
});
|
568
570
|
if (Auth.get('authToken')) {
|
569
|
-
return;
|
571
|
+
return this._super.apply(this, arguments);
|
570
572
|
}
|
571
573
|
}
|
572
574
|
this.trigger('authAccess');
|
573
575
|
if (Auth.Config.get('authRedirect')) {
|
574
576
|
Auth.set('prevRoute', this.routeName);
|
575
|
-
|
577
|
+
this.transitionTo(Auth.Config.get('signInRoute'));
|
578
|
+
}
|
579
|
+
return this._super.apply(this, arguments);
|
580
|
+
}
|
581
|
+
});
|
582
|
+
|
583
|
+
}).call(this);
|
584
|
+
(function() {
|
585
|
+
Em.Route.reopen({
|
586
|
+
redirect: function() {
|
587
|
+
if (Auth.Config.get('urlAuthentication') && Auth.Config.get('urlAuthenticationRouteScope') === 'both') {
|
588
|
+
Auth.Module.UrlAuthentication.authenticate({
|
589
|
+
async: false
|
590
|
+
});
|
591
|
+
if (Auth.get('authToken')) {
|
592
|
+
return this._super.apply(this, arguments);
|
593
|
+
}
|
594
|
+
}
|
595
|
+
if (Auth.Config.get('rememberMe') && Auth.Config.get('rememberAutoRecall') && Auth.Config.get('rememberAutoRecallRouteScope') === 'both') {
|
596
|
+
Auth.Module.RememberMe.recall({
|
597
|
+
async: false
|
598
|
+
});
|
599
|
+
if (Auth.get('authToken')) {
|
600
|
+
return this._super.apply(this, arguments);
|
601
|
+
}
|
576
602
|
}
|
603
|
+
return this._super.apply(this, arguments);
|
577
604
|
}
|
578
605
|
});
|
579
606
|
|
@@ -629,7 +656,6 @@
|
|
629
656
|
var _this = this;
|
630
657
|
|
631
658
|
Auth.on('signInSuccess', function() {
|
632
|
-
_this.forget();
|
633
659
|
return _this.remember();
|
634
660
|
});
|
635
661
|
Auth.on('signInError', function() {
|
@@ -649,6 +675,7 @@
|
|
649
675
|
return;
|
650
676
|
}
|
651
677
|
if (!Auth.get('authToken') && (token = this.retrieveToken())) {
|
678
|
+
this.fromRecall = true;
|
652
679
|
data = {};
|
653
680
|
if (opts.async != null) {
|
654
681
|
data['async'] = opts.async;
|
@@ -664,9 +691,16 @@
|
|
664
691
|
return;
|
665
692
|
}
|
666
693
|
token = Auth.get('json')[Auth.Config.get('rememberTokenKey')];
|
667
|
-
if (token
|
668
|
-
|
694
|
+
if (token) {
|
695
|
+
if (token !== this.retrieveToken()) {
|
696
|
+
this.storeToken(token);
|
697
|
+
}
|
698
|
+
} else {
|
699
|
+
if (!this.fromRecall) {
|
700
|
+
this.forget();
|
701
|
+
}
|
669
702
|
}
|
703
|
+
return this.fromRecall = false;
|
670
704
|
},
|
671
705
|
forget: function() {
|
672
706
|
if (!Auth.Config.get('rememberMe')) {
|
@@ -698,7 +732,9 @@
|
|
698
732
|
case 'localStorage':
|
699
733
|
return localStorage.removeItem('ember-auth-remember-me');
|
700
734
|
case 'cookie':
|
701
|
-
return jQuery.removeCookie('ember-auth-remember-me'
|
735
|
+
return jQuery.removeCookie('ember-auth-remember-me', {
|
736
|
+
path: '/'
|
737
|
+
});
|
702
738
|
}
|
703
739
|
}
|
704
740
|
});
|
@@ -730,13 +766,13 @@
|
|
730
766
|
return Auth.signIn(data);
|
731
767
|
},
|
732
768
|
retrieveParams: function() {
|
733
|
-
var key
|
769
|
+
var key;
|
734
770
|
|
735
771
|
if (!Auth.Config.get('urlAuthentication')) {
|
736
772
|
return;
|
737
773
|
}
|
738
774
|
key = Auth.Config.get('urlAuthenticationParamsKey');
|
739
|
-
return this.params =
|
775
|
+
return this.params = $.url().param(key);
|
740
776
|
},
|
741
777
|
canonicalizeParams: function(obj) {
|
742
778
|
var canonicalized, k, params, v, _i, _len;
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ember-auth-source
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.0
|
4
|
+
version: 4.1.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-04-
|
12
|
+
date: 2013-04-18 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: ember-source
|
@@ -75,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
75
75
|
version: '0'
|
76
76
|
segments:
|
77
77
|
- 0
|
78
|
-
hash:
|
78
|
+
hash: 681891955
|
79
79
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
80
80
|
none: false
|
81
81
|
requirements:
|