Changeset 1368 for trunk


Ignore:
Timestamp:
05/23/19 10:42:24 (5 years ago)
Author:
bln4
Message:

Updated authentication frameset. New frame for submitting trusted password usernames.
Beginning of purge for wording 'Colleague'. Changing to 'Trusted User'

Location:
trunk/src/org/expeditee
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/expeditee/assets/resources-public/framesets/authentication/1.exp

    r1366 r1368  
    1 V 822
     1V 826
    22p 40
    33U authadmin
    44D 23Nov2018[12:31]
    55M authadmin
    6 d 21May2019[14:46]
     6d 23May2019[10:29]
    77B 100 100 39 100
    88Z
    … …  
    546546Z
    547547
    548 ActiveTime:18992043:12:04
    549 DarkTime:-18982775:-8:-10
    550 46:50:195 444 582 kDELETE
    551 46:50:443 452 584 kDELETE
    552 46:50:618 452 584 kDELETE
    553 46:50:778 452 584 kDELETE
    554 46:50:922 452 584 kDELETE
    555 46:51:235 452 584 kDELETE
    556 46:51:476 452 584 kSHIFT
    557 46:51:627 452 584 kF
    558 46:52:067 461 584 kO
    559 46:52:227 470 584 kR
    560 46:52:564 477 584 kG
    561 46:52:731 486 584 kO
    562 46:52:827 496 584 kT
    563 46:55:018 795 562 kCTRL
    564 46:55:519 795 562 kCTRL
    565 46:55:546 795 562 kS
     548ActiveTime:18992043:12:17
     549DarkTime:-18982463:-8:-10
     55029:18:317 516 406 Ld
     55129:18:605 516 406 Rd
     55229:18:866 516 406 Ru
     55329:18:882 516 406 Lu
     55429:21:389 737 384 Rd
     55529:21:404 737 384 Md
     55629:21:562 737 384 Ru
     55729:21:578 737 384 Mu
     55829:21:826 828 455 kRIGHT_ARROW

  • trunk/src/org/expeditee/assets/resources-public/framesets/authentication/10.exp

    r1264 r1368  
    1 V 170
     1V 174
    22U authadmin
    33D 07Jan2019[14:34]
    4 M authadmin
    5 d 21Mar2019[12:23]
     4M nobody
     5d 23May2019[09:54]
    66B 100 100 39 100
    77Z
    … …  
    142142Z
    143143
    144 ActiveTime:00:32:02
     144ActiveTime:00:32:05
    145145DarkTime:00:39:09
    146 23:12:537 1166 533 kRIGHT_ARROW
     14654:52:238 545 282 kRIGHT_ARROW
     14754:53:484 213 413 kRIGHT_ARROW

  • trunk/src/org/expeditee/assets/resources-public/framesets/authentication/11.exp

    r1264 r1368  
    1 V 125
     1V 129
    22U authadmin
    33D 07Jan2019[14:34]
    4 M authadmin
    5 d 21Mar2019[12:23]
     4M nobody
     5d 23May2019[09:54]
    66B 100 100 39 100
    77Z
    … …  
    372372Z
    373373
    374 ActiveTime:00:38:58
     374ActiveTime:00:39:13
    375375DarkTime:00:01:01
    376 23:14:947 1168 457 Md
    377 23:15:065 1167 457 Mu
    378 23:16:049 848 367 Ld
    379 23:16:210 848 367 Rd
    380 23:16:337 848 367 Lu
    381 23:16:361 848 367 Ru
    382 23:17:450 1203 275 Md
    383 23:17:482 1203 275 Rd
    384 23:17:633 1203 275 Ru
    385 23:17:633 1203 275 Mu
    386 23:18:356 1157 466 Md
    387 23:18:473 1157 466 Mu
    388 23:18:776 1099 375 kRIGHT_ARROW
     37654:55:293 210 422 kRIGHT_ARROW

  • trunk/src/org/expeditee/assets/resources-public/framesets/authentication/12.exp

    r1264 r1368  
    1 V 153
     1V 102
    22U authadmin
    33D 07Jan2019[14:34]
    44M authadmin
    5 d 21Mar2019[12:23]
     5d 21Mar2019[11:51]
    66B 100 100 39 100
    77Z
    88
    9 S T 36
    10 s 07Jan2019[14:34.33]
    11 P 16 8
    12 T @i: C:\Users\bln4\Desktop\NGIKM Expeditee\images\expediteeicon128.png 1.48
    13 o BryceNem
    14 v S
    15 f tr18
    16 t -1.0
    17 b 0.0
    18 m 0.0
    19 h 0.0
    20 p 40
    21 
    22 S T 37
    23 s 07Jan2019[14:34.33]
     9S T 186
     10s 12Feb2019[12:44.00]
    2411d 0 0 0 100
    25 P 273 108
    26 T Expeditee: Secure My Access
     12P 20 95
     13T Expeditee: Sleek like Aphroditē–Wise like Athēnâ.
    2714o authadmin
    2815v S
    29 f Metamorphous_r43
     16f Metamorphous_r36
    3017t -1.0
    3118b 0.0
    … …  
    3421p 40
    3522
    36 S T 38
    37 s 07Jan2019[14:34.33]
     23S T 187
     24s 12Feb2019[12:44.00]
    3825d 0 0 0 100
    39 P 267 171
    40 T Sleek like Aphroditē – Wise like Athēnâ.
     26P 261 147
     27T Receiving a Shared a Frameset
    4128o authadmin
    4229v S
    43 f Metamorphous_r32
     30f Amaranth_r36
    4431t -1.0
    4532b 0.0
    … …  
    4835p 40
    4936
    50 S T 347
    51 s 15Jan2019[11:28.00]
     37S T 192
     38s 12Feb2019[12:53.42]
    5239d 0 0 0 100
    53 K 0 0 0 100
    54 P 266 293
    55 T Colleague One:
    56 x F
    57 o authadmin
    58 n F
    59 v S
    60 f Amaranth_r29
    61 t -1.0
    62 b 0.0
    63 m 0.0
    64 M 200
    65 h 0.0
    66 p 40
    67 
    68 S T 348
    69 s 15Jan2019[11:28.00]
    70 d 0 0 0 100
    71 G 100 100 100 100
    72 K 0 0 0 100
    73 P 493 293
    74 T BryceTwo
    75 x F
    76 D txtColleagueOne
    77 o authadmin
    78 n F
    79 v S
    80 f Amaranth_r29
    81 t -1.0
    82 b 0.0
    83 m 0.0
    84 M 500
    85 h 1.0
    86 p 44
    87 
    88 S P 349
    89 s 15Jan2019[11:28.00]
    90 d 70 70 0 100
    91 P 534 335
    92 e 100 100 50 100
    93 o BryceNem
    94 v S
    95 h 2.0
    96 
    97 S T 350
    98 s 15Jan2019[11:28.00]
    99 d 70 70 0 100
    100 P 534 335
    101 T q
    102 e 100 100 50 100
    103 o BryceNem
    104 v S
    105 f tr6
    106 t -1.0
    107 b 0.0
    108 m 0.0
    109 h 2.0
    110 
    111 S T 351
    112 s 15Jan2019[11:28.00]
    113 d 0 0 0 100
    114 G 100 100 100 100
    115 K 0 0 0 100
    116 P 493 358
    117 T BryceThree
    118 x F
    119 D txtColleagueTwo
    120 o authadmin
    121 n F
    122 v S
    123 f Amaranth_r29
    124 t -1.0
    125 b 0.0
    126 m 0.0
    127 M 500
    128 h 1.0
    129 p 44
    130 
    131 S T 352
    132 s 15Jan2019[11:28.00]
    133 d 0 0 0 100
    134 K 0 0 0 100
    135 P 266 358
    136 T Colleague Two:
    137 x F
    138 o authadmin
    139 n F
    140 v S
    141 f Amaranth_r29
    142 t -1.0
    143 b 0.0
    144 m 0.0
    145 M 200
    146 h 0.0
    147 p 40
    148 
    149 S T 357
    150 s 15Jan2019[12:07.33]
    151 d 0 0 0 100
    152 G 100 100 0 100
    153 K 0 0 0 100
    154 P 433 426
    155 T Submit Colleague Usernames
    156 X AuthSubmitPWColleagues
    157 x F
    158 o authadmin
    159 n F
    160 v S
    161 f dr29
    162 t -1.0
    163 b 0.0
    164 m 0.0
    165 M 300
    166 h 1.0
    167 p 41
    168 
    169 S T 363
    170 s 21Jan2019[12:08.20]
    171 d 0 0 0 100
    172 P 414 487
    173 T  Colleague usernames submitted.
    174 T Now we must wait for their reply.
    175 D ShowOnProgress
     40P 23 235
     41T If you have received an email sharing a frameset with you then these instructions will show you how to access it.
    17642o authadmin
    17743v S
    … …  
    18046b 0.0
    18147m 0.0
     48w 950
    18249h -1.0
    18350p 40
    18451
    185 S T 366
    186 s 21Jan2019[12:37.12]
     52S T 272
     53s 13Feb2019[11:27.58]
     54d 0 0 0 100
     55P 42 311
     56T 1. Go to your Google Drive 'Shared With Me' folder.  Right click on the directory containing the shared frameset and click 'Add to My Drive'.
     57o authadmin
     58v S
     59f Amaranth_r29
     60t -1.0
     61b 0.0
     62m 0.0
     63w 950
     64h -1.0
     65p 40
     66
     67S P 41
     68s 07Jan2019[14:34.33]
     69d 70 70 0 100
     70P 410 378
     71e 100 100 50 100
     72o BryceNem
     73v S
     74h 2.0
     75
     76S T 219
     77s 12Feb2019[13:13.13]
     78d 0 0 0 100
     79P 42 398
     80T 2. Navigate to your 'My Drive' directory to locate the shared frameset.  Move the shared frameset directory to 'Expeditee\framesets-shared-with-me'.
     81o authadmin
     82v S
     83f Amaranth_r29
     84t -1.0
     85b 0.0
     86m 0.0
     87w 950
     88h -1.0
     89p 40
     90
     91S T 261
     92s 12Feb2019[13:27.57]
     93d 0 0 0 100
     94P 42 486
     95T Note: Just because the frameset has been shared with you does not mean that you will be able to read it.  You will require access to the appropriate secrets in order to view it.
     96o authadmin
     97v S
     98f Amaranth_r29
     99t -1.0
     100b 0.0
     101m 0.0
     102w 950
     103h -1.0
     104p 40
     105
     106S T 262
     107s 13Feb2019[10:48.44]
    187108d 0 0 0 100
    188109G 100 100 0 100
    189110K 0 0 0 100
    190 P 460 579
     111P 351 600
    191112T     Return To Desktop
    192113X AuthGoToDesktop
    … …  
    210131Z
    211132
    212 ActiveTime:01:01:59
    213 DarkTime:00:45:21
    214 23:19:801 609 292 Rd
    215 23:19:921 609 292 Ru
    216 23:20:347 595 344 Rd
    217 23:20:432 595 344 Ru
    218 23:20:752 1141 311 kRIGHT_ARROW
     133ActiveTime:01:11:13
     134DarkTime:02:14:48
     13510:27:300 541 594 Rd
     13610:27:467 541 593 Ru
     13710:27:915 1046 583 Md
     13810:28:019 1046 583 Mu
     13910:28:876 517 595 Ld
     14010:29:141 517 595 Rd
     14110:29:299 517 595 Ru
     14210:29:324 517 595 Lu
     14310:34:263 1086 375 Md
     14410:34:428 1086 375 Rd
     14510:34:579 1086 375 Ru
     14610:34:627 1086 375 Mu
     14710:35:500 1022 592 Md
     14810:35:651 1022 592 Mu
     14910:35:979 1152 459 kRIGHT_ARROW

  • trunk/src/org/expeditee/assets/resources-public/framesets/authentication/2.exp

    r1366 r1368  
    1 V 286
     1V 288
    22p 40
    33U authadmin
    44D 07Dec2018[12:19]
    5 M nobody
    6 d 21May2019[14:56]
     5M authadmin
     6d 23May2019[10:23]
    77B 100 100 39 100
    88Z
    … …  
    496496Z
    497497
    498 ActiveTime:01:20:26
     498ActiveTime:01:20:28
    499499DarkTime:01:32:58
    500 56:58:256 305 484 Rd
    501 56:58:360 305 484 Ru
    502 57:00:537 738 589 Rd
    503 57:00:680 738 589 Ru
    504 57:01:168 725 583 kRIGHT_ARROW
     50023:46:958 183 338 Ld
     50123:47:092 183 338 Rd
     50223:47:242 183 338 Ru
     50323:47:250 183 338 Lu
     50423:48:621 136 388 Md
     50523:48:706 136 388 Rd
     50623:48:818 136 388 Ru
     50723:48:841 136 388 Mu
     50823:49:603 110 475 kRIGHT_ARROW

  • trunk/src/org/expeditee/assets/resources-public/framesets/authentication/3.exp

    r1366 r1368  
    1 V 87
     1V 94
    22p 40
    33U authadmin
    44D 07Jan2019[14:34]
    5 M authadmin
    6 d 21May2019[14:56]
     5M nobody
     6d 23May2019[10:36]
    77B 100 100 39 100
    88Z
    … …  
    171171P 414 436
    172172e 100 100 39 100
     173o nobody
    173174v S
    174175h 2.0
    … …  
    181182P 586 436
    182183e 100 100 39 100
    183 v S
    184 h 2.0
    185 l 273 274
     184o nobody
     185v S
     186h 2.0
     187l 274 273
    186188c 1547 1550
    187189
    … …  
    193195X AuthGotoAccountManagement
    194196x F
     197o nobody
    195198v S
    196199f FontAwesome_r32
    … …  
    207210X Back
    208211x F
     212o nobody
    209213v S
    210214f FontAwesome_r32
    … …  
    221225X AuthGoToDesktop
    222226x F
     227o nobody
    223228v S
    224229f FontAwesome_r40
    … …  
    234239P 414 501
    235240e 100 100 39 100
     241o nobody
    236242v S
    237243h 2.0
    … …  
    244250P 586 501
    245251e 100 100 39 100
    246 v S
    247 h 2.0
    248 l 272 273
    249 c 1549 1550
     252o nobody
     253v S
     254h 2.0
     255l 273 272
     256c 1550 1549
    250257
    251258Z
    … …  
    279286Z
    280287
    281 ActiveTime:00:15:52
     288ActiveTime:00:16:10
    282289DarkTime:00:20:25
    283 57:03:480 725 583 Md
    284 57:03:631 725 583 Mu
    285 57:05:664 308 479 Rd
    286 57:05:768 308 479 Ru
    287 57:06:977 740 593 Md
    288 57:07:160 740 593 Mu
    289 57:09:192 730 574 Md
    290 57:09:375 730 574 Mu
    291 57:10:384 730 574 kALT
    292 57:10:728 730 574 kUP_ARROW
    293 57:11:079 730 554 kUP_ARROW
    294 57:11:864 730 534 kUP_ARROW
    295 57:14:268 730 514 Md
    296 57:14:456 730 514 Mu
    297 57:15:496 740 489 Md
    298 57:15:607 740 489 Rd
    299 57:15:744 740 489 Ru
    300 57:15:791 740 489 Mu
    301 57:22:144 475 472 Ld
    302 57:22:208 475 472 Rd
    303 57:22:327 475 472 Ru
    304 57:22:344 475 472 Lu
    305 57:27:232 53 372 Md
    306 57:27:360 53 372 Rd
    307 57:27:519 53 372 Ru
    308 57:27:551 53 372 Mu
    309 57:41:929 619 515 Md
    310 57:42:031 619 515 Rd
    311 57:42:207 619 515 Ru
    312 57:42:232 619 515 Mu
    313 57:43:361 395 501 Md
    314 57:43:496 395 501 Mu
    315 57:49:121 489 493 Md
    316 57:49:272 489 493 Mu
    317 57:51:713 723 506 kCTRL
    318 57:52:213 723 508 kCTRL
    319 57:52:247 723 508 kCTRL
    320 57:52:272 723 508 kS
     29037:16:179 496 492 Rd
     29137:16:341 496 492 Ru
     29237:17:121 496 492 kRIGHT_ARROW

  • trunk/src/org/expeditee/assets/resources-public/framesets/authentication/4.exp

    r1366 r1368  
    1 V 207
     1V 218
    22p 40
    33U authadmin
    44D 07Jan2019[14:34]
    5 M authadmin
    6 d 21May2019[14:46]
     5M nobody
     6d 23May2019[10:37]
    77B 100 100 39 100
    88Z
    … …  
    561561Z
    562562
    563 ActiveTime:01:36:35
    564 DarkTime:02:32:46
    565 46:13:202 1105 243 Md
    566 46:13:346 1105 243 Mu
    567 46:15:123 1103 319 Rd
    568 46:16:626 1380 318 Ru
    569 46:17:715 469 543 Md
    570 46:17:818 469 543 Mu
    571 46:19:234 1099 331 Rd
    572 46:20:458 1249 337 Ru
    573 46:21:466 467 540 Rd
    574 46:21:546 467 540 Ru
    575 46:22:068 418 543 Rd
    576 46:22:138 418 543 Ru
    577 46:22:579 349 545 Rd
    578 46:22:666 349 545 Ru
    579 46:23:339 883 578 Md
    580 46:23:386 883 578 Rd
    581 46:23:506 883 578 Ru
    582 46:23:522 883 578 Mu
    583 46:24:291 1166 380 Md
    584 46:24:339 1166 380 Rd
    585 46:24:514 1166 380 Ru
    586 46:24:538 1166 380 Mu
    587 46:28:738 1070 303 kCTRL
    588 46:29:239 1070 303 kCTRL
    589 46:29:271 1070 303 kCTRL
    590 46:29:305 1070 303 kCTRL
    591 46:29:337 1070 303 kCTRL
    592 46:29:371 1070 303 kCTRL
    593 46:29:404 1070 303 kCTRL
    594 46:29:437 1070 303 kCTRL
    595 46:29:470 1070 303 kCTRL
    596 46:29:502 1070 303 kCTRL
    597 46:29:536 1070 303 kCTRL
    598 46:29:569 1070 303 kCTRL
    599 46:29:601 1070 303 kCTRL
    600 46:29:634 1070 303 kCTRL
    601 46:29:642 1070 303 kS
     563ActiveTime:01:36:47
     564DarkTime:02:33:57
     56538:34:241 956 28 Ld
     56638:34:327 956 28 Rd
     56738:34:437 956 28 Ru
     56838:34:445 956 28 Lu
     56938:36:496 846 150 kRIGHT_ARROW

  • trunk/src/org/expeditee/assets/resources-public/framesets/authentication/5.exp

    r1264 r1368  
    1 V 102
     1V 191
     2p 40
    23U authadmin
    34D 07Jan2019[14:34]
    4 M authadmin
    5 d 21Mar2019[11:51]
     5M nobody
     6d 23May2019[10:39]
    67B 100 100 39 100
    78Z
    89
    9 S T 186
    10 s 12Feb2019[12:44.00]
    11 d 0 0 0 100
    12 P 20 95
    13 T Expeditee: Sleek like Aphroditē–Wise like Athēnâ.
     10S T 372
     11s 23May2019[10:08.03]
     12d 0 0 0 100
     13P 105 65
     14T Secure Expeditee:
    1415o authadmin
    1516v S
    … …  
    1920m 0.0
    2021h -1.0
    21 p 40
    22 
    23 S T 187
    24 s 12Feb2019[12:44.00]
    25 d 0 0 0 100
    26 P 261 147
    27 T Receiving a Shared a Frameset
     22
     23S T 373
     24s 23May2019[10:08.03]
     25d 0 0 0 100
     26P 20 104
     27T 🔒
     28o authadmin
     29v S
     30f tr74
     31t -1.0
     32b 0.0
     33m 0.0
     34h -1.0
     35
     36S T 374
     37s 23May2019[10:08.03]
     38d 0 0 0 100
     39P 105 115
     40T Sleek like Aphroditē–Wise like Athēnâ.
     41o authadmin
     42v S
     43f Metamorphous_r36
     44t -1.0
     45b 0.0
     46m 0.0
     47h -1.0
     48
     49S T 392
     50s 23May2019[10:09.23]
     51d 0 0 0 100
     52P 158 170
     53T Nominate Trusted Users for Password Recovery
    2854o authadmin
    2955v S
    … …  
    3359m 0.0
    3460h -1.0
    35 p 40
    36 
    37 S T 192
    38 s 12Feb2019[12:53.42]
    39 d 0 0 0 100
    40 P 23 235
    41 T If you have received an email sharing a frameset with you then these instructions will show you how to access it.
     61
     62S T 410
     63s 23May2019[10:22.43]
     64d 0 0 0 100
     65G 100 100 100 100
     66K 0 0 0 100
     67P 350 288
     68T
     69D txtTrustedUserOne
     70N 260
    4271o authadmin
    4372v S
    … …  
    4675b 0.0
    4776m 0.0
    48 w 950
    49 h -1.0
    50 p 40
    51 
    52 S T 272
    53 s 13Feb2019[11:27.58]
    54 d 0 0 0 100
    55 P 42 311
    56 T 1. Go to your Google Drive 'Shared With Me' folder.  Right click on the directory containing the shared frameset and click 'Add to My Drive'.
     77M 300
     78h 1.0
     79_ph Trusted User One
     80
     81S T 406
     82s 23May2019[10:21.20]
     83d 0 0 0 100
     84G 100 100 100 100
     85K 0 0 0 100
     86P 350 348
     87T
     88D txtTrustedUserTwo
     89N 320
    5790o authadmin
    5891v S
    … …  
    6194b 0.0
    6295m 0.0
    63 w 950
    64 h -1.0
    65 p 40
    66 
    67 S P 41
    68 s 07Jan2019[14:34.33]
     96M 300
     97h 1.0
     98_ph Trusted User Two
     99
     100S P 349
     101s 15Jan2019[11:28.00]
    69102d 70 70 0 100
    70 P 410 378
     103P 534 335
    71104e 100 100 50 100
    72 o BryceNem
    73 v S
    74 h 2.0
    75 
    76 S T 219
    77 s 12Feb2019[13:13.13]
    78 d 0 0 0 100
    79 P 42 398
    80 T 2. Navigate to your 'My Drive' directory to locate the shared frameset.  Move the shared frameset directory to 'Expeditee\framesets-shared-with-me'.
    81 o authadmin
    82 v S
    83 f Amaranth_r29
    84 t -1.0
    85 b 0.0
    86 m 0.0
    87 w 950
    88 h -1.0
    89 p 40
    90 
    91 S T 261
    92 s 12Feb2019[13:27.57]
    93 d 0 0 0 100
    94 P 42 486
    95 T Note: Just because the frameset has been shared with you does not mean that you will be able to read it.  You will require access to the appropriate secrets in order to view it.
    96 o authadmin
    97 v S
    98 f Amaranth_r29
    99 t -1.0
    100 b 0.0
    101 m 0.0
    102 w 950
    103 h -1.0
    104 p 40
    105 
    106 S T 262
    107 s 13Feb2019[10:48.44]
     105o authadmin
     106v S
     107h 2.0
     108
     109S T 350
     110s 15Jan2019[11:28.00]
     111d 70 70 0 100
     112P 534 335
     113T q
     114e 100 100 50 100
     115o authadmin
     116v S
     117f tr6
     118t -1.0
     119b 0.0
     120m 0.0
     121h 2.0
     122
     123S T 357
     124s 15Jan2019[12:07.33]
    108125d 0 0 0 100
    109126G 100 100 0 100
    110127K 0 0 0 100
    111 P 351 600
    112 T     Return To Desktop
    113 X AuthGoToDesktop
    114 x F
    115 D ShowOnProgress
     128P 351 409
     129T  Submit Trusted Users
     130X AuthSubmitPWColleagues
     131x F
     132N 380
    116133o authadmin
    117134n F
    … …  
    125142p 41
    126143
    127 Z
    128 
    129 Z
    130 
    131 Z
    132 
    133 ActiveTime:01:11:13
    134 DarkTime:02:14:48
    135 10:27:300 541 594 Rd
    136 10:27:467 541 593 Ru
    137 10:27:915 1046 583 Md
    138 10:28:019 1046 583 Mu
    139 10:28:876 517 595 Ld
    140 10:29:141 517 595 Rd
    141 10:29:299 517 595 Ru
    142 10:29:324 517 595 Lu
    143 10:34:263 1086 375 Md
    144 10:34:428 1086 375 Rd
    145 10:34:579 1086 375 Ru
    146 10:34:627 1086 375 Mu
    147 10:35:500 1022 592 Md
    148 10:35:651 1022 592 Mu
    149 10:35:979 1152 459 kRIGHT_ARROW
     144S P 428
     145s 23May2019[10:37.16]
     146d 0 0 0 100
     147P 414 436
     148e 100 100 39 100
     149o nobody
     150v S
     151h 2.0
     152l 432 435
     153c 296 297
     154
     155S P 431
     156s 23May2019[10:37.16]
     157d 0 0 0 100
     158P 586 436
     159e 100 100 39 100
     160o nobody
     161v S
     162h 2.0
     163l 435 434
     164c 296 299
     165
     166S T 425
     167s 23May2019[10:37.16]
     168d 0 0 0 50
     169P 542 482
     170T 
     171X AuthGotoAccountManagement
     172x F
     173o authadmin
     174v S
     175f FontAwesome_r32
     176t -1.0
     177b 0.0
     178m 0.0
     179h -1.0
     180
     181S T 426
     182s 23May2019[10:37.16]
     183d 0 0 0 50
     184P 428 484
     185T 
     186X Back
     187x F
     188o authadmin
     189v S
     190f FontAwesome_r32
     191t -1.0
     192b 0.0
     193m 0.0
     194h -1.0
     195
     196S T 427
     197s 23May2019[10:37.16]
     198d 0 0 0 50
     199P 479 484
     200T 
     201X AuthGoToDesktop
     202x F
     203o authadmin
     204v S
     205f FontAwesome_r40
     206t -1.0
     207b 0.0
     208m 0.0
     209h -1.0
     210
     211S P 429
     212s 23May2019[10:37.16]
     213d 0 0 0 100
     214G 100 0 0 100
     215P 414 501
     216e 100 100 39 100
     217o nobody
     218v S
     219h 2.0
     220l 432 433
     221c 297 298
     222
     223S P 430
     224s 23May2019[10:37.16]
     225d 0 0 0 100
     226P 586 501
     227e 100 100 39 100
     228o nobody
     229v S
     230h 2.0
     231l 434 433
     232c 299 298
     233
     234Z
     235
     236L 432 1
     237s 428 429
     238
     239L 435 1
     240s 431 428
     241
     242L 434 1
     243s 430 431
     244
     245L 433 1
     246s 429 430
     247
     248Z
     249
     250C 296 3
     251s 431 428
     252
     253C 297 2
     254s 428 429
     255
     256C 299 2
     257s 430 431
     258
     259C 298 3
     260s 429 430
     261
     262Z
     263
     264ActiveTime:01:10:02
     265DarkTime:01:04:09

  • trunk/src/org/expeditee/auth/Actions.java

    r1367 r1368  
    197197        //      End Misc Auth Actions
    198198       
    199         //      Start Regain Account Access Actions
     199        //      Start Regain Account Access Actions     
     200        /**
     201         * Action used to start the process of formalising the password recovery process.
     202         * @throws SQLException
     203         * @throws IOException
     204         * @throws ClassNotFoundException
     205         * @throws CertificateException
     206         * @throws NoSuchAlgorithmException
     207         * @throws FileNotFoundException
     208         * @throws KeyStoreException
     209         * @throws InvalidKeySpecException
     210         */
     211        public static void AuthSubmitTrustedUsersPasswordRecovery() throws InvalidKeySpecException, NoSuchAlgorithmException, KeyStoreException, FileNotFoundException, CertificateException, ClassNotFoundException, IOException, SQLException {
     212                Frame currentFrame = DisplayController.getCurrentFrame();
     213                Collection<Text> textItems = currentFrame.getTextItems();
     214               
     215                if (!AuthenticatorBrowser.Authenticated) {
     216                        MessageBay.errorMessage("You must be logged in to perform this action.");
     217                        return;
     218                }
     219               
     220                Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.TrustedUserOne, AuthenticationTag.TrustedUserTwo);
     221                if (userdata.isPresent()) {
     222                        Map<AuthenticationTag, String> userData = userdata.get();
     223                        String colleagueOne = userData.get(AuthenticationTag.TrustedUserOne);
     224                        Path colleagueOnePath = Paths.get(FrameIO.CONTACTS_PATH).resolve(colleagueOne + "-credentials");
     225                        String colleagueTwo = userData.get(AuthenticationTag.TrustedUserTwo);
     226                        Path colleagueTwoPath = Paths.get(FrameIO.CONTACTS_PATH).resolve(colleagueTwo + "-credentials");
     227                        if (!colleagueOnePath.toFile().exists()) {
     228                                MessageBay.errorMessage("Your nominated trusted user: " + colleagueOne + " must exist in your contacts.");
     229                        } else if (!colleagueTwoPath.toFile().exists()) {
     230                                MessageBay.errorMessage("Your nominated trusted user: " + colleagueTwo + " must exist in your contacts.");
     231                        } else {
     232                                userData.put(AuthenticationTag.Username, UserSettings.UserName.get());
     233                                boolean success = submitTrustedUsersPasswordRecovery(userData);
     234                                if (success) {
     235                                        Collection<Item> toShow = getByData(currentFrame, "ShowOnProgress");
     236                                        for (Item i: toShow) {
     237                                                i.setVisible(true);
     238                                        }
     239                                        currentFrame.change();
     240                                        MessageBay.displayMessage("-------Messages sent-------");
     241                                }
     242                                FrameIO.SaveFrame(currentFrame);
     243                                DisplayController.requestRefresh(false);
     244                        }
     245                }
     246        }
     247       
    200248        /**
    201249         * Action ran by user to specify who their password colleagues are.  These are the
    … …  
    272320                                                AuthenticationTag.IntergalacticNumber);
    273321                if (userdata.isPresent()) {
    274                         Password.confirmIntergalacticNumberAndAlertColleagues(userdata.get());
     322                        Password.confirmIntergalacticNumberAndAlertTrustedUsers(userdata.get());
    275323                }
    276324        }
    … …  
    493541        }
    494542       
    495         /**
    496          * Action used to start the process of formalising the password recovery process.
    497          * @throws SQLException
    498          * @throws IOException
    499          * @throws ClassNotFoundException
    500          * @throws CertificateException
    501          * @throws NoSuchAlgorithmException
    502          * @throws FileNotFoundException
    503          * @throws KeyStoreException
    504          * @throws InvalidKeySpecException
    505          */
    506         public static void AuthSubmitPWColleagues() throws InvalidKeySpecException, NoSuchAlgorithmException, KeyStoreException, FileNotFoundException, CertificateException, ClassNotFoundException, IOException, SQLException {
    507                 Frame currentFrame = DisplayController.getCurrentFrame();
    508                 Collection<Text> textItems = currentFrame.getTextItems();
    509                
    510                 if (!AuthenticatorBrowser.Authenticated) {
    511                         MessageBay.errorMessage("You must be logged in to perform this action.");
    512                         return;
    513                 }
    514                
    515                 Optional<Map<AuthenticationTag, String>> userdata = AuthenticationTag.fetchUserData(textItems, false, AuthenticationTag.ColleagueOne, AuthenticationTag.ColleagueTwo);
    516                 if (userdata.isPresent()) {
    517                         Map<AuthenticationTag, String> userData = userdata.get();
    518                         String colleagueOne = userData.get(AuthenticationTag.ColleagueOne);
    519                         Path colleagueOnePath = Paths.get(FrameIO.CONTACTS_PATH).resolve(colleagueOne + "-credentials");
    520                         String colleagueTwo = userData.get(AuthenticationTag.ColleagueTwo);
    521                         Path colleagueTwoPath = Paths.get(FrameIO.CONTACTS_PATH).resolve(colleagueTwo + "-credentials");
    522                         if (!colleagueOnePath.toFile().exists()) {
    523                                 MessageBay.errorMessage("Your nominated colleague: " + colleagueOne + " must exist in your contacts.");
    524                         } else if (!colleagueTwoPath.toFile().exists()) {
    525                                 MessageBay.errorMessage("Your nominated colleague: " + colleagueTwo + " must exist in your contacts.");
    526                         } else {
    527                                 userData.put(AuthenticationTag.Username, UserSettings.UserName.get());
    528                                 boolean success = submitPWColleagues(userData);
    529                                 if (success) {
    530                                         Collection<Item> toShow = getByData(currentFrame, "ShowOnProgress");
    531                                         for (Item i: toShow) {
    532                                                 i.setVisible(true);
    533                                         }
    534                                         currentFrame.change();
    535                                         MessageBay.displayMessage("-------Messages sent-------");
    536                                 }
    537                                 FrameIO.SaveFrame(currentFrame);
    538                                 DisplayController.requestRefresh(false);
    539                         }
    540                 }
    541         }
    542        
    543543        /*
    544544         * Function to submit a request to specified contacts to be the current users pw colleagues.
    545545         */
    546         private static boolean submitPWColleagues(Map<AuthenticationTag, String> userData) throws InvalidKeySpecException, NoSuchAlgorithmException, KeyStoreException, FileNotFoundException, CertificateException, ClassNotFoundException, IOException, SQLException {
    547                 String colleagueOne = userData.get(AuthenticationTag.ColleagueOne);
    548                 String colleagueTwo = userData.get(AuthenticationTag.ColleagueTwo);
     546        private static boolean submitTrustedUsersPasswordRecovery(Map<AuthenticationTag, String> userData) throws InvalidKeySpecException, NoSuchAlgorithmException, KeyStoreException, FileNotFoundException, CertificateException, ClassNotFoundException, IOException, SQLException {
     547                String colleagueOne = userData.get(AuthenticationTag.TrustedUserOne);
     548                String colleagueTwo = userData.get(AuthenticationTag.TrustedUserTwo);
    549549                PublicKey colleagueOneKey = AuthenticatorBrowser.getInstance().getPublicKey(colleagueOne);
    550550                PublicKey colleagueTwoKey = AuthenticatorBrowser.getInstance().getPublicKey(colleagueTwo);

  • trunk/src/org/expeditee/auth/account/Password.java

    r1367 r1368  
    9494         * @param tags
    9595         */
    96         public static void confirmIntergalacticNumberAndAlertColleagues(Map<AuthenticationTag, String> tags) {
     96        public static void confirmIntergalacticNumberAndAlertTrustedUsers(Map<AuthenticationTag, String> tags) {
    9797                // Confirm intergalactic numbers match
    9898                String username = tags.get(AuthenticationTag.Username);
    … …  
    141141                        sendEmail(colleagueTwoEmail, sb);
    142142                       
    143                         MessageBay.displayMessage("Identity confirmed.  Your password colleagues have been contacted via one-off secure Expeditee message.  "
     143                        MessageBay.displayMessage("Identity confirmed.  Your trusted contacts have been notified via one-off secure Expeditee message.  "
    144144                                        + "You will recieve an email message with a password share from each once they have completed their part of the process.  Enter them below.");
    145145                } catch (MessagingException e) {
    … …  
    155155                                fileName = in.nextLine();
    156156                        } catch (IOException e) {
    157                                 MessageBay.errorMessage("Unable to password colleague frame for specified user, are they registered on this computer?");
     157                                MessageBay.errorMessage("Unable to find trusted users contact frame for specified user, are they registered on this computer?");
    158158                                return null;
    159159                        }
    160160                } else {
    161                         MessageBay.errorMessage("Unable to password colleague frame for specified user, are they registered on this computer?");
     161                        MessageBay.errorMessage("Unable to find trusted users contact frame for specified user, are they registered on this computer?");
    162162                        return null;
    163163                }

  • trunk/src/org/expeditee/auth/tags/AuthenticationTag.java

    r1363 r1368  
    1616        Email ("txtEmail", System.getProperty("user.email")),
    1717        EmailAgain ("txtEmailAgain", System.getProperty("user.email.again")),
    18         ColleagueOne ("txtColleagueOne", System.getProperty("user.colleague.one")),
    19         ColleagueTwo ("txtColleagueTwo", System.getProperty("user.colleague.two")),
     18        TrustedUserOne ("txtTrustedUserOne", System.getProperty("user.colleague.one")),
     19        TrustedUserTwo ("txtTrustedUserTwo", System.getProperty("user.colleague.two")),
    2020        Frameset ("txtFrameset", System.getProperty("user.toshare.frameset")),
    2121        IntergalacticNumber ("txtIntergalacticNumber", System.getProperty("user.intergalacticnumber")),
Note: See TracChangeset for help on using the changeset viewer.