@cleavelandprice/ngx-lib 2.2.2 → 2.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -43,21 +43,27 @@ export class AuthenticationService {
43
43
  */
44
44
  login(username, password, adminGroup) {
45
45
  const today = new Date();
46
- const expiration = new Date().setFullYear(today.getFullYear() + 10);
46
+ //const expiration = new Date().setFullYear(today.getFullYear() + 10);
47
47
  const request = {
48
48
  username: username,
49
49
  password: password,
50
50
  adminGroup: adminGroup,
51
51
  //expirationDate: expiration // moment().add(10, 'years').toDate()
52
- includeThumbnail: false
53
52
  };
54
53
  this.authenticating = true;
55
54
  this.authenticatingChanged.emit(this.authenticating);
56
- this.http.post(this.authenticationApiUrl, request)
57
- .subscribe(token => this.validateUser(token), err => {
55
+ /*this.http.post<string>(this.authenticationApiUrl, request)
56
+ .subscribe(token => this.validateUser(token),
57
+ err => {
58
58
  console.log(err);
59
59
  this.authenticating = false;
60
60
  this.authenticatingChanged.emit(this.authenticating);
61
+ });*/
62
+ this.http.request('POST', this.authenticationApiUrl, { body: request, responseType: 'text' })
63
+ .subscribe(token => this.validateUser(token), err => {
64
+ console.log('Authentication error', err);
65
+ this.authenticating = false;
66
+ this.authenticatingChanged.emit(this.authenticating);
61
67
  });
62
68
  }
63
69
  /**
@@ -135,4 +141,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.3", ngImpor
135
141
  }], authenticatingChanged: [{
136
142
  type: Output
137
143
  }] } });
138
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../../../src/authentication/services/authentication.service.ts"],"names":[],"mappings":"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","sourcesContent":["//#region Imports\r\nimport { Injectable, Output, EventEmitter, Optional } from '@angular/core';\r\nimport { HttpClient } from '@angular/common/http';\r\nimport { AuthenticationToken } from './../model/authentication-token';\r\n// import { JwtHelper } from 'angular2-jwt';\r\nimport { JwtHelperService } from '@auth0/angular-jwt';\r\nimport { AuthenticationServiceConfig } from './../model/authentication.service.config';\r\nimport { SharePointService } from './../../sharepoint/services/sharepoint.service';\r\n//#endregion\r\n\r\n/**\r\n * Authenticate Active Directory user\r\n */\r\n@Injectable()\r\nexport class AuthenticationService {\r\n  //#region Fields\r\n  /**\r\n   * @ignore\r\n   */\r\n  private authenticationApiUrl: string;\r\n\r\n  @Output() authenticatedChanged = new EventEmitter<boolean>();\r\n  @Output() authenticatingChanged = new EventEmitter<boolean>();\r\n\r\n  /**\r\n   * Flag set to true while the service is attempting to authenticate the user\r\n   */\r\n  authenticating = false;\r\n\r\n  /**\r\n   * Flag set to true when the user is successfully authenticated\r\n   */\r\n  authenticated = false;\r\n\r\n  /**\r\n   * Object representing the authenticated user\r\n   */\r\n  authenticatedUser: {\r\n    admin: boolean,\r\n    accountName: string,\r\n    displayName: string,\r\n    distinguishedName: string;\r\n    employeeNumber: string;\r\n    photoUrl?: string;\r\n    memberOf?: string;\r\n  };\r\n  //#endregion\r\n\r\n  //#region Lifecycle\r\n  /**\r\n   * @ignore\r\n   */\r\n  constructor( @Optional() config: AuthenticationServiceConfig,\r\n    private http: HttpClient,\r\n    private sharePointService: SharePointService) {\r\n\r\n    this.authenticationApiUrl = config.authenticationApiUrl;\r\n    this.checkForExistingToken();\r\n  }\r\n  //#endregion\r\n\r\n  //#region Utilities\r\n  /**\r\n   * Authenticate the user and store the token in Local Storage\r\n   *\r\n   * @param username AD sAMAccountName\r\n   * @param password\r\n   * @param adminGroup AD group that determines if authenticated user is considered an administrator of the app\r\n   */\r\n  login(username: string, password: string, adminGroup?: string): void {\r\n    const today = new Date();\r\n    const expiration = new Date().setFullYear(today.getFullYear() + 10);\r\n\r\n    const request = {\r\n      username: username,\r\n      password: password,\r\n      adminGroup: adminGroup,\r\n      //expirationDate: expiration // moment().add(10, 'years').toDate()\r\n      includeThumbnail: false\r\n    };\r\n\r\n    this.authenticating = true;\r\n    this.authenticatingChanged.emit(this.authenticating);\r\n\r\n    this.http.post<string>(this.authenticationApiUrl, request)\r\n      .subscribe(token => this.validateUser(token),\r\n      err => {\r\n        console.log(err);\r\n        this.authenticating = false;\r\n        this.authenticatingChanged.emit(this.authenticating);\r\n      });\r\n  }\r\n\r\n  /**\r\n   * Logout the user and delete the token from Local Storage\r\n   */\r\n  logout(): void {\r\n    if (localStorage.getItem('token')) {\r\n      localStorage.removeItem('token');\r\n    }\r\n\r\n    this.authenticatedUser = null;\r\n    this.authenticated = false;\r\n    this.authenticatedChanged.emit(false);\r\n  }\r\n\r\n  /**\r\n   * @ignore\r\n   */\r\n  private validateUser(token: string): void {\r\n    if (!token) { return; }\r\n\r\n    const jwtHelper = new JwtHelperService();\r\n    const decoded = jwtHelper.decodeToken(token) as AuthenticationToken;\r\n\r\n    if (jwtHelper.isTokenExpired(token)) {\r\n      this.logout();\r\n      return;\r\n    }\r\n\r\n    this.authenticatedUser = {\r\n      admin: decoded.role === 'Admin',\r\n      displayName: decoded.displayName,\r\n      accountName: decoded.winaccountname,\r\n      distinguishedName: decoded.distinguishedName,\r\n      employeeNumber: decoded.employeeNumber,\r\n      memberOf: decoded.memberOf\r\n    };\r\n\r\n    localStorage.setItem('token', token);\r\n\r\n    this.getPhoto();\r\n\r\n    this.authenticated = true;\r\n    this.authenticatedChanged.emit(this.authenticated);\r\n\r\n    this.authenticating = false;\r\n    this.authenticatingChanged.emit(this.authenticating);\r\n  }\r\n\r\n  /**\r\n   * @ignore\r\n   */\r\n  private getPhoto(): void {\r\n    this.sharePointService.getPhotos()\r\n      .subscribe(photos => {\r\n        // The user may have been logged out by the time the photos came back\r\n        if (!this.authenticatedUser || !this.authenticatedUser.employeeNumber) {\r\n          return;\r\n        }\r\n\r\n        const photo = photos.find(pic => +pic.ows_EmployeeNumber === +this.authenticatedUser.employeeNumber);\r\n\r\n        if (photo) {\r\n          this.authenticatedUser.photoUrl = photo.ows_EncodedAbsUrl;\r\n        }\r\n      });\r\n  }\r\n\r\n  /**\r\n   * @ignore\r\n   */\r\n  private checkForExistingToken(): void {\r\n    if (localStorage.getItem('token')) {\r\n      this.validateUser(localStorage.getItem('token'));\r\n    }\r\n  }\r\n  //#endregion\r\n}\r\n"]}
144
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authentication.service.js","sourceRoot":"","sources":["../../../../../src/authentication/services/authentication.service.ts"],"names":[],"mappings":"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","sourcesContent":["//#region Imports\r\nimport { Injectable, Output, EventEmitter, Optional } from '@angular/core';\r\nimport { HttpClient } from '@angular/common/http';\r\nimport { AuthenticationToken } from './../model/authentication-token';\r\n// import { JwtHelper } from 'angular2-jwt';\r\nimport { JwtHelperService } from '@auth0/angular-jwt';\r\nimport { AuthenticationServiceConfig } from './../model/authentication.service.config';\r\nimport { SharePointService } from './../../sharepoint/services/sharepoint.service';\r\n//#endregion\r\n\r\n/**\r\n * Authenticate Active Directory user\r\n */\r\n@Injectable()\r\nexport class AuthenticationService {\r\n  //#region Fields\r\n  /**\r\n   * @ignore\r\n   */\r\n  private authenticationApiUrl: string;\r\n\r\n  @Output() authenticatedChanged = new EventEmitter<boolean>();\r\n  @Output() authenticatingChanged = new EventEmitter<boolean>();\r\n\r\n  /**\r\n   * Flag set to true while the service is attempting to authenticate the user\r\n   */\r\n  authenticating = false;\r\n\r\n  /**\r\n   * Flag set to true when the user is successfully authenticated\r\n   */\r\n  authenticated = false;\r\n\r\n  /**\r\n   * Object representing the authenticated user\r\n   */\r\n  authenticatedUser: {\r\n    admin: boolean,\r\n    accountName: string,\r\n    displayName: string,\r\n    distinguishedName: string;\r\n    employeeNumber: string;\r\n    photoUrl?: string;\r\n    memberOf?: string;\r\n  };\r\n  //#endregion\r\n\r\n  //#region Lifecycle\r\n  /**\r\n   * @ignore\r\n   */\r\n  constructor( @Optional() config: AuthenticationServiceConfig,\r\n    private http: HttpClient,\r\n    private sharePointService: SharePointService) {\r\n\r\n    this.authenticationApiUrl = config.authenticationApiUrl;\r\n    this.checkForExistingToken();\r\n  }\r\n  //#endregion\r\n\r\n  //#region Utilities\r\n  /**\r\n   * Authenticate the user and store the token in Local Storage\r\n   *\r\n   * @param username AD sAMAccountName\r\n   * @param password\r\n   * @param adminGroup AD group that determines if authenticated user is considered an administrator of the app\r\n   */\r\n  login(username: string, password: string, adminGroup?: string): void {\r\n    const today = new Date();\r\n    //const expiration = new Date().setFullYear(today.getFullYear() + 10);\r\n\r\n    const request = {\r\n      username: username,\r\n      password: password,\r\n      adminGroup: adminGroup,\r\n      //expirationDate: expiration // moment().add(10, 'years').toDate()\r\n    };\r\n\r\n    this.authenticating = true;\r\n    this.authenticatingChanged.emit(this.authenticating);\r\n\r\n    /*this.http.post<string>(this.authenticationApiUrl, request)\r\n      .subscribe(token => this.validateUser(token),\r\n      err => {\r\n        console.log(err);\r\n        this.authenticating = false;\r\n        this.authenticatingChanged.emit(this.authenticating);\r\n      });*/\r\n\r\n    this.http.request('POST', this.authenticationApiUrl, { body: request, responseType: 'text' })\r\n      .subscribe(token => this.validateUser(token),\r\n      err => {\r\n        console.log('Authentication error', err);\r\n        this.authenticating = false;\r\n        this.authenticatingChanged.emit(this.authenticating);\r\n      });\r\n  }\r\n\r\n  /**\r\n   * Logout the user and delete the token from Local Storage\r\n   */\r\n  logout(): void {\r\n    if (localStorage.getItem('token')) {\r\n      localStorage.removeItem('token');\r\n    }\r\n\r\n    this.authenticatedUser = null;\r\n    this.authenticated = false;\r\n    this.authenticatedChanged.emit(false);\r\n  }\r\n\r\n  /**\r\n   * @ignore\r\n   */\r\n  private validateUser(token: string): void {\r\n    if (!token) { return; }\r\n\r\n    const jwtHelper = new JwtHelperService();\r\n    const decoded = jwtHelper.decodeToken(token) as AuthenticationToken;\r\n\r\n    if (jwtHelper.isTokenExpired(token)) {\r\n      this.logout();\r\n      return;\r\n    }\r\n\r\n    this.authenticatedUser = {\r\n      admin: decoded.role === 'Admin',\r\n      displayName: decoded.displayName,\r\n      accountName: decoded.winaccountname,\r\n      distinguishedName: decoded.distinguishedName,\r\n      employeeNumber: decoded.employeeNumber,\r\n      memberOf: decoded.memberOf\r\n    };\r\n\r\n    localStorage.setItem('token', token);\r\n\r\n    this.getPhoto();\r\n\r\n    this.authenticated = true;\r\n    this.authenticatedChanged.emit(this.authenticated);\r\n\r\n    this.authenticating = false;\r\n    this.authenticatingChanged.emit(this.authenticating);\r\n  }\r\n\r\n  /**\r\n   * @ignore\r\n   */\r\n  private getPhoto(): void {\r\n    this.sharePointService.getPhotos()\r\n      .subscribe(photos => {\r\n        // The user may have been logged out by the time the photos came back\r\n        if (!this.authenticatedUser || !this.authenticatedUser.employeeNumber) {\r\n          return;\r\n        }\r\n\r\n        const photo = photos.find(pic => +pic.ows_EmployeeNumber === +this.authenticatedUser.employeeNumber);\r\n\r\n        if (photo) {\r\n          this.authenticatedUser.photoUrl = photo.ows_EncodedAbsUrl;\r\n        }\r\n      });\r\n  }\r\n\r\n  /**\r\n   * @ignore\r\n   */\r\n  private checkForExistingToken(): void {\r\n    if (localStorage.getItem('token')) {\r\n      this.validateUser(localStorage.getItem('token'));\r\n    }\r\n  }\r\n  //#endregion\r\n}\r\n"]}
@@ -335,21 +335,27 @@ class AuthenticationService {
335
335
  */
336
336
  login(username, password, adminGroup) {
337
337
  const today = new Date();
338
- const expiration = new Date().setFullYear(today.getFullYear() + 10);
338
+ //const expiration = new Date().setFullYear(today.getFullYear() + 10);
339
339
  const request = {
340
340
  username: username,
341
341
  password: password,
342
342
  adminGroup: adminGroup,
343
343
  //expirationDate: expiration // moment().add(10, 'years').toDate()
344
- includeThumbnail: false
345
344
  };
346
345
  this.authenticating = true;
347
346
  this.authenticatingChanged.emit(this.authenticating);
348
- this.http.post(this.authenticationApiUrl, request)
349
- .subscribe(token => this.validateUser(token), err => {
347
+ /*this.http.post<string>(this.authenticationApiUrl, request)
348
+ .subscribe(token => this.validateUser(token),
349
+ err => {
350
350
  console.log(err);
351
351
  this.authenticating = false;
352
352
  this.authenticatingChanged.emit(this.authenticating);
353
+ });*/
354
+ this.http.request('POST', this.authenticationApiUrl, { body: request, responseType: 'text' })
355
+ .subscribe(token => this.validateUser(token), err => {
356
+ console.log('Authentication error', err);
357
+ this.authenticating = false;
358
+ this.authenticatingChanged.emit(this.authenticating);
353
359
  });
354
360
  }
355
361
  /**