Fixing registration - it is working now

Caio Almeida · Michel Felipe
1 parent b7edb563
Showing 7 changed files with 35 additions and 25 deletions Show diff stats
src/app/account/index.ts
src/app/account/register-component.html
src/app/account/register.component.ts
src/app/account/register.service.ts
src/app/login/session.service.ts
src/app/main/main.component.ts
src/lib/ng-noosfero-api/http/register.service.ts
@@ -0,0 +1 @@
+export * from "./register.component";
@@ -37,7 +37,7 @@
       <div class="col-md-6 register-field">
         <label for="password-confirmation">{{"account.register.passwordConfirmationLabel" | translate}}</label>
-        <input type="password" class="form-control" id="passwordConfirmation" placeholder="Password Confirmation" ng-model="ctrl.account.passwordConfirmation">
+        <input type="password" class="form-control" id="passwordConfirmation" placeholder="Password Confirmation" ng-model="ctrl.account.password_confirmation">
       </div>
       <div class="col-md-12">
@@ -45,7 +45,7 @@
       </div>
       <div class="col-md-12">
-        <button type="submit" class="btn btn-default" ng-click="ctrl.signup(ctrl.account)">{{"account.register.signupMessage" | translate}}</button>
+        <button type="submit" class="btn btn-default" ng-click="ctrl.signup()">{{"account.register.signupMessage" | translate}}</button>
       </div>
     </div>
-import { Inject, Input, Component, Output, EventEmitter } from 'ng-forward';
-import { RegisterService } from './register.service';
+import { Inject, Input, Component, Output, EventEmitter, provide } from 'ng-forward';
+import {RegisterService} from "./../../lib/ng-noosfero-api/http/register.service";
 @Component({
     selector: 'noosfero-register',
-    templateUrl: 'app/account/register-component.html'
+    templateUrl: 'app/account/register-component.html',
+    providers: [
+        provide('registerService', { useClass: RegisterService })
+    ]
 })
