Merge branch 'ngforward' of softwarepublico.gov.br:noosfero-themes/angular-theme into ngforward

ABNER SILVA DE OLIVEIRA
2 parents d2590816 d3439b88
Showing 6 changed files with 26 additions and 10 deletions Show diff stats
src/app/components/auth/auth_controller.spec.ts
src/app/components/auth/auth_service.spec.ts
src/app/components/auth/auth_service.ts
src/app/components/auth/session.ts
src/app/index.run.ts
src/app/main/main.component.ts
@@ -23,5 +23,6 @@ describe(&quot;AuthController&quot;, () =&gt; {
         expect(AuthServiceMock.login).toHaveBeenCalledWith(credentials);
     });
+    
 });
@@ -57,11 +57,21 @@ describe(&quot;Auth Service&quot;, () =&gt; {
             expect(eventEmmited).toBeTruthy(AUTH_EVENTS.loginSuccess + " was not emmited!");
         });
+        
+        it("should return the current logged in user", () => {
+           authService.login(credentials);
+           $httpBackend.flush();
+           let actual: User = authService.currentUser();           
+           expect(actual).toEqual(user, "The returned user must be present");                                  
+        });
+        it("should not return the current user after logout", () => {            
+           authService.logout();           
+           let actual: any = authService.currentUser();           
+           expect(actual).toEqual(undefined, "The returned user must not be defined");                                  
+        });
     });
-
-
-
+    
 });
 \ No newline at end of file
@@ -53,13 +53,17 @@ export class AuthService {
     }
     public isAuthenticated() {
-        return !!this.session.getCurrentUser();
+        return !!this.session.currentUser();
+    }
+    
+    public currentUser(): User {
+        return this.session.currentUser();
     }
     public isAuthorized(authorizedRoles: string | string[]) {
         if (!angular.isArray(authorizedRoles)) {
             authorizedRoles = [<string>authorizedRoles];
         }
-        return (this.isAuthenticated() && authorizedRoles.indexOf(this.session.getCurrentUser().userRole) !== -1);
+        return (this.isAuthenticated() && authorizedRoles.indexOf(this.session.currentUser().userRole) !== -1);
     }
 }
 \ No newline at end of file
@@ -20,7 +20,7 @@ export class Session {
         this.$log.debug('User session destroyed.');
     };
-    getCurrentUser(): User {
+    currentUser(): User {
         return this.$localStorage.currentUser;
     };
@@ -3,8 +3,8 @@ import {Session} from &quot;./components/auth/session&quot;;
 /** @ngInject */
 export function noosferoAngularRunBlock($log: ng.ILogService, Restangular: restangular.IService, Session: Session) {
     Restangular.addFullRequestInterceptor((element: any, operation: string, route: string, url: string, headers: string)  => {
-        if (Session.getCurrentUser()) {
-            (<any>headers)["Private-Token"] = Session.getCurrentUser().private_token;
+        if (Session.currentUser()) {
+            (<any>headers)["Private-Token"] = Session.currentUser().private_token;
         }
         return <any>{ headers: <any>headers };
     });
@@ -45,8 +45,9 @@ export class MainContent {
         component: MainContent,
         name: 'main',
         resolve: {
-            currentUser: function(AuthService: AuthService) {
-                return AuthService.loginFromCookie();
+            currentUser: function(AuthService: AuthService, $log: ng.ILogService) {
+                $log.debug("Main URL service...");
+                return AuthService.currentUser();
             }
         }
     },
	@@ -23,5 +23,6 @@ describe("AuthController", () => {		@@ -23,5 +23,6 @@ describe("AuthController", () => {
23	expect(AuthServiceMock.login).toHaveBeenCalledWith(credentials);	23	expect(AuthServiceMock.login).toHaveBeenCalledWith(credentials);
24		24
25	});	25	});
		26	+
26		27
27	});	28	});
	@@ -57,11 +57,21 @@ describe("Auth Service", () => {		@@ -57,11 +57,21 @@ describe("Auth Service", () => {
57		57
58	expect(eventEmmited).toBeTruthy(AUTH_EVENTS.loginSuccess + " was not emmited!");	58	expect(eventEmmited).toBeTruthy(AUTH_EVENTS.loginSuccess + " was not emmited!");
59	});	59	});
		60	+
		61	+ it("should return the current logged in user", () => {
		62	+ authService.login(credentials);
		63	+ $httpBackend.flush();
		64	+ let actual: User = authService.currentUser();
		65	+ expect(actual).toEqual(user, "The returned user must be present");
		66	+ });
60		67
		68	+ it("should not return the current user after logout", () => {
		69	+ authService.logout();
		70	+ let actual: any = authService.currentUser();
		71	+ expect(actual).toEqual(undefined, "The returned user must not be defined");
		72	+ });
61	});	73	});
62	-
63	-
64	-	74	+
65		75
66	});	76	});
67		77
68	\ No newline at end of file	78	\ No newline at end of file
	@@ -20,7 +20,7 @@ export class Session {		@@ -20,7 +20,7 @@ export class Session {
20	this.$log.debug('User session destroyed.');	20	this.$log.debug('User session destroyed.');
21	};	21	};
22		22
23	- getCurrentUser(): User {	23	+ currentUser(): User {
24	return this.$localStorage.currentUser;	24	return this.$localStorage.currentUser;
25	};	25	};
26		26