Produced by Araxis Merge on 4/2/2019 1:06:53 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_Backend\ars_app\src\main\java\gov\va\med\ars\configuration\security | JwtConfiguration.java | Wed Mar 27 19:22:44 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\ARS_Backend\ars_app\src\main\java\gov\va\med\ars\configuration\security | JwtConfiguration.java | Thu Mar 28 17:50:38 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 104 |
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 | /** | |
2 | * | |
3 | */ | |
4 | package go v.va.med.a rs.configu ration.sec urity; | |
5 | ||
6 | import jav a.io.IOExc eption; | |
7 | ||
8 | import org .springfra mework.bea ns.factory .annotatio n.Autowire d; | |
9 | import org .springfra mework.bea ns.factory .annotatio n.Qualifie r; | |
10 | import org .springfra mework.con text.annot ation.Bean ; | |
11 | import org .springfra mework.con text.annot ation.Conf iguration; | |
12 | import org .springfra mework.cor e.env.Envi ronment; | |
13 | import org .springfra mework.cor e.io.Class PathResour ce; | |
14 | import org .springfra mework.cor e.io.Resou rce; | |
15 | import org .springfra mework.sec urity.oaut h2.provide r.token.To kenStore; | |
16 | import org .springfra mework.sec urity.oaut h2.provide r.token.st ore.JwtAcc essTokenCo nverter; | |
17 | import org .springfra mework.sec urity.oaut h2.provide r.token.st ore.JwtTok enStore; | |
18 | import org .springfra mework.uti l.FileCopy Utils; | |
19 | ||
20 | /** | |
21 | * @author
|
|
22 | * | |
23 | */ | |
24 | ||
25 | @Configura tion | |
26 | public cla ss JwtConf iguration { | |
27 | ||
28 | @A utowired | |
29 | En vironment env; | |
30 | ||
31 | @A utowired | |
32 | Jw tAccessTok enConverte r jwtAcces sTokenConv erter; | |
33 | ||
34 | @B ean | |
35 | @Q ualifier(" tokenStore ") | |
36 | pu blic Token Store toke nStore() { | |
37 | retu rn new Jwt TokenStore (jwtAccess TokenConve rter); | |
38 | } | |
39 | ||
40 | @B ean | |
41 | pr otected Jw tAccessTok enConverte r jwtToken Enhancer() { | |
42 | JwtA ccessToken Converter converter = new JwtA ccessToken Converter( ); | |
43 | Reso urce resou rce = new ClassPathR esource(en v.getPrope rty("oauth 2.client.c ert.file") ); | |
44 | Stri ng publicK ey = null; | |
45 | try { | |
46 | public Key = new String(Fil eCopyUtils .copyToByt eArray(res ource.getI nputStream ())); | |
47 | } ca tch ( fina l IOExcept ion e) { | |
48 | throw new Runtim eException (e); | |
49 | } | |
50 | conv erter.setV erifierKey (publicKey ); | |
51 | retu rn convert er; | |
52 | } | |
53 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.