From 1910e36effc4a93078df0bddd2caf83f0c9f9330 Mon Sep 17 00:00:00 2001
From: Nanjiang Shu <nanjiang.shu@gmail.com>
Date: Tue, 18 Feb 2025 11:44:54 +0100
Subject: [PATCH] [auth]: uniformed credential page for ega login and AAI login

---
 sda/cmd/auth/frontend/templates/ega.html | 16 +++++-----------
 sda/cmd/auth/main.go                     |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sda/cmd/auth/frontend/templates/ega.html b/sda/cmd/auth/frontend/templates/ega.html
index 6e921f69a..ac3ec3f0a 100644
--- a/sda/cmd/auth/frontend/templates/ega.html
+++ b/sda/cmd/auth/frontend/templates/ega.html
@@ -31,18 +31,12 @@
               Welcome, {{.User}}!
             </p>
             {{if .Token}}
-            <p class="text-center">
-              Your access token is:
-            </p>
-            <pre class="border border-secondary rounded py-2 px-3 my-4" id="logintext">{{.Token}}</pre>
-            {{end}}
-            {{if .ExpDate}}
-            <p class="text-center">
-              Your access token expires (UTC):
-            </p>
-            <pre class="text-center" id="logintext">{{.ExpDate}}</pre>
+              <p class="text-center">
+                For <strong>uploading</strong> to the Inbox, your access token {{if .ExpDate}}(expires at {{.ExpDate}} UTC){{end}} is:
+              </p>
+              <pre class="border border-secondary rounded py-2 px-3 my-4" id="logintext">{{.Token}}</pre>
             {{end}}
-            <a href="/ega/s3conf" class="btn btn-primary btn-block">Download inbox s3cmd credentials</a>
+            <a href="/ega/s3conf" class="btn btn-primary btn-block mb-5">Download credentials to upload to the Inbox</a>
             <a href="/" class="btn btn-primary btn-block">Continue</a>
       </div>
     </div>
diff --git a/sda/cmd/auth/main.go b/sda/cmd/auth/main.go
index 576b4266e..1fe808846 100644
--- a/sda/cmd/auth/main.go
+++ b/sda/cmd/auth/main.go
@@ -220,7 +220,7 @@ func (auth AuthHandler) getEGALogin(ctx iris.Context) {
 
 // getEGAConf returns an s3config file for an oidc login
 func (auth AuthHandler) getEGAConf(ctx iris.Context) {
-	auth.getS3Config(ctx, "ega", "s3cmd.conf")
+	auth.getS3Config(ctx, "ega", "s3cmd-inbox.conf")
 }
 
 // getOIDC redirects to the oidc page defined in auth.Config