v 1812.1031: fix login PWD ONLY (serve chiave in config su DB)

This commit is contained in:
Samuele E. Locatelli
2018-12-06 12:16:14 +01:00
parent 12c2cc2076
commit a1809bcab8
4 changed files with 31 additions and 9 deletions
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1030']) {
withEnv(['NEXT_BUILD_NUMBER=1031']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
+4 -2
View File
@@ -2,11 +2,12 @@
<div class="row">
<div class="col-12">
<h3 class="text-center">QR-Scan USER LOGIN</h3>
<h3 class="text-center"QR-Scan USER LOGIN</h3>
</div>
<div class="col-12 text-center">
<asp:UpdatePanel runat="server" ID="upnDecode">
<ContentTemplate>
<asp:LinkButton runat="server" ID="lbtGo" CssClass="btn btn-success btn-sm" OnClick="lbtGo_Click"><i class="fa fa-arrow-circle-right"></i> GO</asp:LinkButton>
<asp:TextBox runat="server" ID="txtQRCode" Width="25em" AutoPostBack="true" OnTextChanged="txtQRCode_TextChanged" />
<asp:HyperLink runat="server" ID="hlReload" NavigateUrl="~/" CssClass="btn btn-success btn-sm"><i class="fa fa-arrow-circle-right"></i> GO</asp:HyperLink>
</ContentTemplate>
@@ -24,7 +25,8 @@
}
else {
// altrimenti salvo in textBox e processo
document.getElementById('<%= txtQRCode.ClientID %>').value = content;
document.getElementById('<%= txtQRCode.ClientID %>').value = content;
document.getElementById('<%= lbtGo.ClientID %>').click();
}
});
Instascan.Camera.getCameras().then(function (cameras) {
+17 -6
View File
@@ -20,6 +20,17 @@ namespace MoonProTablet.WebUserControls
}
protected void txtQRCode_TextChanged(object sender, EventArgs e)
{
checkloginPwdOnly();
//// rimando a pagina di login...
//Response.Redirect(txtQRCode.Text.Trim());
//hlReload.NavigateUrl=txtQRCode.Text.Trim();
//hlReload.Text = txtQRCode.Text.Trim();
//hlReload.Enabled = true;
}
private void checkloginPwdOnly()
{
// se abilitato login "pwdOnly" rimando a login...
if (memLayer.ML.cdvb("loginPwdOnly"))
@@ -31,16 +42,16 @@ namespace MoonProTablet.WebUserControls
{
// in questo caso rimando a jumper...
int MatrOpr = results[0].MatrOpr;
string baseAuthUrl = memLayer.ML.CRS("baseAuthUrl");
// rimando a pagina login con pwdOnly...
Response.Redirect(string.Format("jumper?MatrOpr={0}&UserAuthKey={1}", MatrOpr, UserAuthKey));
Response.Redirect(string.Format("{0}MatrOpr={1}&UserAuthKey={2}", baseAuthUrl, MatrOpr, UserAuthKey));
}
}
}
//// rimando a pagina di login...
//Response.Redirect(txtQRCode.Text.Trim());
//hlReload.NavigateUrl=txtQRCode.Text.Trim();
//hlReload.Text = txtQRCode.Text.Trim();
//hlReload.Enabled = true;
protected void lbtGo_Click(object sender, EventArgs e)
{
checkloginPwdOnly();
}
}
}
+9
View File
@@ -21,6 +21,15 @@ namespace MoonProTablet.WebUserControls {
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnDecode;
/// <summary>
/// Controllo lbtGo.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtGo;
/// <summary>
/// Controllo txtQRCode.
/// </summary>