From e449a6c4369e4ebaf39ed08d41ae82e99e025c9e Mon Sep 17 00:00:00 2001
From: annaelee <130700951+annaelee@users.noreply.github.com>
Date: Wed, 24 May 2023 01:38:58 -0500
Subject: [PATCH] Allow the use of tokens for s3 access (#53)

Co-authored-by: @annaelee
---
 src/app/webapp-common/core/reducers/common-auth-reducer.ts   | 1 +
 .../layout/s3-access-dialog/s3-access-dialog.component.html  | 5 +++++
 .../layout/s3-access-dialog/s3-access-dialog.component.ts    | 2 ++
 .../s3-access-resolver/s3-access-resolver.component.html     | 1 +
 .../s3-access-resolver/s3-access-resolver.component.ts       | 2 ++
 src/app/webapp-common/settings/admin/base-admin.service.ts   | 3 ++-
 .../settings/admin/s3-access/s3-access.component.html        | 4 ++++
 .../settings/admin/s3-access/s3-access.component.ts          | 3 ++-
 8 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/app/webapp-common/core/reducers/common-auth-reducer.ts b/src/app/webapp-common/core/reducers/common-auth-reducer.ts
index e96ed956..63c8a2f4 100755
--- a/src/app/webapp-common/core/reducers/common-auth-reducer.ts
+++ b/src/app/webapp-common/core/reducers/common-auth-reducer.ts
@@ -19,6 +19,7 @@ export interface Credentials {
   Endpoint?: string;
   Key?: string;
   Secret?: string;
+  Token?: string;
   Region?: string;
 }
 
diff --git a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.html b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.html
index 957749b5..1142aa51 100755
--- a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.html
+++ b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.html
@@ -16,6 +16,11 @@
              [placeholder]="isAzure ? 'Shared access signature (SAS)' : 'Secret'">
       <mat-error *ngIf="secretInput.errors?.required">*Required</mat-error>
     </mat-form-field>
+    <mat-form-field *ngIf="!isAzure" class="w-100">
+      <mat-label>Token</mat-label>
+      <input matInput [(ngModel)]="S3Form.Token" type="text" name="Token" placeholder="Token" [(ngModel)]="S3Form.Token" #keyInput="ngModel"
+             autocomplete="off">
+    </mat-form-field>
     <mat-form-field *ngIf="!isAzure" class="w-100">
       <mat-label>Region</mat-label>
       <input matInput [(ngModel)]="S3Form.Region" type="text" name="Region" placeholder="AWS Region (e.g. us-east-2)"
diff --git a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts
index 8d512362..d2846a40 100755
--- a/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts
+++ b/src/app/webapp-common/layout/s3-access-dialog/s3-access-dialog.component.ts
@@ -16,6 +16,7 @@ export class S3AccessDialogComponent implements OnChanges {
   @Input() key;
   @Input() secret                          = '';
   @Input() region                          = '';
+  @Input() token                           = '';
   @Input() bucket;
   @Input() endpoint;
   @Input() editMode                        = false;
@@ -36,6 +37,7 @@ export class S3AccessDialogComponent implements OnChanges {
       this.S3Form= {
         Key     : changes.isAzure.currentValue ? 'azure' : changes.key.currentValue,
         Secret  : changes.secret.currentValue,
+        Token   : changes.token.currentValue,
         Region  : changes.region.currentValue,
         Bucket  : changes.bucket.currentValue,
         Endpoint: (changes.endpoint.currentValue === null || changes.endpoint.currentValue?.startsWith('http')) ?
diff --git a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.html b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.html
index c878d0c6..37714964 100755
--- a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.html
+++ b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.html
@@ -6,6 +6,7 @@
     [region]="region"
     [secret]="secret"
     [key]="key"
+    [token]="token"
     [editMode]="editMode"
     [isAzure]="isAzure"
     (closeSave)="saveS3Credentials($event)"
diff --git a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts
index 31bc6bc0..2273c568 100755
--- a/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts
+++ b/src/app/webapp-common/layout/s3-access-resolver/s3-access-resolver.component.ts
@@ -16,6 +16,7 @@ export class S3AccessResolverComponent {
   endpoint: any;
   key: any;
   secret: any;
+  token: any;
   region: any;
   header: any;
   editMode: any;
@@ -32,6 +33,7 @@ export class S3AccessResolverComponent {
     this.endpoint       = s3Credentials.Endpoint;
     this.key            = s3Credentials.Key;
     this.secret         = s3Credentials.Secret;
+    this.token          = s3Credentials.Token;
     this.region         = s3Credentials.Region;
     this.isAzure        = data.isAzure;
     if (data.credentialsError) {
diff --git a/src/app/webapp-common/settings/admin/base-admin.service.ts b/src/app/webapp-common/settings/admin/base-admin.service.ts
index 662a0acc..cdd22e05 100755
--- a/src/app/webapp-common/settings/admin/base-admin.service.ts
+++ b/src/app/webapp-common/settings/admin/base-admin.service.ts
@@ -138,7 +138,8 @@ export class BaseAdminService {
       region: set.Region || DEFAULT_REGION,
       credentials: {
         accessKeyId: set.Key,
-        secretAccessKey: set.Secret
+        secretAccessKey: set.Secret,
+        sessionToken: set.Token
       },
       ...(set.Endpoint && {
         endpoint: {
diff --git a/src/app/webapp-common/settings/admin/s3-access/s3-access.component.html b/src/app/webapp-common/settings/admin/s3-access/s3-access.component.html
index 94f3ef66..ddb00d40 100755
--- a/src/app/webapp-common/settings/admin/s3-access/s3-access.component.html
+++ b/src/app/webapp-common/settings/admin/s3-access/s3-access.component.html
@@ -3,6 +3,7 @@
     <div class="col-6">Bucket</div>
     <div class="col-4">Key</div>
     <div class="col-6">Secret / SAS</div>
+    <div class="col-6">Token</div>
     <div class="col-2">AWS Region</div>
     <div class="col-6">Host (Endpoint)</div>
   </div>
@@ -18,6 +19,9 @@
       <div class="col-6">
         <input matInput class="form-control" formControlName="Secret">
       </div>
+      <div class="col-6">
+        <input matInput class="form-control" formControlName="Token">
+      </div>
       <div class="col-2">
         <input matInput class="form-control" formControlName="Region" placeholder="us-east-2">
       </div>
diff --git a/src/app/webapp-common/settings/admin/s3-access/s3-access.component.ts b/src/app/webapp-common/settings/admin/s3-access/s3-access.component.ts
index 3aa3d418..a447cdf8 100755
--- a/src/app/webapp-common/settings/admin/s3-access/s3-access.component.ts
+++ b/src/app/webapp-common/settings/admin/s3-access/s3-access.component.ts
@@ -37,10 +37,11 @@ export class S3AccessComponent implements OnDestroy, OnInit {
     return this.S3Form.get(this.BUCKET_CREDENTIALS) as UntypedFormArray;
   }
 
-  addBucket({Key = '', Secret = '', Region = '', Bucket = '', Endpoint = null} = {}) {
+  addBucket({Key = '', Secret = '', Token='', Region = '', Bucket = '', Endpoint = null} = {}) {
     this.bucketCredentials.push(this.formBuilder.group({
       Key,
       Secret,
+      Token,
       Region,
       Bucket,
       Endpoint: (Endpoint?.startsWith('http') || Endpoint === null)? Endpoint : `http${Endpoint?.endsWith('443') ? 's' : ''}://${Endpoint}`