Skip to content
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

Jump to bottom

Implementing auto refresh token #992

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implementing auto refresh token #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
959 changes: 0 additions & 959 deletions dist/satellizer.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dist/satellizer.js.map
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions dist/satellizer.min.js
View file
Open in desktop

This file was deleted.

1,776 changes: 892 additions & 884 deletions examples/client/vendor/satellizer.js
View file
Open in desktop

Large diffs are not rendered by default.

1,776 changes: 892 additions & 884 deletions examples/ionic/www/lib/satellizer/dist/satellizer.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions examples/server/php/public/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ angular.module('MyApp', ['ngResource', 'ngMessages', 'ngAnimate', 'toastr', 'ui.
/**
* Helper auth functions
*/
var skipIfLoggedIn = function($q, $auth) {
var skipIfLoggedIn = ['$q', '$auth', function($q, $auth) {
var deferred = $q.defer();
if ($auth.isAuthenticated()) {
deferred.reject();
} else {
deferred.resolve();
}
return deferred.promise;
};
}];

var loginRequired = function($q, $location, $auth) {
var loginRequired = ['$q', '$location', '$auth', function($q, $location, $auth) {
var deferred = $q.defer();
if ($auth.isAuthenticated()) {
deferred.resolve();
} else {
$location.path('/login');
}
return deferred.promise;
};
}];

/**
* App routes
Expand Down
14 changes: 11 additions & 3 deletions examples/server/php/public/partials/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,27 @@
<i class="ion-social-windows"></i> Link Windows Live Account
</button>

<button class="btn btn-sm btn-danger" ng-if="user.twitch" ng-click="link('twitch')">
<button class="btn btn-sm btn-danger" ng-if="user.twitch" ng-click="unlink('twitch')">
<i class="ion-social-twitch"></i> Unlink Twitch Account
</button>
<button class="btn btn-sm btn-primary" ng-if="!user.twitch" ng-click="link('twitch')">
<i class="ion-social-twitch"></i> Link Twitch Account
</button>

<button class="btn btn-sm btn-danger" ng-if="user.twitch" ng-click="link('bitbucket')">
<button class="btn btn-sm btn-danger" ng-if="user.bitbucket" ng-click="unlink('bitbucket')">
<i class="fa fa-bitbucket"></i> Unlink Bitbucket Account
</button>
<button class="btn btn-sm btn-primary" ng-if="!user.twitch" ng-click="link('bitbucket')">
<button class="btn btn-sm btn-primary" ng-if="!user.bitbucket" ng-click="link('bitbucket')">
<i class="fa fa-bitbucket"></i> Link Bitbucket Account
</button>

<button class="btn btn-sm btn-danger" ng-if="user.spotify" ng-click="unlink('spotify')">
<i class="fa fa-spotify"></i> Unlink Spotify Account
</button>
<button class="btn btn-sm btn-primary" ng-if="!user.spotify" ng-click="link('spotify')">
<i class="fa fa-spotify"></i> Link Spotify Account
</button>

</div>
</div>
</div>
Expand Down
Loading