Route fix

src/Squidex/Configurations/Identity/LazyClientStore.cs

@@ -47,6 +47,10 @@ namespace Squidex.Configurations.Identity
                 ClientName = id,
                 RedirectUris = new List<string>
                 {
+                    options.BuildUrl("#/login;"),
+                    options.BuildUrl("#/logout;"),
+                    options.BuildUrl("login;"),
+                    options.BuildUrl("logout;"),
                     options.BuildUrl("identity-server/client-callback-silent/"),
                     options.BuildUrl("identity-server/client-callback-popup/")
                 },

src/Squidex/Configurations/Identity/MyIdentityOptions.cs

@@ -5,6 +5,9 @@
 //  Copyright (c) Squidex Group
 //  All rights reserved.
 // ==========================================================================
+
+using System;
+
 namespace Squidex.Configurations.Identity
 {
     public sealed class MyIdentityOptions
@@ -23,7 +26,14 @@ namespace Squidex.Configurations.Identity
 
         public string BuildUrl(string path)
         {
-            return $"{BaseUrl.TrimEnd('/')}/{path.Trim('/')}/";
+            var url = $"{BaseUrl.TrimEnd('/')}/{path.Trim('/')}";
+
+            if (url.IndexOf("?", StringComparison.OrdinalIgnoreCase) < 0 &&
+                url.IndexOf(";", StringComparison.OrdinalIgnoreCase) < 0) {
+                url = url + "/";
+            }
+
+            return url;
         }
     }
 }

src/Squidex/Startup.cs

@@ -149,11 +149,20 @@ namespace Squidex
             {
                 app.UseDeveloperExceptionPage();
                 app.UseWebpackProxy();
-                app.UseDefaultFiles();
+                
+                app.Use((context, next) => {
+                    context.Request.Path = new PathString("/index.html");
+
+                    return next();
+                });
             }
             else
             {
-                app.UseDefaultFiles(new DefaultFilesOptions { DefaultFileNames = new List<string> { "build/index.html" } });
+                app.Use((context, next) => {
+                    context.Request.Path = new PathString("/build/index.html");
+
+                    return next();
+                });
             }
 
             app.UseStaticFiles();

src/Squidex/app/app.routes.ts

