backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jvelilla-roc_logout'

Browse Source
This commit is contained in:
jvelilla
2015-09-01 11:50:37 -03:00
parent ad4f020d0e 634a078282
commit e1727cc445
5 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/demo/site/modules/basic_auth/files/js/roc_basic_auth.js
View File

@@ -25,7 +25,7 @@ ROC_AUTH.login = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
} }
}else{ }else{
@@ -49,7 +49,7 @@ ROC_AUTH.login = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
} }
} }
@@ -93,7 +93,7 @@ ROC_AUTH.login_with_redirect = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
$("#imgProgressRedirect").hide(); $("#imgProgressRedirect").hide();
} }
}else{ }else{
@@ -122,8 +122,8 @@ ROC_AUTH.login_with_redirect = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
$("#imgProgressRedirect").hide(); $("#imgProgressRedirect").hide();
} }
} }

9
examples/demo/site/modules/basic_auth/templates/block_login.tpl
View File

@@ -5,12 +5,12 @@
<div> <div>
<form name="cms_basic_auth" action method="POST"> <form name="cms_basic_auth" action method="POST">
<div> <div>
<input type="text" name="username" required> <input type="text" name="username" id="username" required>
<label>Username</label> <label>Username</label>
</div> </div>
<div> <div>
<input type="password" name="password" required> <input type="password" name="password" id="password" required>
<label>Password</label> <label>Password</label>
</div> </div>
@@ -25,10 +25,5 @@
</p> </p>
</div> </div>
</div> </div>
<div>
{foreach item="item" from="$oauth_consumers"}
<a href="{$site_url/}account/login-with-oauth/{$item/}">Login with {$item/}</a><br>
{/foreach}
</div>
{/unless} {/unless}
</div> </div>

15
modules/basic_auth/handler/cms_basic_auth_logoff_handler.e
View File

@@ -47,6 +47,7 @@ feature -- HTTP Methods
l_page: CMS_RESPONSE l_page: CMS_RESPONSE
l_url: STRING l_url: STRING
i: INTEGER i: INTEGER
l_message: STRING
do do
api.logger.put_information (generator + ".do_get Processing basic auth logoff", Void) api.logger.put_information (generator + ".do_get Processing basic auth logoff", Void)
if attached req.query_parameter ("prompt") as l_prompt then if attached req.query_parameter ("prompt") as l_prompt then
@@ -72,6 +73,10 @@ feature -- HTTP Methods
l_page.set_status_code ({HTTP_STATUS_CODE}.found) l_page.set_status_code ({HTTP_STATUS_CODE}.found)
l_page.set_redirection (l_url) l_page.set_redirection (l_url)
end end
create l_message.make_from_string (logout_message)
l_message.replace_substring_all ("$site_login", req.absolute_script_url ("/account/roc-login"))
l_message.replace_substring_all ("$site_home", req.absolute_script_url (""))
l_page.set_main_content (l_message)
l_page.execute l_page.execute
end end
end end
@@ -113,4 +118,14 @@ feature -- HTTP Methods
end end
end end
feature {NONE}-- Lougout Message
logout_message: STRING = "[
<div class=%"cms-logout-message%">
<h2>You are now signed out</h2>
<p>You can <a href=$site_login>log</a> in again, or go to the <a href=%"$site_home%">front page</a>.</p>
</div>
]"
end end

10
modules/basic_auth/site/files/js/roc_basic_auth.js
View File

@@ -25,7 +25,7 @@ ROC_AUTH.login = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
} }
}else{ }else{
@@ -49,7 +49,7 @@ ROC_AUTH.login = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
} }
} }
@@ -93,7 +93,7 @@ ROC_AUTH.login_with_redirect = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
$("#imgProgressRedirect").hide(); $("#imgProgressRedirect").hide();
} }
}else{ }else{
@@ -122,8 +122,8 @@ ROC_AUTH.login_with_redirect = function() {
var newdiv = document.createElement('div'); var newdiv = document.createElement('div');
newdiv.innerHTML = "<br>Invalid Credentials</br>"; newdiv.innerHTML = "<br>Invalid Credentials</br>";
newdiv.id = 'myModalFormId'; newdiv.id = 'myModalFormId';
$("body").append(newdiv); $(".primary-tabs").append(newdiv);
$("#imgProgressRedirect").hide(); $("#imgProgressRedirect").hide();
} }
} }

4
modules/basic_auth/site/templates/block_login.tpl
View File

@@ -5,12 +5,12 @@
<div> <div>
<form name="cms_basic_auth" action method="POST"> <form name="cms_basic_auth" action method="POST">
<div> <div>
<input type="text" name="username" required> <input type="text" name="username" id="username" required>
<label>Username</label> <label>Username</label>
</div> </div>
<div> <div>
<input type="password" name="password" required> <input type="password" name="password" id="password" required>
<label>Password</label> <label>Password</label>
</div> </div>