remove useless code and implement

Author: NEXUS\Anthony.Giretti

.angular-cli.json

@@ -10,10 +10,7 @@
       "assets": [
         "assets",
         "favicon.ico",
-        "keys.json",
-        "web.config",
-        "silent-refresh.html",
-        "oidc-client.min.js"
+        "web.config"
       ],
       "index": "index.html",
       "main": "main.ts",

package.json

@@ -21,10 +21,8 @@
     "@angular/platform-browser": "^5.2.0",
     "@angular/platform-browser-dynamic": "^5.2.0",
     "@angular/router": "^5.2.0",
-    "babel-polyfill": "^6.26.0",
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.4.1",
-    "oidc-client": "^1.4.1",
     "rxjs": "^5.5.6",
     "zone.js": "^0.8.19"
   },

src/app/app.module.ts

@@ -9,7 +9,8 @@ import { AppComponent } from './app.component';
 
 import { ProtectedComponent } from './protected/protected.component';
 import { AuthCallbackComponent } from './auth-callback/auth-callback.component';
-import { SilentRefreshComponent } from './silentrefresh/silentrefresh.component';
+import { Adal5Service, Adal5HTTPService } from 'adal-angular5';
+import { HttpClient } from '@angular/common/http';
 
 const routes: Routes = [
     {
@@ -25,26 +26,20 @@ const routes: Routes = [
       path: 'auth-callback',
       component: AuthCallbackComponent
     }
-    ,
-    {
-      path: 'silentrefresh',
-      component: SilentRefreshComponent
-    }
 ];
 
 @NgModule({
   declarations: [
     AppComponent,
     ProtectedComponent,
-    AuthCallbackComponent,
-    SilentRefreshComponent
+    AuthCallbackComponent
   ],
   imports: [
     BrowserModule,
     RouterModule.forRoot(routes)
   ],
   exports: [RouterModule],
-  providers: [AuthGuardService, AuthService],
+  providers: [AuthGuardService, AuthService, Adal5Service,{ provide: Adal5HTTPService, useFactory: Adal5HTTPService.factory, deps: [HttpClient, Adal5Service] } ],
   bootstrap: [AppComponent]
 })
 export class AppModule { }

src/app/auth-callback/auth-callback.component.html

@@ -1,3 +0,0 @@
-<p>
-  auth-callback works!
-</p>

src/app/auth-callback/auth-callback.component.ts

@@ -14,14 +14,11 @@ export class AuthCallbackComponent implements OnInit {
   ngOnInit() {
 
 
-      console.log(document.location.href);
+    this._authService.completeAuthentication();
 
-
-    this._authService.completeAuthentication().then(() => {
-      this._zone.run(
-        () => this._router.navigate(['/protected'])
-      );
-    });
+    setTimeout(() => {this._zone.run(
+      () => this._router.navigate(['/protected'])
+    );},200);
+    
   }
-
 }

src/app/openIdConnectConfig.ts

@@ -1,30 +1,29 @@
-import { UserManagerSettings } from "oidc-client";
+// import { UserManagerSettings } from "oidc-client";
 
-export function getClientSettings(): UserManagerSettings {
-  return {
-      authority: 'https://login.microsoftonline.com/136544d9-038e-4646-afff-10accb370679',
-      client_id: '257b6c36-1168-4aac-be93-6f2cd81cec43',
-      redirect_uri: 'http://localhost:4200/auth-callback',
-      //redirect_uri: 'https://demoazureadconnectangular5.azurewebsites.net/auth-callback',
-      post_logout_redirect_uri: 'http://localhost:4200/',
-      //post_logout_redirect_uri: 'https://demoazureadconnectangular5.azurewebsites.net/',
-      response_type:"id_token",
-      scope:"openid profile",
-      filterProtocolClaims: true,
-      loadUserInfo: true,
-      automaticSilentRenew: true,
-      clockSkew: 0,
-      accessTokenExpiringNotificationTime: 570,
-      silent_redirect_uri: 'http://localhost:4200/silent-refresh.html',
-      metadata: {
-        issuer: "https://sts.windows.net/136544d9-038e-4646-afff-10accb370679/",
-        authorization_endpoint: "https://login.microsoftonline.com/136544d9-038e-4646-afff-10accb370679/oauth2/authorize",
-        token_endpoint: "https://login.microsoftonline.com/136544d9-038e-4646-afff-10accb370679/oauth2/token",
-        //jwks_uri: "https://login.microsoftonline.com/common/discovery/keys",
-        jwks_uri: "http://localhost:4200/assets/keys.json",
-        //jwks_uri: "https://demoazureadconnectangular5.azurewebsites.net/assets/keys.json",
-        //jwks_uri: "http://localhost:50586/api/keys",
-        signingKeys: [{"ApiAccessKey": "NgixniZ0S1JHxo7GPEZYa38OBTxSA98AqJKDX5XqsJ8="}]
-    }
-  };
-}
+// export function getClientSettings(): UserManagerSettings {
+//   return {
+//       authority: 'https://login.microsoftonline.com/136544d9-038e-4646-afff-10accb370679',
+//       client_id: '257b6c36-1168-4aac-be93-6f2cd81cec43',
+//       redirect_uri: 'http://localhost:4200/auth-callback',
+//       //redirect_uri: 'https://demoazureadconnectangular5.azurewebsites.net/auth-callback',
+//       post_logout_redirect_uri: 'http://localhost:4200/',
+//       //post_logout_redirect_uri: 'https://demoazureadconnectangular5.azurewebsites.net/',
+//       response_type:"id_token",
+//       scope:"openid profile",
+//       filterProtocolClaims: true,
+//       loadUserInfo: true,
+//       automaticSilentRenew: true,
+//       clockSkew: 0,
+//       silent_redirect_uri: 'http://localhost:4200/silent-refresh.html',
+//       metadata: {
+//         issuer: "https://sts.windows.net/136544d9-038e-4646-afff-10accb370679/",
+//         authorization_endpoint: "https://login.microsoftonline.com/136544d9-038e-4646-afff-10accb370679/oauth2/authorize",
+//         token_endpoint: "https://login.microsoftonline.com/136544d9-038e-4646-afff-10accb370679/oauth2/token",
+//         //jwks_uri: "https://login.microsoftonline.com/common/discovery/keys",
+//         jwks_uri: "http://localhost:4200/assets/keys.json",
+//         //jwks_uri: "https://demoazureadconnectangular5.azurewebsites.net/assets/keys.json",
+//         //jwks_uri: "http://localhost:50586/api/keys",
+//         signingKeys: [{"ApiAccessKey": "NgixniZ0S1JHxo7GPEZYa38OBTxSA98AqJKDX5XqsJ8="}]
+//     }
+//   };
+// }

src/app/protected/protected.component.html

@@ -4,4 +4,4 @@
 
 
 
-<iframe id="test" name="frame1" src="https://login.microsoftonline.com/136544d9-038e-4646-afff-10accb370679/oauth2/authorize?client_id=257b6c36-1168-4aac-be93-6f2cd81cec43&redirect_uri=http%3A%2F%2Flocalhost%3A4200%2Fauth-callback&response_type=id_token&scope=openid%20profile&state=1d56619048f94af587af8e35529735d1&nonce=89ddb46c69c047caa26fdc44a938eb45&prompt=none"></iframe>
+<a href="javascript:void(0);" (click)="signout();">signout</a>

src/app/protected/protected.component.ts

@@ -12,11 +12,10 @@ export class ProtectedComponent implements OnInit {
   constructor(private _authService: AuthService) { }
 
   ngOnInit() {
-    console.log(this._authService.isLoggedIn());
-    console.log(this._authService.getUser());
     this.name = this._authService.getName();
-
-    this._authService.subscribeevents();
   }
 
+  public signout(): void {
+    this._authService.signout();
+  }
 }

src/app/services/auth-guard.service.ts

@@ -1,6 +1,5 @@
 import { AuthService } from './auth.service';
 import { Injectable } from '@angular/core';
-import { UserManager, UserManagerSettings, User } from 'oidc-client';
 import { CanActivate } from '@angular/router';
 
 @Injectable()

src/app/services/auth.service.ts

@@ -1,103 +1,52 @@
-import { UserManagerSettings, UserManager, User } from 'oidc-client';
 import { Injectable } from '@angular/core';
-import { getClientSettings } from '../openIdConnectConfig';
+import { Adal5Service, Adal5HTTPService } from 'adal-angular5';
+import { adal } from 'adal-angular';
+import { HttpClient, HttpHandler } from '@angular/common/http';
+import { Observable } from 'rxjs/Observable';
+
+const config: adal.Config = {
+  tenant: '136544d9-038e-4646-afff-10accb370679',
+  clientId: '257b6c36-1168-4aac-be93-6f2cd81cec43',
+  redirectUri: "https://demoazureadconnectangular5.azurewebsites.net/auth-callback",
+  postLogoutRedirectUri: "https://demoazureadconnectangular5.azurewebsites.net"
+}
 
 @Injectable()
 export class AuthService {
 
-  private _manager = new UserManager(getClientSettings());
-  private _user: User = null;
+  private _user = null;
 
-  constructor() {
-
-    // this._manager.getUser().then(user => {
-    //   var token = this.parseJwt(user.id_token);
-    //   user.expires_at = token.exp;
-    //   console.log(user.expires_at);
-    //   this._user = user;
-    // });
-
-    this._manager.events.addUserLoaded(user => {
-      var token = this.parseJwt(user.id_token);
-      user.expires_at = token.exp;
-      console.log(user.expires_at);
-      this._user = user;
-      var that = this;
-      this.subscribeevents();
-    });
-
-    //
-    
+  constructor(private _adal: Adal5Service) {
 
   }
 
   public isLoggedIn(): boolean {
-    return this._user != null && !this._user.expired;
+    return this._adal.userInfo.authenticated;
   }
-
-  public getClaims(): any {
-    return this._user.profile;
+  
+  signout(): any {
+    this._adal.logOut();
   }
 
-  public subscribeevents() :void {
-    this._manager.events.addSilentRenewError(() => {
-      console.log("error SilentRenew");
-    });
-    
-    this._manager.events.addAccessTokenExpiring(() => {
-      console.log("access token expiring");
-    });
-
-    this._manager.events.addAccessTokenExpired(() => {
-      console.log("access token expired");
-    });
+  startAuthentication(): any {
+    this._adal.init(config);
+    this._adal.login();
   }
 
-  public refreshCallBack(): void
-  {
-    console.log("start refresh callback");
-    this._manager.signinSilentCallback()
-      .then(data => {console.log("suucess callback")})
-      .catch(err => {
-          console.log("err callback");
-      });
-      console.log("end refresh callback");
-  }
+  getName(): string {
 
-  getUser(): any {
-    return this._user;
-  }
-
-  getName(): any {
     return this._user.profile.name;
   }
 
-  getAuthorizationHeaderValue(): string {
-    return `${this._user.token_type} ${this._user.access_token}`;
-  }
 
-  startAuthentication(): Promise<void> {
-    return this._manager.signinRedirect();
-  }
 
-  completeAuthentication(): Promise<void> {
-    return this._manager.signinRedirectCallback().then(user => {
-        this._user = user;
+  completeAuthentication(): any {
+    this._adal.handleWindowCallback();
+    return this._adal.getUser().subscribe(user => {
+      this._user = user;
+      console.log(user);
+      var expireIn = user.profile.exp - new Date().getTime();
+      //redirectCallBack();
     });
-
-    
-  }
-
-   parseJwt (token) {
-    var base64Url = token.split('.')[1];
-    var base64 = base64Url.replace('-', '+').replace('_', '/');
-    return JSON.parse(window.atob(base64));
-  };
-
-
-  public Call()
-  {
-    //this._http.
   }
-
 }