diff --git a/helmchart/single-sign-on/values.yaml b/helmchart/single-sign-on/values.yaml index 32ac763d22864ec759012d84a4142f12ed94c586..44d9d7b977c9e8b9bc705ab77169302fafb312a4 100644 --- a/helmchart/single-sign-on/values.yaml +++ b/helmchart/single-sign-on/values.yaml @@ -136,6 +136,11 @@ kratos: } +# TODO: Email verification for now disabled. This need to be changed +# eventually. However, first the basic flow and sending out +# email notifications need to be fixed. +# This should be under "org.sh/kratos" in above schema +# # "verification": { # "via": "email" # }, @@ -153,6 +158,8 @@ kratos: serve: public: + # TODO: This is the development URL and needs to be replaced by + # something sensable by Flux. base_url: http://localhost:8080 selfservice: @@ -167,6 +174,8 @@ kratos: recovery: enabled: true lifespan: 15m + # TODO: Those UI URLS need to be changed once the final location + # is determined. Also they need to be configured by flux ui_url: http://localhost:5000/recovery login: diff --git a/login/config.py b/login/config.py index cb919b6c5ff66a36489074e7a5fc16d5b0c92d59..dbcd988d7f98e0bcfe0c78516a6e9c23e5005fdb 100644 --- a/login/config.py +++ b/login/config.py @@ -20,7 +20,6 @@ class Config(object): - class ProductionConfig(Config): DEBUG = False diff --git a/login/templates/login.html b/login/templates/login.html deleted file mode 100644 index dfceb48c4293f35164bb36598184fa4485c3847e..0000000000000000000000000000000000000000 --- a/login/templates/login.html +++ /dev/null @@ -1,18 +0,0 @@ -<!doctype html> -<title>OAS authentication service</title> -<div style='margin: 0 auto ; width: 350px; padding:20px; border-style:solid; border-color:#6c757d; border-width: 1px; background-color: #f8f9fa; font-family: "Segoe UI", Roboto; font-family: "Helvetica Neue", Arial; font-family: "Noto Sans", sans-serif;'> - {% if logo %} - <div style="position:relative; width: 350px; height:100px"> - <img style="overflow: auto; top: 0; left: 0; bottom: 0; right: 0; position: absolute; margin: auto;max-width: 300px; max-height: 100px" src="{{logo}}" alt="Logo of application"></img> - </div> - {% endif %} - <h1>Log in to {{ application_name }}</h1> - <form method="POST" action="/login"> - {{ login_form.csrf_token }} - {{ login_form.challenge }} - {{ login_form.username(placeholder="Username", autofocus=true) }}<br> - <div style="margin-top:5px">{{ login_form.password(placeholder="Password") }}</div> <br> - {{ login_form.remember }}{{ login_form.remember.label }} <br> - <div style="margin-top:5px">{{ login_form.submit }}</div> - </form> -</div> diff --git a/login/templates/skip.html b/login/templates/skip.html deleted file mode 100644 index 64b2474979f4b35b9f0527b28da08bafa907c127..0000000000000000000000000000000000000000 --- a/login/templates/skip.html +++ /dev/null @@ -1,14 +0,0 @@ -<!doctype html> -<title>OAS authentication service</title> -<div style='margin: 0 auto ; width: 350px; padding:20px; border-style:solid; border-color:#6c757d; border-width: 1px; background-color: #f8f9fa; font-family: "Segoe UI", Roboto; font-family: "Helvetica Neue", Arial; font-family: "Noto Sans", sans-serif;'> - {% if logo %} - <div style="position:relative; width: 350px; height:100px"> - <img style="overflow: auto; top: 0; left: 0; bottom: 0; right: 0; position: absolute; margin: auto;max-width: 300px; max-height: 100px" src="{{logo}}" alt="Logo of application"></img> - </div> - {% endif %} - <h1>Log in to {{ application_name }}</h1> - <div style="width: 100%; margin-bottom: 5px; overflow: auto"> - <div style="width:60%; float:left"><button id="continue" onclick="window.location.href = '/login?login_challenge={{ challenge }}&skip=true';">Continue with {{ username }}</button></div> - <div style="width:40%; float:left;"><button id="logout" onclick="window.location.href = '/login?login_challenge={{ challenge }}&logout=true';">Logout</button></div> - </div> -</div>