Update auth service.

Leonardo Merlin
1 parent a6016ff2
Showing 6 changed files with 223 additions and 47 deletions Show diff stats
src/app/components/auth/auth.service.js
src/app/index.config.js
src/app/index.constants.js
src/app/index.run.js
src/app/pages/auth/auth.controller.js
src/app/pages/auth/signin.html
@@ -10,6 +10,115 @@
   /** @ngInject */
   function AuthService($http, $rootScope, Session, AUTH_EVENTS, API, $log) {
+    function register (data){
+      var url = API.host + '/api/v1/register';
+      $log.debug('data', data);
+      // var encodedData = data;
+      var encodedData = '';
+      encodedData += 'name=' + data.name;
+      encodedData += '&email=' + data.email;
+      encodedData += '&login=' + data.email.substr(0, data.email.indexOf('@')).toLowerCase().replace(/\W+/g,"").substr(0,25) + "-" + Date.now();
+      encodedData += '&email=' + data.email;
+      encodedData += '&password=' + data.password;
+      encodedData += '&password_confirmation=' + data.password_confirmation;
+      encodedData += '&user_terms_accepted=' + data.user_terms_accepted;
+
+      // var encodedData = _encodeObj(data);
+      // var encodedData = angular.element.param(data);
+      // '&email=&login=&name=&password=&password_confirmation';
+      // oauth_providers
+      // oauth_signup_token
+      // captcha_text
+      // user_terms_accepted
+
+      return $http.post(url, encodedData)
+        .then(function(response) {
+          $log.debug('AuthService.register [SUCCESS] response', response);
+
+          var currentUser = Session.create(response.data);
+
+          $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser);
+          $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
+
+          return response;
+        }, function(response) {
+          $log.debug('AuthService.register [FAIL] response', response);
+
+          $rootScope.$broadcast(AUTH_EVENTS.registerFailed);
+          return response;
+        });
+    }
+
+    function activate (code) {
+      var url = '/api/v1/activate';
+      var data = {
+        private_token: API.token,
+        activation_code: code
+      };
+      var encodedData = 'private_token=' + API.token;
+      encodedData += '&activation_code=' + code;
+
+      return $http
+        .patch(url, encodedData)
+        .then(function(response) {
+          $log.debug('AuthService.activate [SUCCESS] response', response);
+
+          // 'Usuário ativado com sucesso'
+          $rootScope.$broadcast(AUTH_EVENTS.activateSuccess, response);
+          return currentUser;
+        }, function(response) {
+          // 'Erro: O código de ativação é inválido.'
+          $log.debug('AuthService.activate [FAIL] response', response);
+          $rootScope.$broadcast(AUTH_EVENTS.activateFailed);
+        });
+    }
+
+    function changePassword (code, newPassword, newPasswordConfirmation){
+      var url = '/api/v1/new_password';
+      var data = {
+        code: code,
+        password: newPassword,
+        password_confirmation: newPasswordConfirmation
+      };
+      var encodedData = 'code=' + code;
+      encodedData += '&password=' + newPassword;
+      encodedData += '&password_confirmation=' + newPasswordConfirmation;
+
+      return $http
+        .patch(url, encodedData)
+        .then(function(response) {
+          $log.debug('AuthService.changePassword [SUCCESS] response', response);
+
+          // 'Senha alterada com sucesso.'
+          $rootScope.$broadcast(AUTH_EVENTS.changePasswordSuccess, response);
+          return currentUser;
+        }, function(response) {
+          // 'Não foi possível trocar a senha com os dados informados.'
+          $log.debug('AuthService.changePassword [FAIL] response', response);
+          $rootScope.$broadcast(AUTH_EVENTS.changePasswordFailed);
+        });
+    }
+
+    function forgotPassword (form){
+      var url = '/api/v1/forgot_password';
+      var data = form.serialize();
+      var encodedData = data;
+
+      return $http
+        .post(url, encodedData)
+        .then(function(response) {
+          $log.debug('AuthService.forgotPassword [SUCCESS] response', response);
+
+          // 'Verifique seu email para efetuar a troca da senha.'
+          $rootScope.$broadcast(AUTH_EVENTS.forgotPasswordSuccess, response);
+          return currentUser;
+        }, function(response) {
+          // 'Não foi possível requisitar a troca de senha para os dados informados.'
+          $log.debug('AuthService.forgotPassword [FAIL] response', response);
+          $rootScope.$broadcast(AUTH_EVENTS.forgotPasswordFailed);
+        });
+    }
+
     function login (credentials) {
       var hostProd = 'http://login.dialoga.gov.br';
       var url = hostProd + '/api/v1/login';
@@ -49,7 +158,27 @@
       return (service.isAuthenticated() && authorizedRoles.indexOf(Session.userRole) !== -1);
     }
