You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@syncope.apache.org by mteo <gi...@git.apache.org> on 2016/04/26 12:20:15 UTC
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
GitHub user mteo opened a pull request:
https://github.com/apache/syncope/pull/13
SYNCOPE-798 now cancel does logout
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/mteo/syncope SYNCOPE-798
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/syncope/pull/13.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #13
----
commit c6c88bd56038c2a21e3b0d22aeac4a6104e8f280
Author: Matteo Di Carlo <ma...@bhuman.it>
Date: 2016-04-26T10:17:55Z
SYNCOPE-798 now cancel does logout
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on a diff in the pull request:
https://github.com/apache/syncope/pull/13#discussion_r61736292
--- Diff: client/enduser/src/main/resources/META-INF/resources/app/js/app.js ---
@@ -27,394 +29,409 @@ angular.module('info', []);
// Declare app level module which depends on views, and components
var app = angular.module('SyncopeEnduserApp', [
- 'ui.router',
- 'ui.bootstrap',
- 'ui.select',
- 'ngSanitize',
- 'ngAnimate',
- 'ngResource',
- 'ngCookies',
- 'treasure-overlay-spinner',
- 'ngPasswordStrength',
- 'kendo.directives',
- 'home',
- 'login',
- 'language',
- 'self',
- 'info'
+ 'ui.router',
+ 'ui.bootstrap',
+ 'ui.select',
+ 'ngSanitize',
+ 'ngAnimate',
+ 'ngResource',
+ 'ngCookies',
+ 'treasure-overlay-spinner',
+ 'ngPasswordStrength',
+ 'kendo.directives',
+ 'home',
+ 'login',
+ 'language',
+ 'self',
+ 'info'
]);
app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
- function ($stateProvider, $urlRouterProvider, $httpProvider) {
- // route configuration
- $stateProvider
- .state('home', {
- url: '/',
- templateUrl: 'views/self.html'
- })
- .state('self', {
- url: '/self',
- templateUrl: 'views/self.html'
- })
- .state('user-self-update', {
- url: '/user-self-update',
- templateUrl: 'views/home.html',
- controller: 'HomeController',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('create', {
- url: '/self/create',
- templateUrl: 'views/editUser.html'
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/create)
- .state('create.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html'
- })
- .state('create.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html'
- })
- .state('create.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html'
- })
- .state('create.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html'
- })
- .state('create.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html'
- })
- .state('create.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html'
- })
- .state('create.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html'
- })
- .state('update', {
- url: '/self/update',
- templateUrl: 'views/editUser.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/update)
- .state('update.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('passwordreset', {
- url: '/passwordreset',
- templateUrl: 'views/passwordreset.html'
- })
- .state('confirmpasswordreset', {
- url: '/confirmpasswordreset?token',
- templateUrl: 'views/confirmpasswordreset.html'
- })
- .state('mustchangepassword', {
- url: '/mustchangepassword',
- templateUrl: 'views/mustchangepassword.html'
- });
+ function ($stateProvider, $urlRouterProvider, $httpProvider) {
+ // route configuration
+ $stateProvider
+ .state('home', {
+ url: '/',
+ templateUrl: 'views/self.html'
+ })
+ .state('self', {
+ url: '/self',
+ templateUrl: 'views/self.html'
+ })
+ .state('user-self-update', {
+ url: '/user-self-update',
+ templateUrl: 'views/home.html',
+ controller: 'HomeController',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged()
+ }]
+ }
+ })
+ .state('create', {
+ url: '/self/create',
+ templateUrl: 'views/editUser.html'
+ })
+ // nested states
+ // each of these sections will have their own view
+ // url will be nested (/self/create)
+ .state('create.credentials', {
+ url: '/credentials',
+ templateUrl: 'views/user-credentials.html'
+ })
+ .state('create.groups', {
+ url: '/groups',
+ templateUrl: 'views/user-groups.html'
+ })
+ .state('create.plainSchemas', {
+ url: '/plainSchemas',
+ templateUrl: 'views/user-plain-schemas.html'
+ })
+ .state('create.derivedSchemas', {
+ url: '/derivedSchemas',
+ templateUrl: 'views/user-derived-schemas.html'
+ })
+ .state('create.virtualSchemas', {
+ url: '/virtualSchemas',
+ templateUrl: 'views/user-virtual-schemas.html'
+ })
+ .state('create.resources', {
+ url: '/resources',
+ templateUrl: 'views/user-resources.html'
+ })
+ .state('create.finish', {
+ url: '/finish',
+ templateUrl: 'views/user-form-finish.html'
+ })
+ .state('update', {
+ url: '/self/update',
+ templateUrl: 'views/editUser.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ // nested states
+ // each of these sections will have their own view
+ // url will be nested (/self/update)
+ .state('update.credentials', {
+ url: '/credentials',
+ templateUrl: 'views/user-credentials.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.plainSchemas', {
+ url: '/plainSchemas',
+ templateUrl: 'views/user-plain-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.derivedSchemas', {
+ url: '/derivedSchemas',
+ templateUrl: 'views/user-derived-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.virtualSchemas', {
+ url: '/virtualSchemas',
+ templateUrl: 'views/user-virtual-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.groups', {
+ url: '/groups',
+ templateUrl: 'views/user-groups.html',
+ resolve: {
+ 'authenticated': ['AuthService',
--- End diff --
Also here: rename `AuthService`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on a diff in the pull request:
https://github.com/apache/syncope/pull/13#discussion_r61736265
--- Diff: client/enduser/src/main/resources/META-INF/resources/app/js/app.js ---
@@ -27,394 +29,409 @@ angular.module('info', []);
// Declare app level module which depends on views, and components
var app = angular.module('SyncopeEnduserApp', [
- 'ui.router',
- 'ui.bootstrap',
- 'ui.select',
- 'ngSanitize',
- 'ngAnimate',
- 'ngResource',
- 'ngCookies',
- 'treasure-overlay-spinner',
- 'ngPasswordStrength',
- 'kendo.directives',
- 'home',
- 'login',
- 'language',
- 'self',
- 'info'
+ 'ui.router',
+ 'ui.bootstrap',
+ 'ui.select',
+ 'ngSanitize',
+ 'ngAnimate',
+ 'ngResource',
+ 'ngCookies',
+ 'treasure-overlay-spinner',
+ 'ngPasswordStrength',
+ 'kendo.directives',
+ 'home',
+ 'login',
+ 'language',
+ 'self',
+ 'info'
]);
app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
- function ($stateProvider, $urlRouterProvider, $httpProvider) {
- // route configuration
- $stateProvider
- .state('home', {
- url: '/',
- templateUrl: 'views/self.html'
- })
- .state('self', {
- url: '/self',
- templateUrl: 'views/self.html'
- })
- .state('user-self-update', {
- url: '/user-self-update',
- templateUrl: 'views/home.html',
- controller: 'HomeController',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('create', {
- url: '/self/create',
- templateUrl: 'views/editUser.html'
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/create)
- .state('create.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html'
- })
- .state('create.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html'
- })
- .state('create.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html'
- })
- .state('create.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html'
- })
- .state('create.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html'
- })
- .state('create.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html'
- })
- .state('create.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html'
- })
- .state('update', {
- url: '/self/update',
- templateUrl: 'views/editUser.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/update)
- .state('update.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('passwordreset', {
- url: '/passwordreset',
- templateUrl: 'views/passwordreset.html'
- })
- .state('confirmpasswordreset', {
- url: '/confirmpasswordreset?token',
- templateUrl: 'views/confirmpasswordreset.html'
- })
- .state('mustchangepassword', {
- url: '/mustchangepassword',
- templateUrl: 'views/mustchangepassword.html'
- });
+ function ($stateProvider, $urlRouterProvider, $httpProvider) {
+ // route configuration
+ $stateProvider
+ .state('home', {
+ url: '/',
+ templateUrl: 'views/self.html'
+ })
+ .state('self', {
+ url: '/self',
+ templateUrl: 'views/self.html'
+ })
+ .state('user-self-update', {
+ url: '/user-self-update',
+ templateUrl: 'views/home.html',
+ controller: 'HomeController',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
--- End diff --
Also here: rename `AuthService`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on a diff in the pull request:
https://github.com/apache/syncope/pull/13#discussion_r61736317
--- Diff: client/enduser/src/main/resources/META-INF/resources/app/js/app.js ---
@@ -27,394 +29,409 @@ angular.module('info', []);
// Declare app level module which depends on views, and components
var app = angular.module('SyncopeEnduserApp', [
- 'ui.router',
- 'ui.bootstrap',
- 'ui.select',
- 'ngSanitize',
- 'ngAnimate',
- 'ngResource',
- 'ngCookies',
- 'treasure-overlay-spinner',
- 'ngPasswordStrength',
- 'kendo.directives',
- 'home',
- 'login',
- 'language',
- 'self',
- 'info'
+ 'ui.router',
+ 'ui.bootstrap',
+ 'ui.select',
+ 'ngSanitize',
+ 'ngAnimate',
+ 'ngResource',
+ 'ngCookies',
+ 'treasure-overlay-spinner',
+ 'ngPasswordStrength',
+ 'kendo.directives',
+ 'home',
+ 'login',
+ 'language',
+ 'self',
+ 'info'
]);
app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
- function ($stateProvider, $urlRouterProvider, $httpProvider) {
- // route configuration
- $stateProvider
- .state('home', {
- url: '/',
- templateUrl: 'views/self.html'
- })
- .state('self', {
- url: '/self',
- templateUrl: 'views/self.html'
- })
- .state('user-self-update', {
- url: '/user-self-update',
- templateUrl: 'views/home.html',
- controller: 'HomeController',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('create', {
- url: '/self/create',
- templateUrl: 'views/editUser.html'
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/create)
- .state('create.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html'
- })
- .state('create.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html'
- })
- .state('create.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html'
- })
- .state('create.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html'
- })
- .state('create.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html'
- })
- .state('create.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html'
- })
- .state('create.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html'
- })
- .state('update', {
- url: '/self/update',
- templateUrl: 'views/editUser.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/update)
- .state('update.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('passwordreset', {
- url: '/passwordreset',
- templateUrl: 'views/passwordreset.html'
- })
- .state('confirmpasswordreset', {
- url: '/confirmpasswordreset?token',
- templateUrl: 'views/confirmpasswordreset.html'
- })
- .state('mustchangepassword', {
- url: '/mustchangepassword',
- templateUrl: 'views/mustchangepassword.html'
- });
+ function ($stateProvider, $urlRouterProvider, $httpProvider) {
+ // route configuration
+ $stateProvider
+ .state('home', {
+ url: '/',
+ templateUrl: 'views/self.html'
+ })
+ .state('self', {
+ url: '/self',
+ templateUrl: 'views/self.html'
+ })
+ .state('user-self-update', {
+ url: '/user-self-update',
+ templateUrl: 'views/home.html',
+ controller: 'HomeController',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged()
+ }]
+ }
+ })
+ .state('create', {
+ url: '/self/create',
+ templateUrl: 'views/editUser.html'
+ })
+ // nested states
+ // each of these sections will have their own view
+ // url will be nested (/self/create)
+ .state('create.credentials', {
+ url: '/credentials',
+ templateUrl: 'views/user-credentials.html'
+ })
+ .state('create.groups', {
+ url: '/groups',
+ templateUrl: 'views/user-groups.html'
+ })
+ .state('create.plainSchemas', {
+ url: '/plainSchemas',
+ templateUrl: 'views/user-plain-schemas.html'
+ })
+ .state('create.derivedSchemas', {
+ url: '/derivedSchemas',
+ templateUrl: 'views/user-derived-schemas.html'
+ })
+ .state('create.virtualSchemas', {
+ url: '/virtualSchemas',
+ templateUrl: 'views/user-virtual-schemas.html'
+ })
+ .state('create.resources', {
+ url: '/resources',
+ templateUrl: 'views/user-resources.html'
+ })
+ .state('create.finish', {
+ url: '/finish',
+ templateUrl: 'views/user-form-finish.html'
+ })
+ .state('update', {
+ url: '/self/update',
+ templateUrl: 'views/editUser.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ // nested states
+ // each of these sections will have their own view
+ // url will be nested (/self/update)
+ .state('update.credentials', {
+ url: '/credentials',
+ templateUrl: 'views/user-credentials.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.plainSchemas', {
+ url: '/plainSchemas',
+ templateUrl: 'views/user-plain-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.derivedSchemas', {
+ url: '/derivedSchemas',
+ templateUrl: 'views/user-derived-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.virtualSchemas', {
+ url: '/virtualSchemas',
+ templateUrl: 'views/user-virtual-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.groups', {
+ url: '/groups',
+ templateUrl: 'views/user-groups.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.resources', {
+ url: '/resources',
+ templateUrl: 'views/user-resources.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.finish', {
+ url: '/finish',
+ templateUrl: 'views/user-form-finish.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
--- End diff --
Also here: rename `AuthService`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on a diff in the pull request:
https://github.com/apache/syncope/pull/13#discussion_r61735681
--- Diff: client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java ---
@@ -154,6 +155,16 @@ public IResource getResource() {
return new LogoutResource();
}
});
+
+ mountResource("/api/self/islogged", new ResourceReference("userAuthentication") {
+
+ private static final long serialVersionUID = -128426276529456602L;
+
+ @Override
+ public IResource getResource() {
+ return new UserAuthentication();
--- End diff --
Please rename `UserAuthentication` according to its mount point.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by mteo <gi...@git.apache.org>.
Github user mteo closed the pull request at:
https://github.com/apache/syncope/pull/13
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on a diff in the pull request:
https://github.com/apache/syncope/pull/13#discussion_r61736276
--- Diff: client/enduser/src/main/resources/META-INF/resources/app/js/app.js ---
@@ -27,394 +29,409 @@ angular.module('info', []);
// Declare app level module which depends on views, and components
var app = angular.module('SyncopeEnduserApp', [
- 'ui.router',
- 'ui.bootstrap',
- 'ui.select',
- 'ngSanitize',
- 'ngAnimate',
- 'ngResource',
- 'ngCookies',
- 'treasure-overlay-spinner',
- 'ngPasswordStrength',
- 'kendo.directives',
- 'home',
- 'login',
- 'language',
- 'self',
- 'info'
+ 'ui.router',
+ 'ui.bootstrap',
+ 'ui.select',
+ 'ngSanitize',
+ 'ngAnimate',
+ 'ngResource',
+ 'ngCookies',
+ 'treasure-overlay-spinner',
+ 'ngPasswordStrength',
+ 'kendo.directives',
+ 'home',
+ 'login',
+ 'language',
+ 'self',
+ 'info'
]);
app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
- function ($stateProvider, $urlRouterProvider, $httpProvider) {
- // route configuration
- $stateProvider
- .state('home', {
- url: '/',
- templateUrl: 'views/self.html'
- })
- .state('self', {
- url: '/self',
- templateUrl: 'views/self.html'
- })
- .state('user-self-update', {
- url: '/user-self-update',
- templateUrl: 'views/home.html',
- controller: 'HomeController',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('create', {
- url: '/self/create',
- templateUrl: 'views/editUser.html'
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/create)
- .state('create.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html'
- })
- .state('create.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html'
- })
- .state('create.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html'
- })
- .state('create.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html'
- })
- .state('create.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html'
- })
- .state('create.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html'
- })
- .state('create.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html'
- })
- .state('update', {
- url: '/self/update',
- templateUrl: 'views/editUser.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/update)
- .state('update.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('passwordreset', {
- url: '/passwordreset',
- templateUrl: 'views/passwordreset.html'
- })
- .state('confirmpasswordreset', {
- url: '/confirmpasswordreset?token',
- templateUrl: 'views/confirmpasswordreset.html'
- })
- .state('mustchangepassword', {
- url: '/mustchangepassword',
- templateUrl: 'views/mustchangepassword.html'
- });
+ function ($stateProvider, $urlRouterProvider, $httpProvider) {
+ // route configuration
+ $stateProvider
+ .state('home', {
+ url: '/',
+ templateUrl: 'views/self.html'
+ })
+ .state('self', {
+ url: '/self',
+ templateUrl: 'views/self.html'
+ })
+ .state('user-self-update', {
+ url: '/user-self-update',
+ templateUrl: 'views/home.html',
+ controller: 'HomeController',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged()
+ }]
+ }
+ })
+ .state('create', {
+ url: '/self/create',
+ templateUrl: 'views/editUser.html'
+ })
+ // nested states
+ // each of these sections will have their own view
+ // url will be nested (/self/create)
+ .state('create.credentials', {
+ url: '/credentials',
+ templateUrl: 'views/user-credentials.html'
+ })
+ .state('create.groups', {
+ url: '/groups',
+ templateUrl: 'views/user-groups.html'
+ })
+ .state('create.plainSchemas', {
+ url: '/plainSchemas',
+ templateUrl: 'views/user-plain-schemas.html'
+ })
+ .state('create.derivedSchemas', {
+ url: '/derivedSchemas',
+ templateUrl: 'views/user-derived-schemas.html'
+ })
+ .state('create.virtualSchemas', {
+ url: '/virtualSchemas',
+ templateUrl: 'views/user-virtual-schemas.html'
+ })
+ .state('create.resources', {
+ url: '/resources',
+ templateUrl: 'views/user-resources.html'
+ })
+ .state('create.finish', {
+ url: '/finish',
+ templateUrl: 'views/user-form-finish.html'
+ })
+ .state('update', {
+ url: '/self/update',
+ templateUrl: 'views/editUser.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
--- End diff --
Also here: rename `AuthService`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by mteo <gi...@git.apache.org>.
Github user mteo commented on the pull request:
https://github.com/apache/syncope/pull/13#issuecomment-216263417
Hi @ilgrosso,
I made the changes. Thanks for the review.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on a diff in the pull request:
https://github.com/apache/syncope/pull/13#discussion_r61736063
--- Diff: client/enduser/src/main/resources/META-INF/resources/app/js/app.js ---
@@ -27,394 +29,409 @@ angular.module('info', []);
// Declare app level module which depends on views, and components
var app = angular.module('SyncopeEnduserApp', [
- 'ui.router',
- 'ui.bootstrap',
- 'ui.select',
- 'ngSanitize',
- 'ngAnimate',
- 'ngResource',
- 'ngCookies',
- 'treasure-overlay-spinner',
- 'ngPasswordStrength',
- 'kendo.directives',
- 'home',
- 'login',
- 'language',
- 'self',
- 'info'
+ 'ui.router',
--- End diff --
Please avoid this formatting-only modifications, they make harder to recognize actual changes.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on the pull request:
https://github.com/apache/syncope/pull/13#issuecomment-216268832
LGTM @mteo I'll go ahead and merge, thanks!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on a diff in the pull request:
https://github.com/apache/syncope/pull/13#discussion_r61735558
--- Diff: client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserAuthentication.java ---
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2016 The Apache Software Foundation.
--- End diff --
Bad license header: take a look at other Java files in the same package.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on a diff in the pull request:
https://github.com/apache/syncope/pull/13#discussion_r61735968
--- Diff: client/enduser/src/main/resources/META-INF/resources/app/js/app.js ---
@@ -1,3 +1,5 @@
+/* global $http, AuthService */
--- End diff --
Is this required? If not, please remove; otherwise move it past the license header.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on a diff in the pull request:
https://github.com/apache/syncope/pull/13#discussion_r61736304
--- Diff: client/enduser/src/main/resources/META-INF/resources/app/js/app.js ---
@@ -27,394 +29,409 @@ angular.module('info', []);
// Declare app level module which depends on views, and components
var app = angular.module('SyncopeEnduserApp', [
- 'ui.router',
- 'ui.bootstrap',
- 'ui.select',
- 'ngSanitize',
- 'ngAnimate',
- 'ngResource',
- 'ngCookies',
- 'treasure-overlay-spinner',
- 'ngPasswordStrength',
- 'kendo.directives',
- 'home',
- 'login',
- 'language',
- 'self',
- 'info'
+ 'ui.router',
+ 'ui.bootstrap',
+ 'ui.select',
+ 'ngSanitize',
+ 'ngAnimate',
+ 'ngResource',
+ 'ngCookies',
+ 'treasure-overlay-spinner',
+ 'ngPasswordStrength',
+ 'kendo.directives',
+ 'home',
+ 'login',
+ 'language',
+ 'self',
+ 'info'
]);
app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
- function ($stateProvider, $urlRouterProvider, $httpProvider) {
- // route configuration
- $stateProvider
- .state('home', {
- url: '/',
- templateUrl: 'views/self.html'
- })
- .state('self', {
- url: '/self',
- templateUrl: 'views/self.html'
- })
- .state('user-self-update', {
- url: '/user-self-update',
- templateUrl: 'views/home.html',
- controller: 'HomeController',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('create', {
- url: '/self/create',
- templateUrl: 'views/editUser.html'
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/create)
- .state('create.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html'
- })
- .state('create.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html'
- })
- .state('create.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html'
- })
- .state('create.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html'
- })
- .state('create.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html'
- })
- .state('create.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html'
- })
- .state('create.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html'
- })
- .state('update', {
- url: '/self/update',
- templateUrl: 'views/editUser.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/update)
- .state('update.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('passwordreset', {
- url: '/passwordreset',
- templateUrl: 'views/passwordreset.html'
- })
- .state('confirmpasswordreset', {
- url: '/confirmpasswordreset?token',
- templateUrl: 'views/confirmpasswordreset.html'
- })
- .state('mustchangepassword', {
- url: '/mustchangepassword',
- templateUrl: 'views/mustchangepassword.html'
- });
+ function ($stateProvider, $urlRouterProvider, $httpProvider) {
+ // route configuration
+ $stateProvider
+ .state('home', {
+ url: '/',
+ templateUrl: 'views/self.html'
+ })
+ .state('self', {
+ url: '/self',
+ templateUrl: 'views/self.html'
+ })
+ .state('user-self-update', {
+ url: '/user-self-update',
+ templateUrl: 'views/home.html',
+ controller: 'HomeController',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged()
+ }]
+ }
+ })
+ .state('create', {
+ url: '/self/create',
+ templateUrl: 'views/editUser.html'
+ })
+ // nested states
+ // each of these sections will have their own view
+ // url will be nested (/self/create)
+ .state('create.credentials', {
+ url: '/credentials',
+ templateUrl: 'views/user-credentials.html'
+ })
+ .state('create.groups', {
+ url: '/groups',
+ templateUrl: 'views/user-groups.html'
+ })
+ .state('create.plainSchemas', {
+ url: '/plainSchemas',
+ templateUrl: 'views/user-plain-schemas.html'
+ })
+ .state('create.derivedSchemas', {
+ url: '/derivedSchemas',
+ templateUrl: 'views/user-derived-schemas.html'
+ })
+ .state('create.virtualSchemas', {
+ url: '/virtualSchemas',
+ templateUrl: 'views/user-virtual-schemas.html'
+ })
+ .state('create.resources', {
+ url: '/resources',
+ templateUrl: 'views/user-resources.html'
+ })
+ .state('create.finish', {
+ url: '/finish',
+ templateUrl: 'views/user-form-finish.html'
+ })
+ .state('update', {
+ url: '/self/update',
+ templateUrl: 'views/editUser.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ // nested states
+ // each of these sections will have their own view
+ // url will be nested (/self/update)
+ .state('update.credentials', {
+ url: '/credentials',
+ templateUrl: 'views/user-credentials.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.plainSchemas', {
+ url: '/plainSchemas',
+ templateUrl: 'views/user-plain-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.derivedSchemas', {
+ url: '/derivedSchemas',
+ templateUrl: 'views/user-derived-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.virtualSchemas', {
+ url: '/virtualSchemas',
+ templateUrl: 'views/user-virtual-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.groups', {
+ url: '/groups',
+ templateUrl: 'views/user-groups.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.resources', {
+ url: '/resources',
+ templateUrl: 'views/user-resources.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
--- End diff --
Also here: rename `AuthService`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on the pull request:
https://github.com/apache/syncope/pull/13#issuecomment-216232120
Hi @mteo thanks for your PR!
There are few minor comments of mine: once fixed, I'll be happy to merge it.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by ilgrosso <gi...@git.apache.org>.
Github user ilgrosso commented on a diff in the pull request:
https://github.com/apache/syncope/pull/13#discussion_r61736403
--- Diff: client/enduser/src/main/resources/META-INF/resources/app/js/app.js ---
@@ -27,394 +29,409 @@ angular.module('info', []);
// Declare app level module which depends on views, and components
var app = angular.module('SyncopeEnduserApp', [
- 'ui.router',
- 'ui.bootstrap',
- 'ui.select',
- 'ngSanitize',
- 'ngAnimate',
- 'ngResource',
- 'ngCookies',
- 'treasure-overlay-spinner',
- 'ngPasswordStrength',
- 'kendo.directives',
- 'home',
- 'login',
- 'language',
- 'self',
- 'info'
+ 'ui.router',
+ 'ui.bootstrap',
+ 'ui.select',
+ 'ngSanitize',
+ 'ngAnimate',
+ 'ngResource',
+ 'ngCookies',
+ 'treasure-overlay-spinner',
+ 'ngPasswordStrength',
+ 'kendo.directives',
+ 'home',
+ 'login',
+ 'language',
+ 'self',
+ 'info'
]);
app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
- function ($stateProvider, $urlRouterProvider, $httpProvider) {
- // route configuration
- $stateProvider
- .state('home', {
- url: '/',
- templateUrl: 'views/self.html'
- })
- .state('self', {
- url: '/self',
- templateUrl: 'views/self.html'
- })
- .state('user-self-update', {
- url: '/user-self-update',
- templateUrl: 'views/home.html',
- controller: 'HomeController',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('create', {
- url: '/self/create',
- templateUrl: 'views/editUser.html'
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/create)
- .state('create.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html'
- })
- .state('create.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html'
- })
- .state('create.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html'
- })
- .state('create.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html'
- })
- .state('create.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html'
- })
- .state('create.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html'
- })
- .state('create.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html'
- })
- .state('update', {
- url: '/self/update',
- templateUrl: 'views/editUser.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- // nested states
- // each of these sections will have their own view
- // url will be nested (/self/update)
- .state('update.credentials', {
- url: '/credentials',
- templateUrl: 'views/user-credentials.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.plainSchemas', {
- url: '/plainSchemas',
- templateUrl: 'views/user-plain-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.derivedSchemas', {
- url: '/derivedSchemas',
- templateUrl: 'views/user-derived-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.virtualSchemas', {
- url: '/virtualSchemas',
- templateUrl: 'views/user-virtual-schemas.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.groups', {
- url: '/groups',
- templateUrl: 'views/user-groups.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.resources', {
- url: '/resources',
- templateUrl: 'views/user-resources.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('update.finish', {
- url: '/finish',
- templateUrl: 'views/user-form-finish.html',
- resolve: {
- 'authenticated': function (AuthenticationHelper) {
- return AuthenticationHelper.authenticated();
- }
- }
- })
- .state('passwordreset', {
- url: '/passwordreset',
- templateUrl: 'views/passwordreset.html'
- })
- .state('confirmpasswordreset', {
- url: '/confirmpasswordreset?token',
- templateUrl: 'views/confirmpasswordreset.html'
- })
- .state('mustchangepassword', {
- url: '/mustchangepassword',
- templateUrl: 'views/mustchangepassword.html'
- });
+ function ($stateProvider, $urlRouterProvider, $httpProvider) {
+ // route configuration
+ $stateProvider
+ .state('home', {
+ url: '/',
+ templateUrl: 'views/self.html'
+ })
+ .state('self', {
+ url: '/self',
+ templateUrl: 'views/self.html'
+ })
+ .state('user-self-update', {
+ url: '/user-self-update',
+ templateUrl: 'views/home.html',
+ controller: 'HomeController',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged()
+ }]
+ }
+ })
+ .state('create', {
+ url: '/self/create',
+ templateUrl: 'views/editUser.html'
+ })
+ // nested states
+ // each of these sections will have their own view
+ // url will be nested (/self/create)
+ .state('create.credentials', {
+ url: '/credentials',
+ templateUrl: 'views/user-credentials.html'
+ })
+ .state('create.groups', {
+ url: '/groups',
+ templateUrl: 'views/user-groups.html'
+ })
+ .state('create.plainSchemas', {
+ url: '/plainSchemas',
+ templateUrl: 'views/user-plain-schemas.html'
+ })
+ .state('create.derivedSchemas', {
+ url: '/derivedSchemas',
+ templateUrl: 'views/user-derived-schemas.html'
+ })
+ .state('create.virtualSchemas', {
+ url: '/virtualSchemas',
+ templateUrl: 'views/user-virtual-schemas.html'
+ })
+ .state('create.resources', {
+ url: '/resources',
+ templateUrl: 'views/user-resources.html'
+ })
+ .state('create.finish', {
+ url: '/finish',
+ templateUrl: 'views/user-form-finish.html'
+ })
+ .state('update', {
+ url: '/self/update',
+ templateUrl: 'views/editUser.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ // nested states
+ // each of these sections will have their own view
+ // url will be nested (/self/update)
+ .state('update.credentials', {
+ url: '/credentials',
+ templateUrl: 'views/user-credentials.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.plainSchemas', {
+ url: '/plainSchemas',
+ templateUrl: 'views/user-plain-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.derivedSchemas', {
+ url: '/derivedSchemas',
+ templateUrl: 'views/user-derived-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.virtualSchemas', {
+ url: '/virtualSchemas',
+ templateUrl: 'views/user-virtual-schemas.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.groups', {
+ url: '/groups',
+ templateUrl: 'views/user-groups.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.resources', {
+ url: '/resources',
+ templateUrl: 'views/user-resources.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('update.finish', {
+ url: '/finish',
+ templateUrl: 'views/user-form-finish.html',
+ resolve: {
+ 'authenticated': ['AuthService',
+ function (AuthService) {
+ return AuthService.islogged();
+ }]
+ }
+ })
+ .state('passwordreset', {
+ url: '/passwordreset',
+ templateUrl: 'views/passwordreset.html'
+ })
+ .state('confirmpasswordreset', {
+ url: '/confirmpasswordreset?token',
+ templateUrl: 'views/confirmpasswordreset.html'
+ })
+ .state('mustchangepassword', {
+ url: '/mustchangepassword',
+ templateUrl: 'views/mustchangepassword.html'
+ });
- // catch all other routes
- // send users to the home page
- $urlRouterProvider.otherwise('/');
+ // catch all other routes
+ // send users to the home page
+ $urlRouterProvider.otherwise('/');
- // HTTP service configuration
- $httpProvider.defaults.withCredentials = true;
- $httpProvider.defaults.xsrfCookieName = 'XSRF-TOKEN';
- $httpProvider.defaults.xsrfHeaderName = 'X-XSRF-TOKEN';
-
- //SYNCOPE-780
- $httpProvider.defaults.headers.common["If-Modified-Since"] = "0";
+ // HTTP service configuration
+ $httpProvider.defaults.withCredentials = true;
+ $httpProvider.defaults.xsrfCookieName = 'XSRF-TOKEN';
+ $httpProvider.defaults.xsrfHeaderName = 'X-XSRF-TOKEN';
- $httpProvider.interceptors.push(function ($q, $rootScope, $location) {
- var numLoadings = 0;
- return {
- 'request': function (config, a, b) {
- //if the url is an html, we're changing page
- if (config.url.indexOf('.html', config.url.length - 5) == -1) {
- $rootScope.$broadcast("xhrStarted");
- }
- $rootScope.spinner.on();
- return config || $q.when(config);
- },
- 'response': function (response) {
- //$http.pendingRequests.length
- $rootScope.spinner.off();
- return response || $q.when(response);
- },
- 'responseError': function (response) {
- $rootScope.spinner.off();
- if (response.config.url.indexOf("acceptError=true") == -1) {
- var status = response.status;
- if (status == 401) {
- console.log("ERROR " + status);
- }
- if (status == 403) {
- console.log("UNAUTHORIZED " + status);
- }
- if (status == 400 || status == 404 || status == 412 || status == 500) {
- console.log("GENERIC ERROR " + status);
- }
- }
- return $q.reject(response);
- }
- };
- });
+ //SYNCOPE-780
+ $httpProvider.defaults.headers.common["If-Modified-Since"] = "0";
+
+ $httpProvider.interceptors.push(function ($q, $rootScope, $location) {
+ var numLoadings = 0;
+ return {
+ 'request': function (config, a, b) {
+ //if the url is an html, we're changing page
+ if (config.url.indexOf('.html', config.url.length - 5) == -1) {
+ $rootScope.$broadcast("xhrStarted");
+ }
+ $rootScope.spinner.on();
+ return config || $q.when(config);
+ },
+ 'response': function (response) {
+ //$http.pendingRequests.length
+ $rootScope.spinner.off();
+ return response || $q.when(response);
+ },
+ 'responseError': function (response) {
+ $rootScope.spinner.off();
+ if (response.config.url.indexOf("acceptError=true") == -1) {
+ var status = response.status;
+ if (status == 401) {
+ console.log("ERROR " + status);
+ }
+ if (status == 403) {
+ console.log("UNAUTHORIZED " + status);
+ }
+ if (status == 400 || status == 404 || status == 412 || status == 500) {
+ console.log("GENERIC ERROR " + status);
+ }
+ }
+ return $q.reject(response);
+ }
+ };
+ });
- }]);
+ }]);
-app.run(['$rootScope', '$location', '$cookies', '$state',
- function ($rootScope, $location, $cookies, $state) {
- // main program
- // keep user logged in after page refresh
- // check if user is logged or not
- $rootScope.currentUser = $cookies.get('currentUser') || null;
- //If the route change failed due to authentication error, redirect them out
- $rootScope.$on('$routeChangeError', function (event, current, previous, rejection) {
- if (rejection === 'Not Authenticated') {
- $location.path('/self');
- }
- });
+app.run(['$rootScope', '$location', '$cookies', '$state', 'AuthService',
+ function ($rootScope, $location, $cookies, $state, AuthService) {
+ // main program
+ // keep user logged in after page refresh
+ //If the route change failed due to authentication error, redirect them out
+ $rootScope.$on('$routeChangeError', function (event, current, previous, rejection) {
+ if (rejection === 'Not Authenticated') {
+ $location.path('/self');
+ }
+ });
- $rootScope.$on('$stateChangeSuccess', function (event, toState) {
- if (toState.name === 'create') {
- $state.go('create.credentials');
- } else if (toState.name === 'update') {
- $state.go('update.credentials');
- }
- else {
- $state.go(toState);
- }
- });
+ $rootScope.$on('$stateChangeSuccess', function (event, toState) {
+ if (toState.name === 'create') {
+ $state.go('create.credentials');
+
+ }else if (toState.name === 'update') {
+ $state.go('update.credentials');
+
+ } else if (toState.name.indexOf("update") > -1) {
+ AuthService.islogged().then(function (response) {
+ if (response === "true") {
+ $state.go(toState);
+ } else {
+ $state.go('self');
+ }
+ }, function (response) {
+ console.log("not logged");
+ $state.go('self');
+ }
+ );
+
+ } else if (toState.name === 'home' || toState.name === 'self' ) {
+ AuthService.islogged().then(function (response) {
--- End diff --
Also here: rename `AuthService`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] syncope pull request: SYNCOPE-798 now cancel does logout
Posted by mteo <gi...@git.apache.org>.
Github user mteo commented on the pull request:
https://github.com/apache/syncope/pull/13#issuecomment-216227329
Pr is completed, now you can take a look.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---