Produced by Araxis Merge on 4/2/2019 1:08:02 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
# | Location | File | Last Modified |
---|---|---|---|
1 | C:\AraxisMergeCompare\Pri_un\ARS_Frontend\ars-app\src\app\login | login.component.ts | Wed Mar 27 19:16:21 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\ARS_Frontend\ars-app\src\app\login | login.component.ts | Fri Mar 29 18:17:43 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 138 |
Changed | 1 | 2 |
Inserted | 0 | 0 |
Removed | 0 | 0 |
Whitespace | |
---|---|
Character case | Differences in character case are significant |
Line endings | Differences in line endings (CR and LF characters) are ignored |
CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
1 | import { C omponent, OnInit } f rom '@angu lar/core'; | |
2 | import { A ctivatedRo ute } from '@angular /router'; | |
3 | import { A uthenticat ionService } from '. ./auth/aut h.service' ; | |
4 | import { D omSanitize r } from ' @angular/p latform-br owser'; | |
5 | import { S soEncodedU rlsModel } from '../ auth/auth. model'; | |
6 | import { C anDeactiva teGuard } from '../s hared/guar ds/can-dea ctivate-ga urd'; | |
7 | import { e nvironment } from '. ./../envir onments/en vironment' ; | |
8 | @Component ({ | |
9 | selector : 'app-log in', | |
10 | template Url: './lo gin.compon ent.html', | |
11 | styleUrl s: ['./log in.compone nt.scss'] | |
12 | }) | |
13 | export cla ss LoginCo mponent im plements O nInit { | |
14 | construc tor( | |
15 | privat e authenti cationServ ice: Authe nticationS ervice, | |
16 | privat e sanitize r: DomSani tizer, | |
17 | privat e route: A ctivatedRo ute, | |
18 | privat e canDeact ivateGuard : CanDeact ivateGuard | |
19 | ) {} | |
20 | ||
21 | errorMsg = ''; | |
22 | errorSta tus = fals e; | |
23 | safeUrl; | |
24 | sso: Sso EncodedUrl sModel; | |
25 | userInfo : any = {} ; | |
26 | userName = ' AI '; | |
27 | attachme ntId: stri ng = null; | |
28 | ||
29 | ngOnInit () { | |
30 | this.r oute.query Params.sub scribe(par am => { | |
31 | if ( param['att achmentId' ]) { | |
32 | th is.attachm entId = pa ram['attac hmentId']; | |
33 | } | |
34 | }); | |
35 | ||
36 | this.a uthenticat ionService .getErrorM sg().subsc ribe(error => { | |
37 | this .errorMsg = error.er rorMsg; | |
38 | this .errorStat us = error .errorStat us; | |
39 | }); | |
40 | if (th is.attachm entId) { | |
41 | this .authentic ationServi ce.ssoUrls (this.atta chmentId). subscribe( | |
42 | da ta => { | |
43 | this.sso = data; | |
44 | }, | |
45 | er ror => { | |
46 | console.lo g(error); | |
47 | this.error Msg = erro r.message; | |
48 | } | |
49 | ); | |
50 | } else { | |
51 | this .authentic ationServi ce.ssoUrls ().subscri be( | |
52 | da ta => { | |
53 | this.sso = data; | |
54 | }, | |
55 | er ror => { | |
56 | console.lo g(error); | |
57 | this.error Msg = erro r.message; | |
58 | } | |
59 | ); | |
60 | } | |
61 | this.s afeUrl = t his.saniti zer.bypass SecurityTr ustUrl( | |
62 | `${e nvironment .hacssoser ver}` | |
63 | ); | |
64 | } | |
65 | ||
66 | accept() { | |
67 | this.c anDeactiva teGuard.se tActive(); | |
68 | this.a uthenticat ionService .getNtName (this.sso) .subscribe (); | |
69 | } | |
70 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.