@@ -10,7 +10,8 @@ import * as Ng2Router from '@angular/router';
 
 import {
     AppsPageComponent,
-    LoginPageComponent
+    LoginPageComponent,
+    LogoutPageComponent
 } from './components';
 
 import { 
@@ -31,7 +32,11 @@ export const routes: Ng2Router.Routes = [
     {
         path: 'login',
         component: LoginPageComponent
+    },
+    {
+        path: 'logout',
+        component: LogoutPageComponent
     }
 ];
 
-export const routing: Ng2.ModuleWithProviders = Ng2Router.RouterModule.forRoot(routes, { useHash: true });
+export const routing: Ng2.ModuleWithProviders = Ng2Router.RouterModule.forRoot(routes, { useHash: false });

src/Squidex/app/components/login/login.module.ts → src/Squidex/app/components/auth/auth.module.ts

@@ -10,7 +10,8 @@ import * as Ng2 from '@angular/core';
 import { SqxFrameworkModule } from './../../framework';
 
 import {
-    LoginPageComponent
+    LoginPageComponent,
+    LogoutPageComponent
 } from './declarations';
 
 @Ng2.NgModule({
@@ -18,7 +19,8 @@ import {
         SqxFrameworkModule
     ],
     declarations: [
-        LoginPageComponent
+        LoginPageComponent,
+        LogoutPageComponent
     ]
 })
 export class SqxLoginModule { }

src/Squidex/app/components/login/declarations.ts → src/Squidex/app/components/auth/declarations.ts

@@ -6,3 +6,4 @@
  */
 
 export * from './login-page.component';
+export * from './logout-page.component';

src/Squidex/app/components/login/index.ts → src/Squidex/app/components/auth/index.ts

@@ -7,4 +7,4 @@
 
 export * from './declarations';
 
-export * from './login.module';
+export * from './auth.module';

src/Squidex/app/components/auth/login-page.component.html

@@ -0,0 +1,5 @@
+<div *ngIf="showError">
+    <div class="simple-error">
+        Failed to login
+    </div>
+</div>

src/Squidex/app/components/auth/login-page.component.ts

@@ -0,0 +1,38 @@
+/*
+ * Squidex Headless CMS
+ * 
+ * @license
+ * Copyright (c) Sebastian Stehle. All rights reserved
+ */
+
+import * as Ng2 from '@angular/core';
+import * as Ng2Router from '@angular/router';
+
+import { AuthService } from './../../shared';
+
+@Ng2.Component({
+    selector: 'login',
+    template: ''
+})
+export class LoginPageComponent implements Ng2.OnInit {
+    public showError = false;
+
+    constructor(
+        private readonly authService: AuthService,
+        private readonly router: Ng2Router.Router
+    ) {
+    }
+
+    public ngOnInit() {
+        this.authService.loginComplete().subscribe(
+            () => {
+        debugger;
+                this.router.navigate(['/']);
+            },
+           e => {
+        debugger;
+                this.showError = true;
+            }
+        );
+    }
+}

src/Squidex/app/components/auth/logout-page.component.html

@@ -0,0 +1,5 @@
+<div *ngIf="showError">
+    <div class="simple-error">
+        Failed to login
+    </div>
+</div>

src/Squidex/app/components/login/login-page.component.ts → src/Squidex/app/components/auth/logout-page.component.ts

@@ -6,27 +6,27 @@
  */
 
 import * as Ng2 from '@angular/core';
-import * as Ng2Common from '@angular/common';
+import * as Ng2Router from '@angular/router';
 
 import { AuthService } from './../../shared';
 
 @Ng2.Component({
-    selector: 'login',
-    template
+    selector: 'logout',
+    template: ''
 })
-export class LoginPageComponent implements Ng2.OnInit {
+export class LogoutPageComponent implements Ng2.OnInit {
     public showFailedError = false;
 
     constructor(
         private readonly authService: AuthService,
-        private readonly location: Ng2Common.Location
+        private readonly router: Ng2Router.Router
     ) {
     }
 
     public ngOnInit() {
-        this.authService.login().subscribe(
+        this.authService.logoutComplete().subscribe(
             () => {
-                this.location.back();
+                this.router.navigate(['/']);
             },
             () => {
                 this.showFailedError = true;

src/Squidex/app/components/index.ts

@@ -6,5 +6,5 @@
  */
 
 export * from './apps';
+export * from './auth';
 export * from './layout';
-export * from './login';

src/Squidex/app/components/login/login-page.component.html

@@ -1,3 +0,0 @@
-<div>
-    Logging in
-</div>

src/Squidex/app/shared/guards/auth.guard.ts

@@ -10,28 +10,21 @@ import * as Ng2Router from '@angular/router';
 
 import { AuthService } from './../services/auth.service';
     
-const LOGIN_URL = '/login/';
-    
 @Ng2.Injectable()
 export class AuthGuard implements Ng2Router.CanActivate {
     constructor(
-        private readonly router: Ng2Router.Router,
         private readonly authService: AuthService
     ) {
     }
 
     public canActivate(route: Ng2Router.ActivatedRouteSnapshot, state: Ng2Router.RouterStateSnapshot): Promise<boolean> | boolean {
-        if (state.url !== LOGIN_URL) {
         return this.authService.checkLogin().then(isAuthenticated => {
             if (!isAuthenticated) {
-                    this.router.navigate([LOGIN_URL]);
+                this.authService.login();
 
                 return false;
             }
             return true;
         });
     }
-
-        return true;
-    }
 }

src/Squidex/app/shared/services/auth.service.ts

@@ -7,6 +7,7 @@
 
 import * as Ng2 from '@angular/core';
 import * as Ng2Http from '@angular/http';
+import * as Ng2Router from '@angular/router';
 
 import {
     Log,
@@ -38,7 +39,7 @@ export class AuthService {
     }
 
     constructor(apiUrl: ApiUrlConfig,
-        private readonly http: Ng2Http.Http, 
+        private readonly http: Ng2Http.Http
     ) {
         Log.logger = console;
 
@@ -47,6 +48,8 @@ export class AuthService {
                            client_id: 'squidex-frontend',
                                scope: 'squidex-api openid profile ',
                        response_type: 'id_token token',
+                        redirect_uri: apiUrl.buildUrl('/login;'),
+            post_logout_redirect_uri: apiUrl.buildUrl('/logout;'),
                  silent_redirect_uri: apiUrl.buildUrl('identity-server/client-callback-silent/'),
                   popup_redirect_uri: apiUrl.buildUrl('identity-server/client-callback-popup/'),
                            authority: apiUrl.buildUrl('identity-server/'),
@@ -82,17 +85,19 @@ export class AuthService {
     }
 
     public logout(): Observable<any> {
+        return Observable.fromPromise(this.userManager.signoutRedirect());
+    }
+
+    public logoutComplete(): Observable<any> {
         return Observable.fromPromise(this.userManager.signoutRedirectCallback());
     }
 
-    public login(): Observable<boolean> {
-        const userPromise =
-            this.checkState(this.userManager.signinSilent())
-                .then(result => {
-                    return result || this.checkState(this.userManager.signinPopup());
-                });
+    public login(): Observable<any> {
+        return Observable.fromPromise(this.userManager.signinRedirect());
+    }
 
-        return Observable.fromPromise(userPromise);
+    public loginComplete(): Observable<any> {
+        return Observable.fromPromise(this.userManager.signinRedirectCallback());
     }
 
     private onAuthenticated(user: User) {