Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge

ng6-seed/package-lock.json

@@ -1826,26 +1826,26 @@
       }
     },
     "aws-sdk": {
-      "version": "2.319.0",
+      "version": "2.555.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.319.0.tgz",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.555.0.tgz",
-      "integrity": "sha512-Ez8rs036lMoKJxHast6W3m07o1Wzg5h3RffsAoOwRwVmuNXW3xtnPR6XW3+/HaG7vSIk55tZjHo1PECaOY3aeg==",
+      "integrity": "sha512-2zn2B3f7Gtv5q3DnR2vJBj9VQgqgu5s4u5x92yWsr3Sxoljp8L/j0SPdMa5YECMHNpCKEguSGIn8d0CxutGOnA==",
       "dev": true,
       "requires": {
         "buffer": "4.9.1",
         "events": "1.1.1",
-        "ieee754": "1.1.8",
+        "ieee754": "1.1.13",
         "jmespath": "0.15.0",
         "querystring": "0.2.0",
         "sax": "1.2.1",
         "url": "0.10.3",
-        "uuid": "3.1.0",
+        "uuid": "3.3.2",
         "xml2js": "0.4.19"
       },
       "dependencies": {
         "ieee754": {
-          "version": "1.1.8",
+          "version": "1.1.13",
-          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+          "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-          "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+          "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
           "dev": true
         },
         "punycode": {
@@ -1856,7 +1856,7 @@
         },
         "sax": {
           "version": "1.2.1",
-          "resolved": "http://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
           "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=",
           "dev": true
         },
@@ -1869,12 +1869,6 @@
             "punycode": "1.3.2",
             "querystring": "0.2.0"
           }
-        },
-        "uuid": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-          "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-          "dev": true
         }
       }
     },

ng6-seed/package.json

@@ -90,7 +90,7 @@
     "@types/jasmine": "2.5.52",
     "@types/jquery": "3.2.0",
     "@types/node": "^8.10.29",
-    "aws-sdk": "^2.300.0",
+    "aws-sdk": "^2.555.0",
     "codelyzer": "~4.1.0",
     "jasmine-core": "2.6.3",
     "jasmine-spec-reporter": "4.1.0",

ng6-seed/src/app/AwsService/aws.service.ts

@@ -770,4 +770,23 @@ adminlistgroup(enitiy){
   
 }
 
+adminSetpassword(awsuser){
+  this.getconfig();
+  var params = {
+    Password: 'temp1234', /* required */
+    UserPoolId: se_poolData.UserPoolId, /* required */
+    Username: awsuser, /* required */
+    Permanent: false
+  };
+  return Observable.create(observe=>{
+  let cognitoidentityserviceprovider = new AWS.CognitoIdentityServiceProvider();
+  cognitoidentityserviceprovider.adminSetUserPassword(params, function(err, data) {
+    if (err) console.log(err, err.stack); // an error occurred
+    else {observe.next('success');   console.log(data);}           // successful response
+  });
+});
+
+}
+
+
 }

ng6-seed/src/app/settings/users/register/register.component.html

@@ -44,6 +44,7 @@
                                   <mat-slide-toggle color="primary" [formControl]="regForm.controls['isactive']">
                                                 Isactive
                                             </mat-slide-toggle>
+                                            <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon ml-1" matTooltip="Password Reset" matTooltipPosition="above" type="button" (click)="resetAdminPassword()"><mat-icon>settings_backup_restore</mat-icon></button>
                                  </div>
                             </mat-card-content>
                         </mat-card>

ng6-seed/src/app/settings/users/register/register.component.ts

@@ -478,5 +478,20 @@ callrole(flag,type,usersData){
       event.preventDefault();
     }
   }
+
+
+
+  resetAdminPassword(user){ 
+    
+    this.AWS.adminSetpassword(this.users.localUserId.aws_name).subscribe(res=>{
+
+      if(res == 'success'){
+        // this.notifier.notify('success','Please Fill all the Fields')
+        Swal('Successfully Reset');
+      }
+      console.log('999',res);
+       
+    })
+  }
 }