+    function _encodeObj(obj){
+      var result = [];
+      var str = null;
+      var p = null;
+
+      for (p in obj) {
+        if (obj.hasOwnProperty(p)) {
+          // str = encodeURIComponent(p) + '=' + obj[p];
+          str = p + '=' + obj[p];
+          result.push(str);
+        }
+      }
+
+      return result.join('&');
+    }
+
     var service = {
+      register: register,
+      activate: activate,
+      changePassword: changePassword,
+      forgotPassword: forgotPassword,
       login: login,
       logout: logout,
       isAuthenticated: isAuthenticated,
@@ -3,11 +3,17 @@
   angular
     .module('dialoga')
+    // .config(configWhitelist)
     .config(configHeadersInterceptor)
     .config(configLocationProvider)
     .config(configBreadcrumbProvider)
     .config(config);
+  // /** @ngInject */
+  // function configWhitelist($sceDelegateProvider) {
+  //   $sceDelegateProvider.resourceUrlWhitelist(['self', 'http://dialoga.gov.br/**', 'http://*.dialoga.gov.br/**']);
+  // }
+
   /** @ngInject */
   function configHeadersInterceptor ($httpProvider){
@@ -20,8 +26,16 @@
     // $httpProvider.defaults.useXDomain = true;
     // $httpProvider.defaults.headers.common = {Accept: 'application/json, text/plain, */*'};
     // $httpProvider.defaults.headers.post = {'Content-Type': "application/json;charset=utf-8"};
-    $httpProvider.defaults.headers.post = {'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8'};
+    $httpProvider.defaults.headers.post = {'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8'};
+    // $httpProvider.defaults.headers.post = {'Content-Type': undefined};
+    // $httpProvider.defaults.headers.post['Access-Control-Allow-Headers'] = '*';
+    // $httpProvider.defaults.headers.post['Access-Control-Allow-Methods'] = '*';
+    // $httpProvider.defaults.headers.post['Access-Control-Allow-Origin'] = '*';
     // $httpProvider.defaults.headers.common['Access-Control-Allow-Headers'] = '*';
+    // $httpProvider.defaults.headers.common['Access-Control-Allow-Methods'] = '*';
+    // $httpProvider.defaults.headers.common['Access-Control-Allow-Origin'] = '*';
+
+    $httpProvider.defaults.transformRequest = false;
     $httpProvider.interceptors.push([
       '$injector',
@@ -6,9 +6,7 @@
     .module('dialoga')
     .constant('API', {
       token: null,
-      hostDev: '',
-      hostHom: 'http://hom.dialoga.gov.br',
-      hostProd: 'http://login.dialoga.gov.br',
+      host: 'http://hom.dialoga.gov.br',
       articleId: {
         home: '103358',
         about: '108073',
@@ -19,7 +17,14 @@
     .constant('AUTH_EVENTS', {
       loginSuccess: 'auth-login-success',
       loginFailed: 'auth-login-failed',
-      logoutSuccess: 'auth-logout-success',
+      registerSuccess: 'auth-register-success',
+      registerFailed: 'auth-register-failed',
+      activateSuccess: 'auth-activate-success',
+      activateFailed: 'auth-activate-failed',
+      changePasswordSuccess: 'auth-changePassword-success',
+      changePasswordFailed: 'auth-changePassword-failed',
+      forgotPassowrdSuccess: 'auth-forgotPassowrd-success',
+      forgotPassowrdFailed: 'auth-forgotPassowrd-failed',
       sessionTimeout: 'auth-session-timeout',
       notAuthenticated: 'auth-not-authenticated',
       notAuthorized: 'auth-not-authorized'
@@ -111,9 +111,8 @@
   /** @ngInject */
   function runPath($rootScope, API, $window, $log) {
-    var isProd = (/^http:\/\/dialoga\.gov\.br\//.test($window.location.href));
-    var isHom = (/^http:\/\/hom.dialoga\.gov\.br\//.test($window.location.href));
-    $rootScope.basePath = isProd ? API.hostProd : (isHom ? API.hostHom : API.hostDev);
+    // $rootScope.basePath = API.host;
+    $rootScope.basePath = '';
     $log.debug('[RUN] Path end.');
   }
@@ -27,7 +27,8 @@
     var vm = this;
     // init variables
-    vm.credentials = {};
+    vm.signin = {};
+    vm.singup = {};
     vm.terms = null;
     vm.loadingTerms = null;
@@ -35,15 +36,14 @@
     vm.currentUser = vm.Session.getCurrentUser();
       // handle login
-      vm.$scope.$on(vm.AUTH_EVENTS.loginSuccess, function () {
-        vm.currentUser = vm.Session.getCurrentUser();
-      });
-
-      // handle logout
-      vm.$scope.$on(vm.AUTH_EVENTS.logoutSuccess, function () {
-        vm.currentUser = vm.Session.getCurrentUser();
-      });
-    // ...
+    vm.$scope.$on(vm.AUTH_EVENTS.loginSuccess, function () {
+      vm.currentUser = vm.Session.getCurrentUser();
+    });
+
+    // handle logout
+    vm.$scope.$on(vm.AUTH_EVENTS.logoutSuccess, function () {
+      vm.currentUser = vm.Session.getCurrentUser();
+    });
   };
   AuthPageController.prototype.loadData = function() {
@@ -68,7 +68,25 @@
     vm.AuthService.logout();
   };
-  AuthPageController.prototype.login = function(credentials) {
+  AuthPageController.prototype.submitSigup = function(credentials) {
+    var vm = this;
+
+    vm.AuthService.register(credentials).then(function(response){
+      vm.$log.debug('register success.response', response);
+
+      // TODO: mensagens de sucesso
+      // 'Cadastro efetuado com sucesso.'
+      // 'Verifique seu email para confirmar o cadastro.'
+
+    }, function(response){
+      vm.$log.debug('register error.response', response);
+
+      // TODO: mensagens de erro
+      // TODO: tratar multiplos erros
+    });
+  };
+
+  AuthPageController.prototype.submitSignin = function(credentials) {
     var vm = this;
     vm.AuthService.login(credentials).then(function(user) {
@@ -24,17 +24,17 @@
             <div class="col-md-12">
               <h2>Já possui cadastro</h2>
               <p>Use seus dados para acessar o Dialoga Brasil</p>
-              <form role="form" name="loginForm" ng-submit="pageSignin.login(pageSignin.credentials)" novalidate>
+              <form role="form" name="signinForm" ng-submit="pageSignin.submitSignin(pageSignin.signin)" novalidate>
                 <div class="form-group">
-                  <label for="inputLoginUsername">E-mail*</label>
-                  <input type="email" id="inputLoginUsername" name="inputLoginUsername" class="form-control input-lg" ng-class="{ 'has-error' : loginForm.inputLoginUsername.$invalid && loginForm.inputLoginUsername.$touched }" ng-model="pageSignin.credentials.username" required/>
+                  <label for="signin-form--login">E-mail*</label>
+                  <input type="email" id="signin-form--login" name="login" class="form-control input-lg" ng-class="{ 'has-error' : signinForm.login.$invalid && signinForm.login.$touched }" ng-model="pageSignin.signin.username" required/>
                   <!-- Diretiva validation-messages -->
-                  <validation-messages field="loginForm.inputLoginUsername"/>
+                  <validation-messages field="signinForm.login"/>
                 </div>
                 <div class="form-group">
-                  <label for="inputLoginPassword">Senha*</label>
-                  <input type="password" id="inputLoginPassword" name="inputLoginPassword" class="form-control input-lg" ng-class="{ 'has-error' : loginForm.inputLoginPassword.$invalid && loginForm.inputLoginPassword.$touched }" ng-model="pageSignin.credentials.password" required>
-                  <validation-messages field="loginForm.inputLoginPassword"/>
+                  <label for="signin-form--password">Senha*</label>
+                  <input type="password" id="signin-form--password" name="password" class="form-control input-lg" ng-class="{ 'has-error' : signinForm.password.$invalid && signinForm.password.$touched }" ng-model="pageSignin.signin.password" required>
+                  <validation-messages field="signinForm.password"/>
                 </div>
                 <div class="form-group">
                   <button class="btn btn-lg btn-block btn-submit" type="submit">Entrar</button>
@@ -119,55 +119,66 @@
             </div>
             <div class="row">
               <div class="col-sm-12">
-                <form name="cadastroForm">
+                <form name="signupForm" ng-submit="pageSignin.submitSigup(pageSignin.signup)">
                   <div class="form-group">
-                    <label for="inputNome">Nome:</label>
+                    <label for="signup-form--name">Nome*:</label>
                     <span class="pull-right">*Dados obrigatórios</span>
-                    <input type="text" id="inputNome" name="inputNome" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputNome.$invalid && cadastroForm.inputNome.$touched }" ng-model="nome" ng-minlength="" ng-maxlength="" required>
-                    <validation-messages field="cadastroForm.inputNome"/>
+                    <input type="text" id="signup-form--name" name="name" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.name.$invalid && signupForm.name.$touched }" ng-model="pageSignin.signup.name" ng-minlength="" ng-maxlength="" required>
+                    <validation-messages field="signupForm.name"/>
                   </div>
                   <div class="form-group">
-                    <label for="inputEmail">E-mail*</label>
-                    <input type="email" id="inputEmail" name="inputEmail" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputEmail.$invalid && cadastroForm.inputEmail.$touched }" ng-model="email" ng-minlength="" ng-maxlength="" required>
-                    <validation-messages field="cadastroForm.inputEmail"/>
+                    <label for="signup-form--email">E-mail*:</label>
+                    <input type="email" id="signup-form--email" name="email" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.email.$invalid && signupForm.email.$touched }" ng-model="pageSignin.signup.email" ng-minlength="" ng-maxlength="" required>
+                    <validation-messages field="signupForm.email"/>
                   </div>
                   <div class="row">
                     <div class="col-sm-6">
                       <div class="form-group">
-                        <label for="inputPassword">Senha:</label>
-                        <input type="password" id="inputPassword" name="inputPassword" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputPassword.$invalid && cadastroForm.inputPassword.$touched }" ng-model="senha" ng-minlength="" ng-maxlength="" required>
-                        <validation-messages field="cadastroForm.inputPassword"/>
+                        <label for="signup-form--password">Senha*:</label>
+                        <input type="password" id="signup-form--password" name="password" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.password.$invalid && signupForm.password.$touched }" ng-model="pageSignin.signup.password" ng-minlength="" ng-maxlength="" required>
+                        <validation-messages field="signupForm.password"/>
                       </div>
                     </div>
                     <div class="col-sm-6">
                       <div class="form-group">
-                        <label for="inputRepeatPassword">Confirmar Senha:</label>
-                        <input type="password" id="inputRepeatPassword" name="inputRepeatPassword" class="form-control input-lg" ng-class="{ 'has-error' : cadastroForm.inputRepeatPassword.$invalid && cadastroForm.inputRepeatPassword.$touched }" ng-model="senhaRepetida" ng-minlength="" ng-maxlength="" required>
-                        <validation-messages field="cadastroForm.inputRepeatPassword"/>
+                        <label for="signup-form--password-confirmation">Confirmar Senha*:</label>
+                        <input type="password" id="signup-form--password-confirmation" name="password_confirmation" class="form-control input-lg" ng-class="{ 'has-error' : signupForm.password_confirmation.$invalid && signupForm.password_confirmation.$touched }" ng-model="pageSignin.signup.password_confirmation" ng-minlength="" ng-maxlength="" required>
+                        <validation-messages field="signupForm.password_confirmation"/>
                       </div>
                     </div>
                   </div>
                   <div class="row">
+                    <div class="col-sm-12" ng-show="(signupForm.password.$viewValue.length > 0 && signupForm.password_confirmation.$viewValue.length > 0) && (signupForm.password.$viewValue !== signupForm.password_confirmation.$viewValue)">
+                      <div class="error-message">
+                        As senhas estão diferentes.
+                      </div>
+                    </div>
                     <div class="col-sm-12">
-                      <span class="text">
-                        A senha deve ter 6 ou mais caracteres e conter números e letras.
+                      <span class="text" ng-show="signupForm.password.$viewValue.length > 0 && signupForm.password.$viewValue.length < 6">
+                        <div class="error-message">
+                          A senha deve ter 6 ou mais caracteres e conter números e letras.
+                        </div>
                       </span>
                     </div>
                   </div>
                   <div class="form-group">
-                    <input type="checkbox" id="termosDeUso" name="termosDeUso" value="aceito"  ng-model="termosDeUso" required>
-                    Já li os
-                    <button type="button" class="btn btn-link" data-toggle="modal" data-target="#modalTermosDeUso">Termos de Uso</button>
-                    e concordo com os mesmos*
+                    <div class="checkbox">
+                      <label for="user_terms_accepted">
+                        <input type="checkbox" id="user_terms_accepted" name="user_terms_accepted" value="aceito"  ng-model="pageSignin.signup.user_terms_accepted" required>
+                        Já li os
+                        <button type="button" class="btn btn-link" style="padding:0 0 4px 0;" data-toggle="modal" data-target="#modalTermosDeUso">Termos de Uso</button>
+                        e concordo com os mesmos*
+                      </label>
+                    </div>
                   </input>
-                  <validation-messages field="cadastroForm.termosDeUso"/>
+                  <validation-messages field="signupForm.user_terms_accepted"/>
                 </div>
                 <div class="form-group">
                   <span>Digite o texto da imagem</span>
                   <p>O Captcha vai aqui</p>
                 </div>
                 <div class="form-group">
-                  <button class="btn btn-lg btn-block btn-submit " ng-class=" {'disabled' : !termosDeUso }"type="submit">Cadastrar</button>
+                  <button class="btn btn-lg btn-block btn-submit" ng-class=" {'disabled' : !pageSignin.signup.user_terms_accepted }" type="submit">Cadastrar</button>
                 </div>
               </form>
             </div>
	@@ -10,6 +10,115 @@		@@ -10,6 +10,115 @@
10	/** @ngInject */	10	/** @ngInject */
11	function AuthService($http, $rootScope, Session, AUTH_EVENTS, API, $log) {	11	function AuthService($http, $rootScope, Session, AUTH_EVENTS, API, $log) {
12		12
		13	+ function register (data){
		14	+ var url = API.host + '/api/v1/register';
		15	+ $log.debug('data', data);
		16	+ // var encodedData = data;
		17	+ var encodedData = '';
		18	+ encodedData += 'name=' + data.name;
		19	+ encodedData += '&email=' + data.email;
		20	+ encodedData += '&login=' + data.email.substr(0, data.email.indexOf('@')).toLowerCase().replace(/\W+/g,"").substr(0,25) + "-" + Date.now();
		21	+ encodedData += '&email=' + data.email;
		22	+ encodedData += '&password=' + data.password;
		23	+ encodedData += '&password_confirmation=' + data.password_confirmation;
		24	+ encodedData += '&user_terms_accepted=' + data.user_terms_accepted;
		25	+
		26	+ // var encodedData = _encodeObj(data);
		27	+ // var encodedData = angular.element.param(data);
		28	+ // '&email=&login=&name=&password=&password_confirmation';
		29	+ // oauth_providers
		30	+ // oauth_signup_token
		31	+ // captcha_text
		32	+ // user_terms_accepted
		33	+
		34	+ return $http.post(url, encodedData)
		35	+ .then(function(response) {
		36	+ $log.debug('AuthService.register [SUCCESS] response', response);
		37	+
		38	+ var currentUser = Session.create(response.data);
		39	+
		40	+ $rootScope.$broadcast(AUTH_EVENTS.registerSuccess, currentUser);
		41	+ $rootScope.$broadcast(AUTH_EVENTS.loginSuccess, currentUser);
		42	+
		43	+ return response;
		44	+ }, function(response) {
		45	+ $log.debug('AuthService.register [FAIL] response', response);
		46	+
		47	+ $rootScope.$broadcast(AUTH_EVENTS.registerFailed);
		48	+ return response;
		49	+ });
		50	+ }
		51	+
		52	+ function activate (code) {
		53	+ var url = '/api/v1/activate';
		54	+ var data = {
		55	+ private_token: API.token,
		56	+ activation_code: code
		57	+ };
		58	+ var encodedData = 'private_token=' + API.token;
		59	+ encodedData += '&activation_code=' + code;
		60	+
		61	+ return $http
		62	+ .patch(url, encodedData)
		63	+ .then(function(response) {
		64	+ $log.debug('AuthService.activate [SUCCESS] response', response);
		65	+
		66	+ // 'Usuário ativado com sucesso'
		67	+ $rootScope.$broadcast(AUTH_EVENTS.activateSuccess, response);
		68	+ return currentUser;
		69	+ }, function(response) {
		70	+ // 'Erro: O código de ativação é inválido.'
		71	+ $log.debug('AuthService.activate [FAIL] response', response);
		72	+ $rootScope.$broadcast(AUTH_EVENTS.activateFailed);
		73	+ });
		74	+ }
		75	+
		76	+ function changePassword (code, newPassword, newPasswordConfirmation){
		77	+ var url = '/api/v1/new_password';
		78	+ var data = {
		79	+ code: code,
		80	+ password: newPassword,
		81	+ password_confirmation: newPasswordConfirmation
		82	+ };
		83	+ var encodedData = 'code=' + code;
		84	+ encodedData += '&password=' + newPassword;
		85	+ encodedData += '&password_confirmation=' + newPasswordConfirmation;
		86	+
		87	+ return $http
		88	+ .patch(url, encodedData)
		89	+ .then(function(response) {
		90	+ $log.debug('AuthService.changePassword [SUCCESS] response', response);
		91	+
		92	+ // 'Senha alterada com sucesso.'
		93	+ $rootScope.$broadcast(AUTH_EVENTS.changePasswordSuccess, response);
		94	+ return currentUser;
		95	+ }, function(response) {
		96	+ // 'Não foi possível trocar a senha com os dados informados.'
		97	+ $log.debug('AuthService.changePassword [FAIL] response', response);
		98	+ $rootScope.$broadcast(AUTH_EVENTS.changePasswordFailed);
		99	+ });
		100	+ }
		101	+
		102	+ function forgotPassword (form){
		103	+ var url = '/api/v1/forgot_password';
		104	+ var data = form.serialize();
		105	+ var encodedData = data;
		106	+
		107	+ return $http
		108	+ .post(url, encodedData)
		109	+ .then(function(response) {
		110	+ $log.debug('AuthService.forgotPassword [SUCCESS] response', response);
		111	+
		112	+ // 'Verifique seu email para efetuar a troca da senha.'
		113	+ $rootScope.$broadcast(AUTH_EVENTS.forgotPasswordSuccess, response);
		114	+ return currentUser;
		115	+ }, function(response) {
		116	+ // 'Não foi possível requisitar a troca de senha para os dados informados.'
		117	+ $log.debug('AuthService.forgotPassword [FAIL] response', response);
		118	+ $rootScope.$broadcast(AUTH_EVENTS.forgotPasswordFailed);
		119	+ });
		120	+ }
		121	+
13	function login (credentials) {	122	function login (credentials) {
14	var hostProd = 'http://login.dialoga.gov.br';	123	var hostProd = 'http://login.dialoga.gov.br';
15	var url = hostProd + '/api/v1/login';	124	var url = hostProd + '/api/v1/login';
	@@ -49,7 +158,27 @@		@@ -49,7 +158,27 @@
49	return (service.isAuthenticated() && authorizedRoles.indexOf(Session.userRole) !== -1);	158	return (service.isAuthenticated() && authorizedRoles.indexOf(Session.userRole) !== -1);
50	}	159	}
51		160
		161	+ function _encodeObj(obj){
		162	+ var result = [];
		163	+ var str = null;
		164	+ var p = null;
		165	+
		166	+ for (p in obj) {
		167	+ if (obj.hasOwnProperty(p)) {
		168	+ // str = encodeURIComponent(p) + '=' + obj[p];
		169	+ str = p + '=' + obj[p];
		170	+ result.push(str);
		171	+ }
		172	+ }
		173	+
		174	+ return result.join('&');
		175	+ }
		176	+
52	var service = {	177	var service = {
		178	+ register: register,
		179	+ activate: activate,
		180	+ changePassword: changePassword,
		181	+ forgotPassword: forgotPassword,
53	login: login,	182	login: login,
54	logout: logout,	183	logout: logout,
55	isAuthenticated: isAuthenticated,	184	isAuthenticated: isAuthenticated,