DigitaleBibliothek / Frontend / ce31ef0d0f5

Commits

Art Lowel authored and GitHub committed ce31ef0d0f5 Merge 14 Nov 2019

Merge pull request #511 from mspalti/login_redirect_encoding_fix

Prevent encoding of query after login redirect.

src/app/core/auth/auth.service.spec.ts

Modified

-242
+      expect(storage.set).toHaveBeenCalled();
-243
+    });
-244
-245
+    it('should remove token from storage', () => {
-246
+      authService.removeToken();
-247
+      expect(storage.remove).toHaveBeenCalled();
-248
+    });
-249
-250
+    it ('should set redirect url to previous page', () => {
-251
+      spyOn(routeServiceMock, 'getHistory').and.callThrough();
-+
+      spyOn(routerStub, 'navigateByUrl');
-253
+      authService.redirectAfterLoginSuccess(true);
-254
+      expect(routeServiceMock.getHistory).toHaveBeenCalled();
--
+      expect(routerStub.navigate).toHaveBeenCalledWith(['/collection/123']);
-+
+      expect(routerStub.navigateByUrl).toHaveBeenCalledWith('/collection/123');
-256
+    });
-257
-258
+    it ('should set redirect url to current page', () => {
-259
+      spyOn(routeServiceMock, 'getHistory').and.callThrough();
-+
+      spyOn(routerStub, 'navigateByUrl');
-261
+      authService.redirectAfterLoginSuccess(false);
-262
+      expect(routeServiceMock.getHistory).toHaveBeenCalled();
--
+      expect(routerStub.navigate).toHaveBeenCalledWith(['/home']);
-+
+      expect(routerStub.navigateByUrl).toHaveBeenCalledWith('/home');
-264
+    });
-265
-266
+    it ('should redirect to / and not to /login', () => {
-267
+      spyOn(routeServiceMock, 'getHistory').and.returnValue(observableOf(['/login', '/login']));
-+
+      spyOn(routerStub, 'navigateByUrl');
-269
+      authService.redirectAfterLoginSuccess(true);
-270
+      expect(routeServiceMock.getHistory).toHaveBeenCalled();
--
+      expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
-+
+      expect(routerStub.navigateByUrl).toHaveBeenCalledWith('/');
-272
+    });
-273
-274
+    it ('should redirect to / when no redirect url is found', () => {
-275
+      spyOn(routeServiceMock, 'getHistory').and.returnValue(observableOf(['']));
-+
+      spyOn(routerStub, 'navigateByUrl');
-277
+      authService.redirectAfterLoginSuccess(true);
-278
+      expect(routeServiceMock.getHistory).toHaveBeenCalled();
--
+      expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
-+
+      expect(routerStub.navigateByUrl).toHaveBeenCalledWith('/');
-280
+    });
-281
+  });
-282
+});

Frontend

Commits

Jira Issues

Add shortcut