-@Inject(RegisterService)
+@Inject("$state", RegisterService)
 export class RegisterComponent {
-    constructor(private registerService: RegisterService) { }
+    @Input() account: any;
-    signup (account: any) {
-        if (account.password === account.passwordConfirmation) {
-            this.registerService.createAccount(account);
+    constructor(private $state: ng.ui.IStateService, public registerService: RegisterService) {
+      this.account = {};
+    }
+
+    signup() {
+        if (this.account.password === this.account.password_confirmation) {
+            this.registerService.createAccount(this.account);
         } else {
             alert("Wrong password confirmation.");
         }
@@ -1,13 +0,0 @@
-import { Injectable, Inject } from "ng-forward";
-import {RestangularService} from "../../lib/ng-noosfero-api/http/restangular_service";
-
-@Injectable()
-@Inject("Restangular")
-export class RegisterService {
-
-    constructor(private Restangular: restangular.IService) { }
-
-    createAccount(user: noosfero.User): ng.IPromise<noosfero.RestResult<noosfero.User>> {
-        return this.Restangular.customPOST({account: user}, "register", null);
-    }
-}
@@ -23,4 +23,4 @@ export class SessionService {
         return this.$localStorage.currentUser;
     };
-}
 \ No newline at end of file
+}
@@ -9,7 +9,6 @@ import {BoxesComponent} from &quot;../layout/boxes/boxes.component&quot;;
 import {BlockContentComponent} from "../layout/blocks/block-content.component";
 import {BlockComponent} from "../layout/blocks/block.component";
 import {EnvironmentComponent} from "../environment/environment.component";
-import {RegisterComponent} from "../account/register.component";
 import {EnvironmentHomeComponent} from "../environment/environment-home.component";
 import {PeopleBlockComponent} from "../layout/blocks/people/people-block.component";
 import {DisplayContentBlockComponent} from "../layout/blocks/display-content/display-content-block.component";
@@ -22,6 +21,7 @@ import {PersonTagsPluginInterestsBlockComponent} from &quot;../layout/blocks/person-t
 import {TagsBlockComponent} from "../layout/blocks/tags/tags-block.component";
 import {CustomContentComponent} from "../profile/custom-content/custom-content.component";
 import {RecentActivitiesPluginActivitiesBlockComponent} from "../layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component";
+import {RegisterComponent} from "../account/register.component";
 import {MembersBlockComponent} from "../layout/blocks/members/members-block.component";
 import {CommunitiesBlockComponent} from "../layout/blocks/communities/communities-block.component";
@@ -35,6 +35,7 @@ import {AuthService} from &quot;../login/auth.service&quot;;
 import {SessionService} from "../login/session.service";
 import {EnvironmentService} from "./../../lib/ng-noosfero-api/http/environment.service";
 import {NotificationService} from "../shared/services/notification.service";
+import {RegisterService} from "./../../lib/ng-noosfero-api/http/register.service";
 import {BodyStateClassesService} from "./../layout/services/body-state-classes.service";
@@ -0,0 +1,14 @@
+import { Injectable, Inject } from "ng-forward";
+import {RestangularService} from "./restangular_service";
+
+@Injectable()
+@Inject("Restangular")
+export class RegisterService {
+    constructor(private Restangular: restangular.IService) {
+        this.Restangular = Restangular;
+    }
+
+    createAccount(user: noosfero.User): ng.IPromise<noosfero.RestResult<noosfero.User>> {
+        return this.Restangular.all('').customPOST(user, "register", user);
+    }
+}
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+export * from "./register.component";
	@@ -37,7 +37,7 @@		@@ -37,7 +37,7 @@
37		37
38	<div class="col-md-6 register-field">	38	<div class="col-md-6 register-field">
39	<label for="password-confirmation">{{"account.register.passwordConfirmationLabel" \| translate}}</label>	39	<label for="password-confirmation">{{"account.register.passwordConfirmationLabel" \| translate}}</label>
40	- <input type="password" class="form-control" id="passwordConfirmation" placeholder="Password Confirmation" ng-model="ctrl.account.passwordConfirmation">	40	+ <input type="password" class="form-control" id="passwordConfirmation" placeholder="Password Confirmation" ng-model="ctrl.account.password_confirmation">
41	</div>	41	</div>
42		42
43	<div class="col-md-12">	43	<div class="col-md-12">
	@@ -45,7 +45,7 @@		@@ -45,7 +45,7 @@
45	</div>	45	</div>
46		46
47	<div class="col-md-12">	47	<div class="col-md-12">
48	- <button type="submit" class="btn btn-default" ng-click="ctrl.signup(ctrl.account)">{{"account.register.signupMessage" \| translate}}</button>	48	+ <button type="submit" class="btn btn-default" ng-click="ctrl.signup()">{{"account.register.signupMessage" \| translate}}</button>
49	</div>	49	</div>
50		50
51	</div>	51	</div>
	@@ -1,13 +0,0 @@	@@ -1,13 +0,0 @@
1	-import { Injectable, Inject } from "ng-forward";
2	-import {RestangularService} from "../../lib/ng-noosfero-api/http/restangular_service";
3	-
4	-@Injectable()
5	-@Inject("Restangular")
6	-export class RegisterService {
7	-
8	- constructor(private Restangular: restangular.IService) { }
9	-
10	- createAccount(user: noosfero.User): ng.IPromise<noosfero.RestResult<noosfero.User>> {
11	- return this.Restangular.customPOST({account: user}, "register", null);
12	- }
13	-}
	@@ -23,4 +23,4 @@ export class SessionService {		@@ -23,4 +23,4 @@ export class SessionService {
23	return this.$localStorage.currentUser;	23	return this.$localStorage.currentUser;
24	};	24	};
25		25
26	-}
27	\ No newline at end of file	26	\ No newline at end of file
		27	+}
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+import { Injectable, Inject } from "ng-forward";
	2	+import {RestangularService} from "./restangular_service";
	3	+
	4	+@Injectable()
	5	+@Inject("Restangular")
	6	+export class RegisterService {
	7	+ constructor(private Restangular: restangular.IService) {
	8	+ this.Restangular = Restangular;
	9	+ }
	10	+
	11	+ createAccount(user: noosfero.User): ng.IPromise<noosfero.RestResult<noosfero.User>> {
	12	+ return this.Restangular.all('').customPOST(user, "register", user);
	13	+ }
	14	+}