From 3cbe9b618ec35e38c9411eb5d5470e202052422d Mon Sep 17 00:00:00 2001 From: adrian-turjak Date: Wed, 24 May 2017 19:28:53 +1200 Subject: [PATCH] Update templates for token reissue case * When a token is reissued actions aren't rerun and task cache values do not persist beyond runs (we may need to rethink that). * This simply adds default causes for those token templates. Change-Id: I004a2c1aac05aa5e9079b71b819f6f1dfa4bc565 --- adjutant/api/v1/templates/invite_user_token.txt | 2 ++ adjutant/api/v1/templates/signup_token.txt | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/adjutant/api/v1/templates/invite_user_token.txt b/adjutant/api/v1/templates/invite_user_token.txt index 0ed2b18..94bfc7f 100644 --- a/adjutant/api/v1/templates/invite_user_token.txt +++ b/adjutant/api/v1/templates/invite_user_token.txt @@ -10,6 +10,8 @@ You will be asked to define a password when accepting the invitation. After that As an existing user you will be added to the project and do not need to provide additional information. All you have to do is click confirm. {% elif task.cache.user_state == "disabled" %} It appears you already have a user account that was disabled. We've reactivated it, but because it may have been a while we've reset your password. After you setup your new password you will be given access to the project and will be able to login. +{% else %} +If you are a new user you will have to define a password when accepting the invitation, while as an existing user you simply need to click confirm. {% endif %} {% endspaceless %} diff --git a/adjutant/api/v1/templates/signup_token.txt b/adjutant/api/v1/templates/signup_token.txt index 589abfb..a80d364 100644 --- a/adjutant/api/v1/templates/signup_token.txt +++ b/adjutant/api/v1/templates/signup_token.txt @@ -4,10 +4,10 @@ Please follow this link to finalise access to your new OpenStack project: {{ tokenurl }}{{ token }} {% spaceless %} -{% if task.cache.user_state == "default" %} -You will be asked to define a password, after that you will be given access to the project and will be able to login -{% elif task.cache.user_state == "disabled" %} +{% if task.cache.user_state == "disabled" %} It appears you already have a user account that was disabled. We've reactivated it, but because it may have been a while we've reset your password. After you setup your new password you will be given access to your new project and will be able to login. +{% else %} +You will be asked to define a password, after that you will be given access to the project and will be able to login. {% endif %} {% endspaceless %}