Add reset password module

Benjamin Renard
1 parent 2185f5f5
Showing 9 changed files with 282 additions and 3 deletions Show diff stats
js/app/AmdaApp.js
js/app/controllers/ResetPwdModule.js
js/app/views/ResetPwdUI.js
js/resources/css/amda.css
js/resources/images/16x16/reset_pwd.png
php/classes/AmdaAction.php
php/classes/AmdaClient.php
php/classes/UserMgr.php
php/config.php
@@ -163,7 +163,14 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
 			title       : 'Astronomical Images',
 			source      : 'amdaDesktop.AstroImagesModule',
 			useLauncher : false
-		}
+		},
+        resetpwd : {
+			id          : 'resetpwd-win',
+			icon        : 'icon-resetpwd',
+			title       : 'Reset Password',
+			source      : 'amdaDesktop.ResetPwdModule',
+			useLauncher : false
+		},
 	},
 	functionList : [],
 	constantList : [],
@@ -429,6 +436,19 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
 						},
 						scope : this
 					},
+                    {
+						text : 'Reset password',
+						iconCls : 'icon-resetpwd',
+						id : 'resetpwd-win-tool',
+						handler : function(obj, e) {
+								e.stopEvent();
+								var moduleId = obj.el.id;
+								this.getLoadedModule(moduleId.replace('-tool', ''), true, function(module) {
+								module.createWindow();
+								});
+						},
+						scope : this
+					},
 					{
 						text : 'Feedback',
 						iconCls : 'icon-feedback',
@@ -0,0 +1,49 @@
+/**
+  * Project      :  AMDA-NG
+  * Name         : ResetPwdModule.js
+  * @plugin 	  amdaDesktop.ResetPwdModule
+  * @extends 	  amdaDesktop.AmdaModule
+  * @brief		 Reset password controller
+  * @author Benjamin
+  * @version $Id: ResetPwdModule.js 965 2024-09-19 16:05:30Z benjamin $        
+  */
+
+Ext.define('amdaDesktop.ResetPwdModule', {
+		
+	extend: 'amdaDesktop.AmdaModule',
+
+	requires : [
+		'amdaUI.ResetPwdUI'
+	],
+    
+	contentId : 'resetpwdUI',
+	width :  600, 
+	height : 280,
+    
+	createWindow : function(){
+		var desktop = this.app.getDesktop();
+		var win = desktop.getWindow(this.id);
+		
+		if(!win){
+			win = desktop.createWindow({		  
+				id: this.id,
+				title:this.title, 
+				layout: 'fit',
+				width: this.width,
+				height: this.height,
+                minHeight: this.height,
+				modal: true,
+				iconCls: this.icon,
+				animCollapse:false,
+				constrainHeader:true,
+				bodyPadding : 5,
+				stateful : false,
+				items : [{
+					xtype: 'panelResetPwd'
+				}]
+			});
+		} 
+		win.show();
+		return win;
+	}
+});
@@ -0,0 +1,172 @@
+/**
+  * Project      :  AMDA-NG
+  * Name         : ResetPwdUI.js
+  * @plugin 	  amdaUI.ResetPwdUI
+  * @extends 	  Ext.panel.Panel
+  * @brief		 Reset password view
+  * @author Benjamin
+  * @version $Id: ResetPwdUI.js 2031 2024-09-19 11:28:34Z benjamin $      
+  */
+
+Ext.define('amdaUI.ResetPwdUI', {
+	extend: 'Ext.form.Panel',
+	alias: 'widget.panelResetPwd',
+
+	constructor: function(config) {			
+		this.init(config);
+		this.callParent(arguments);
+	},
+    
+	getInfoMsg : function()
+	{
+		return '' +
+			'To make the change, type your current password in the appropriate box, followed by a new one, which you will then confirm.<br>'+
+			'Please note that passwords are encrypted in our database and we are unable to retrieve them for you.<br>'+
+			'If you have any problems, please contact the CDPP/AMDA team.';
+	},
+    
+	getUser : function()
+	{
+		return sessionID;
+	},
+
+	onSendFinish : function(result, e){	
+		var t = e.getTransaction();
+		if (e.status) 
+		{	
+			if (result && result.success)
+			{
+				// SUCCESS  
+				var win = myDesktopApp.desktop.getWindow(myDesktopApp.dynamicModules.resetpwd.id);
+				Ext.MessageBox.show({
+					title: 'New password set successfully',
+					msg: 'For your next AMDA session, you will need to enter your new password',
+					buttons: Ext.MessageBox.OK,
+					icon: Ext.MessageBox.INFO,
+					fn: function (btn){
+						win.close();
+					}
+				});
+				return;
+			}
+
+			//ERROR
+			var msgErr = 'Unknown error';
+			if (result.message)
+			{
+				msgErr = result.message;
+			}
+			Ext.Msg.show({title:'Error', msg: msgErr, icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK});
+		}
+		else
+		{
+			// FAILURE
+			Ext.Msg.show({title:'Error System', msg: e.message, icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK});
+		}   
+	},
+    
+	onResetPwd : function(b,e){
+		//get links to components
+		var fieldset = this.getComponent('resetpwd_fieldset');
+		var crtPwd = fieldset.getComponent('crtpwd_field');
+		var newPwd = fieldset.getComponent('newpwd_field');
+		var newPwd2 = fieldset.getComponent('newpwd2_field');
+
+		if (!crtPwd.isValid() && !newPwd.isValid() || !newPwd2.isValid())
+		{
+			Ext.Msg.show({title:'Error', msg: 'Some field values are invalid', icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK});
+			return;
+		}
+
+		if (newPwd.getValue() != newPwd2.getValue()) {
+			Ext.Msg.show({title: 'Error', msg: 'Password does not match Confirmation', icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK});
+			return;
+		}
+
+		//make the object to send
+		var reset = {
+			crtpwd : crtPwd.getValue(), 
+			newpwd : newPwd.getValue()
+		};
+		
+		//call action
+		AmdaAction.resetPwd(reset,this.onSendFinish,this);
+	},
+    
+	
+	init : function(config)	
+	{
+		var myConf = {
+			layout: 'fit',
+			bodyStyle: { background: '#ddecfe'},
+			items : [{
+				xtype: 'fieldset',
+				itemId: 'resetpwd_fieldset',
+				layout: 'anchor',
+				anchor: '100%',
+				items : [
+					{
+						xtype: 'displayfield',
+						name: 'information',
+						height : 80,
+						fieldLabel: '',
+						anchor: '100%',
+						value: this.getInfoMsg()
+					},
+					{
+						xtype: 'textfield',
+						itemId: 'crtpwd_field',
+						anchor: '100%',
+						name: 'crtpwd',
+						fieldLabel: 'Current Password',
+						inputType: 'password',
+						allowBlank: false,
+						regex: /^[a-zA-Z0-9./]+$/,
+						regexText: 'Only alphanumeric, . and / characters allowed'
+					},
+					{
+						xtype: 'textfield',
+						itemId: 'newpwd_field',
+						anchor: '100%',
+						name: 'newpwd',
+						fieldLabel: 'New Password',
+						inputType: 'password',
+						allowBlank: false,
+						regex: /^[a-zA-Z0-9./]+$/,
+						regexText: 'Only alphanumeric, . and / characters allowed',
+						minLength: 4,
+						maxLength: 20
+					},
+					{
+						xtype: 'textfield',
+						itemId: 'newpwd2_field',
+						anchor: '100%',
+						name: 'newpwd2',
+						fieldLabel: 'Confirm New Password',
+						inputType: 'password',
+						allowBlank: false,
+						regex: /^[a-zA-Z0-9./]+$/,
+						regexText: 'Only alphanumeric, . and / characters allowed',
+						minLength: 4,
+						maxLength: 20
+					}
+				]
+			}],
+			dockedItems: [{
+				xtype: 'toolbar', 
+				dock: 'bottom',
+				items: [
+					'->',
+					{
+						iconCls: 'icon-resetpwd',
+						text: 'Reset',
+						scope: this,
+						tooltip: 'Reset password',
+						handler: this.onResetPwd
+					}					
+				]	          
+			}]
+		}
+		Ext.apply (this , Ext.apply (arguments, myConf));
+	}
+});
@@ -72,6 +72,8 @@
  
 .icon-user { background-image:url(../images/16x16/user.png) !important; }
  
+.icon-resetpwd { background-image:url(../images/16x16/reset_pwd.png) !important; }
+
 .icon-elements {
     background-image:url( ../images/16x16/view_tree.png ) !important;
 }
@@ -1431,6 +1431,14 @@ class AmdaAction
 		return $dd->getUserInfo();
 	}
  
