diff --git a/login/app.py b/login/app.py index e02c4cf50cede985f8e1d46716532165325bf159..227b4c66f3ed342f230f9ab8331c5c78b9451ff0 100644 --- a/login/app.py +++ b/login/app.py @@ -333,7 +333,7 @@ def settings(): @app.route('/login', methods=['GET', 'POST']) def login(): """Start login flow - If already logged in, showd the loggedin template. Otherwise creates a login + If already logged in, shows the loggedin template. Otherwise creates a login flow, if no active flow will redirect to kratos to create a flow. :param flow: flow as given by Kratos @@ -369,7 +369,7 @@ def auth(): This is the entry point for those authorization requests. The challenge as provided, is verified. If an active user is logged in, the request is accepted and the user is returned to the application. If the user is not - logged in yet, it redirect to the login page + logged in yet, it redirects to the login page :param challenge: challenge as given by Hydra :return: redirect to login or application/idp """ @@ -395,10 +395,10 @@ def auth(): # If the user is not logged in yet, we redirect to the login page - # but before we do taht, we set the "flow_state" cookie to auth. - # so the UI know it has to redirect after successful login. - # The redirect URL is back to this page (auth) with the same challenge. - # so we can pickup the flow where we left off + # but before we do that, we set the "flow_state" cookie to auth. + # so the UI knows it has to redirect after a successful login. + # The redirect URL is back to this page (auth) with the same challenge + # so we can pickup the flow where we left off. if not profile: url = app.config["PUBLIC_URL"] + "/auth?login_challenge=" + challenge; url = urllib.parse.quote_plus(url) @@ -430,7 +430,7 @@ def auth(): redirect_to = login_request.accept( profile['email'], remember=True, - # Remember session fof 7d + # Remember session for 7d remember_for=60*60*24*7) return redirect(redirect_to) @@ -523,7 +523,7 @@ def getAuth(): # Given a cookie, check if it is valid and get the profile try: api_response = KRATOS_PUBLIC.to_session( - cookie = cookie) + cookie=cookie) # Get all traits from ID profile = api_response.identity.traits diff --git a/login/static/base.js b/login/static/base.js index 20a5137289b6d2eae22921389dbaa02162cab53c..82aeb202d3b9e9c7556c80c0f593799d669aeb64 100644 --- a/login/static/base.js +++ b/login/static/base.js @@ -19,7 +19,7 @@ */ -// Check if there is a auth flow is configured and redirect to auth page in that +// Check if an auth flow is configured and redirect to auth page in that // case. function check_flow_auth() { var state = Cookies.get('flow_state'); @@ -108,7 +108,7 @@ function flow_settings_validate() { // Render the settings flow, this is where users can change their personal -// settings, like name and password. The actually for is defined by Kratos +// settings, like name and password. The form contents are defined by Kratos function flow_settings() { // Get the details from the current flow from kratos @@ -288,7 +288,7 @@ function getFormElement(type, name, value) { value, 'E-mail address', 'Please enter your e-mail address here', - 'Please provode your e-mail address. We will send a recovery ' + + 'Please provide your e-mail address. We will send a recovery ' + 'link to that e-mail address.', ); } @@ -359,7 +359,7 @@ function getFormElement(type, name, value) { // param value: preset value of the field // param label: Label to display above field // param placeHolder: Label to display in field if empty -// param help: Additional help tekst, displayed below the field in small font +// param help: Additional help text, displayed below the field in small font function getFormInput(type, name, value, label, placeHolder, help) { // Id field for help element diff --git a/login/templates/base.html b/login/templates/base.html index 672db33001d98e24d6fd6f96f91cefce67ee6e76..9d5765f1fa1116554095827bf469a24fde7cf26a 100644 --- a/login/templates/base.html +++ b/login/templates/base.html @@ -29,7 +29,7 @@ <div id="contentFlowExpired" class='alert alert-warning' - style='display:none'>Your request is expired. Please complete yourrequest swiftly.</div> + style='display:none'>Your request is expired. Please resubmit your request faster.</div> <img src='static/logo.svg'/><br/><br/> diff --git a/login/templates/login.html b/login/templates/login.html index 1985afffa5666c2ded51bc521598f49f28fc836a..b715367a98e700f0e498ea3daaa24d17baee6a7a 100644 --- a/login/templates/login.html +++ b/login/templates/login.html @@ -19,7 +19,7 @@ <div id="contentMessages"></div> <div id="contentLogin"></div> <div id="contentHelp"> - <a href='recovery'>Forget password?</a> | <a href='https://stackspin.org'>About stackspin</a> + <a href='recovery'>Forget password?</a> | <a href='https://stackspin.net'>About stackspin</a> </div> {% endblock %}