dev suite

sauvegarde

Author: Clement-Roque

Diff for: Zenergy/Zenergy/Scripts/Controllers/registerPageController.js

@@ -1,20 +1,20 @@
-zenergyApp.controller("registerPageController", ["$scope", "$http", "$httpParamSerializerJQLike", "tokenService", "$window", function ($scope, $http, $httpParamSerializerJQLike, tokenService, $window) {
-
-    $scope.user = { mail: '', password: '', passwordBis: '', firstName :'', lastName:'', adr1:'', adr2:'', pc:'', town:'', phone:''};
+zenergyApp.controller("registerPageController",["$scope","$http", function($scope, $http){
+  
+    $scope.user = {mail: '', password: '', passwordBis: '',  lastName:'', firstName:'', adr1:'', adr2:'', pc:'', town:'', phone:''};
     $scope.hasError = false;
-    $scope.signIn = function () {
+    $scope.register = function () {
         var response = $http({
             url: 'api/Account/register',
             method: 'POST',
-            data: $httpParamSerializerJQLike({ grant_type: 'password', username: $scope.user.mail, password: $scope.user.password }),
-            //data: $httpParamSerializerJQLike({ grant_type: 'password', username: $scope.user.mail, password: CryptoJS.MD5($scope.user.password).toString() }),
+            data: $httpParamSerializerJQLike({ userId: 1, password: CryptoJS.MD5($scope.user.password).toString(), lastName: $scope.user.lastName, firstName: $scope.user.firstName, adr1: $scope.user.adr1, adr2: $scope.user.adr2, pc: $scope.user.pc, town: $scope.user.town, mail: $scope.user.mail, phone: $scope.user.phone }),
+            // password: CryptoJS.MD5($scope.user.password).toString() }),
             headers: {
-                'Content-Type': 'application/x-www-form-urlencoded'
+                'Content-Type': 'application/json'
             }
         }).then(function successCallback(response) {
             $scope.hasError = false;
             tokenService.saveToken(response.data.access_token, response.data.userName);
-            window.location.replace("/Home");
+            window.location.replace("/Login");
         }, function errorCallback(response) {
             $scope.hasError = true;
             tokenService.deleteToken();

Diff for: Zenergy/Zenergy/Views/Register/index.cshtml

@@ -7,19 +7,19 @@
 <div class="container " ng-controller="loginPageController">
     <div class="row">
         <div class="col-md-3 col-lg-offset-4">
-            <h1>Sign in</h1>
-            <form ng-submit="signIn()">
+            <h1>Register</h1>
+            <form ng-submit="register()">
 
                 <div class="form-group" ng-class="{ 'has-error': hasError}">
-                    <input type="email" class="form-control" ng-model="user.mail" placeholder="Email">
+                    <input type="email" class="form-control" ng-model="user.mail" placeholder="Email" required>
                 </div>
 
                 <div class="form-group" ng-class="{ 'has-error': hasError}">
-                    <input type="password" class="form-control" ng-model="user.password" placeholder="Password">
+                    <input type="password" class="form-control" ng-model="user.password" placeholder="Password" required>
                 </div>
 
                 <div class="form-group" ng-class="{ 'has-error': hasError}">
-                    <input type="password" class="form-control" ng-model="user.passwordBis" placeholder="Password Confirmation">
+                    <input type="password" class="form-control" ng-model="user.passwordBis" placeholder="Password Confirmation" required>
                 </div>
 
                 <div class="form-group">
@@ -51,6 +51,7 @@
                 </div>
 
                 <p class="text-danger" ng-if="hasError">Invalid email or password</p>
+
                 <input type="submit" id="submit" value="Sign in" class="btn btn-primary" />
             </form>
         </div>

Diff for: Zenergy/Zenergy/Web.config

@@ -10,8 +10,12 @@
   </configSections>
   <connectionStrings>
     <add name="DefaultConnection" connectionString="Data Source=(LocalDb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\aspnet-Zenergy-20151109023115.mdf;Initial Catalog=aspnet-Zenergy-20151109023115;Integrated Security=True" providerName="System.Data.SqlClient" />
-    <add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergy;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-    <!--<add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergyTest;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />-->
+   <!-- prod--> 
+    <!-- <add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergy;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" /> -->
+  
+  <!-- test--> 
+  <add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergyTest;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+ 
   </connectionStrings>
   <appSettings></appSettings>
   <system.web>