+    public function resetPwd($obj)
+    {
+        $dd = new UserMgr();
+        $crt_pwd = $obj->crtpwd;
+        $new_pwd = $obj->newpwd;
+		return $dd->resetPwd($crt_pwd, $new_pwd);
+    }
+
 	// $obj ={"Object":"Earth","RunCount":"2",
 	// "SW_Density_value":"10","SW_Density_weight":"1","SW_Density_scale":"7","SW_Temperature_value":"100", ....}
 	public function getRun($obj)
@@ -248,6 +248,27 @@ class AmdaClient {
 		return $info;
 	}
  
+    public function resetUserPwd($login, $crt_pwd, $new_pwd) {
+        try {
+			$data_array = array(
+				"login" => $login,
+                "crtpwd" => $crt_pwd,
+                "newpwd" => $new_pwd,
+				"timestamp" => time(),
+			);
+			$data = $this->base64url_encode(json_encode($data_array));
+			$check = md5($data.DDSERVICE_PUBLICKEY.DDSERVICE_PRIVATEKEY);
+			$result = $this->client->resetUserPwd($data,DDSERVICE_PUBLICKEY,$check);
+		}
+		catch  (SoapFault $exception) {
+			return array('success' => false, 'message' => $exception->faultstring);
+		} 
+        if (!$result) {
+            return array('success' => false, 'message' => "Error during password modification");
+        }
+		return array('success' => true);
+    }
+
 	/* Create a new user */
 	public function createUser($login, $pwd, $first_name, $last_name, $email) {
 		$result = FALSE;
@@ -37,7 +37,7 @@ class UserMgr
 	function __construct($username = NULL, $password = NULL, $sessionID = NULL) 
 	{	 
       // if magic quotes is on, stripslashes
-		if(get_magic_quotes_gpc()) {
+		if(function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
 			$in = array(&$_GET, &$_POST, &$_COOKIE);
 			while(list($k,$v) = each($in)) {
 				foreach($v as $key => $val) {
@@ -129,6 +129,11 @@ class UserMgr
 		return $info;
 	}
  
+    public function resetPwd($crt_pwd, $new_pwd)
+    {
+        return $this->amdaClient->resetUserPwd($this->user, $crt_pwd, $new_pwd);
+    }
+
 	public function createDir() 
 	{ 
 		if (!mkdir($this->userdir, 0755, true)) return false;
@@ -215,7 +215,9 @@ $API = array(
 			'getDefaultValueConfigs' => array('len' => 0),
 			'setUserDefaultValues' => array('len' => 1),
 			// Parameters list 
-			'getParametersList' => array('len' => 0)
+			'getParametersList' => array('len' => 0),
+            // Reset user password
+            'resetPwd' => array('len' => 1),
  
 		)
 	)