diff --git a/kdb-web/src/app/modules/auth/components/registration/registration.component.ts b/kdb-web/src/app/modules/auth/components/registration/registration.component.ts
index 328750c3..a2d458fc 100644
--- a/kdb-web/src/app/modules/auth/components/registration/registration.component.ts
+++ b/kdb-web/src/app/modules/auth/components/registration/registration.component.ts
@@ -34,14 +34,6 @@ export class RegistrationComponent implements OnInit {
password: false
};
- showEMailConfirmation = false;
- showEMailConfirmationError = false;
-
- code!: string;
- state!: string;
- user!: AuthUserDTO;
- oAuthId!: string;
-
constructor(
private authService: AuthService,
private formBuilder: FormBuilder,
@@ -62,48 +54,7 @@ export class RegistrationComponent implements OnInit {
this.confirmEMail();
this.initData();
this.spinnerService.showSpinner();
- this.route.queryParams.pipe(catchError(err => {
- this.spinnerService.hideSpinner();
- this.router.navigate(["auth", "login"]).then(() => {
- });
- return throwError(() => err);
- })).subscribe(params => {
- if (!params["code"] || !params["state"]) {
- this.spinnerService.hideSpinner();
- return;
- }
-
- if (this.user) {
- this.spinnerService.hideSpinner();
- return;
- }
-
- this.code = params["code"];
- this.state = params["state"];
- this.authService.discordCreateUser(this.code, this.state).pipe(catchError(err => {
- this.spinnerService.hideSpinner();
- this.router.navigate(["auth", "login"]).then(() => {
- });
- return throwError(() => err);
- })).subscribe(oAuthDTO => {
- if (oAuthDTO) {
- this.user = oAuthDTO.user;
- this.oAuthId = oAuthDTO.oAuthId;
- }
- if (this.user && !this.oAuthId) {
- this.router.navigate(["auth", "login"]).then(() => {
- });
- return;
- }
-
- this.router.navigate(["auth", "register"]).then(() => {
- });
- this.initData();
- }
- );
- this.initData();
- }
- );
+ this.initData();
}
initData() {
@@ -126,18 +77,13 @@ export class RegistrationComponent implements OnInit {
initLoginForm(): void {
this.loginForm = this.formBuilder.group({
- firstName: [this.user ? this.user.firstName : "", Validators.required],
- lastName: [this.user ? this.user.lastName : "", Validators.required],
- email: [this.user ? this.user.email : "", [Validators.required, Validators.email]],
- emailRepeat: [this.user ? this.user.email : "", [Validators.required, Validators.email]],
- password: [this.user ? this.user.password : "", [Validators.required, Validators.minLength(8)]],
- passwordRepeat: [this.user ? this.user.password : "", [Validators.required, Validators.minLength(8)]]
+ firstName: ["", Validators.required],
+ lastName: ["", Validators.required],
+ email: ["", [Validators.required, Validators.email]],
+ emailRepeat: ["", [Validators.required, Validators.email]],
+ password: ["", [Validators.required, Validators.minLength(8)]],
+ passwordRepeat: ["", [Validators.required, Validators.minLength(8)]]
});
-
- if (this.user) {
- this.loginForm.controls.email.disable();
- this.loginForm.controls.emailRepeat.disable();
- }
}
register(): void {
@@ -160,42 +106,10 @@ export class RegistrationComponent implements OnInit {
}
this.spinnerService.showSpinner();
- if (this.user && this.oAuthId) {
- this.registerWithOAuth();
- return;
- }
this.registerLocal();
}
- private registerWithOAuth() {
- const oAuthDTO: OAuthDTO = {
- user: {
- firstName: this.loginForm.value.firstName ?? this.user.firstName,
- lastName: this.loginForm.value.lastName ?? this.user.lastName,
- email: this.loginForm.value.email ?? this.user.email,
- password: this.loginForm.value.password ?? null
- },
- oAuthId: this.oAuthId
- };
- this.authService.discordRegister(oAuthDTO)
- .pipe(catchError(error => {
- if (error.error !== null) {
- const err: ErrorDTO = error.error;
-
- if (err.errorCode === ServiceErrorCode.InvalidUser && err.message === AuthErrorMessages.UserAlreadyExists) {
- this.authUserAtrErrors.email.wrongData = true;
- }
- }
- this.spinnerService.hideSpinner();
- throw error;
- }))
- .subscribe(resp => {
- this.spinnerService.hideSpinner();
- this.router.navigate(["/auth/login"]);
- });
- }
-
private registerLocal() {
const user: AuthUserDTO = {
firstName: this.loginForm.value.firstName ?? null,
@@ -237,10 +151,4 @@ export class RegistrationComponent implements OnInit {
});
}
}
-
- discordLogin() {
- this.authService.getDiscordAuthURL().subscribe(url => {
- window.location.href = url.loginUrl;
- });
- }
}
diff --git a/kdb-web/src/app/services/auth/auth.service.ts b/kdb-web/src/app/services/auth/auth.service.ts
index b8434f50..a1174ea5 100644
--- a/kdb-web/src/app/services/auth/auth.service.ts
+++ b/kdb-web/src/app/services/auth/auth.service.ts
@@ -167,6 +167,7 @@ export class AuthService {
})
});
}
+
discordCreateUser(code: string, state: string) {
return this.http.get(`${this.appsettings.getApiURL()}/api/auth/discord/create-user?code=${code}&state=${state}`, {
headers: new HttpHeaders({
@@ -175,6 +176,14 @@ export class AuthService {
});
}
+ discordLogin(code: string, state: string): Observable {
+ return this.http.get(`${this.appsettings.getApiURL()}/api/auth/discord/login?code=${code}&state=${state}`, {
+ headers: new HttpHeaders({
+ 'Content-Type': 'application/json'
+ })
+ });
+ }
+
// /api/auth/discord/register?code=
discordRegister(oAuthDTO: OAuthDTO) {
return this.http.post(`${this.appsettings.getApiURL()}/api/auth/discord/register`, oAuthDTO, {
diff --git a/kdb-web/src/assets/config.json b/kdb-web/src/assets/config.json
index c4b8e593..6ccafd1c 100644
--- a/kdb-web/src/assets/config.json
+++ b/kdb-web/src/assets/config.json
@@ -3,7 +3,7 @@
"WebVersion": {
"Major": "0",
"Minor": "3",
- "Micro": "dev70"
+ "Micro": "dev128"
},
"Themes": [
{
diff --git a/kdb-web/src/assets/i18n/de.json b/kdb-web/src/assets/i18n/de.json
index 4593ae8f..14025cf5 100644
--- a/kdb-web/src/assets/i18n/de.json
+++ b/kdb-web/src/assets/i18n/de.json
@@ -93,6 +93,7 @@
"e_mail": "E-Mail",
"password": "Passwort",
"login": "Einloggen",
+ "login_with_discord": "Mit Discord Einloggen",
"register": "Registrieren",
"forgot_password": "Passwort vergessen?",
"e_mail_required": "E-Mail benötigt",
diff --git a/kdb-web/src/styles.scss b/kdb-web/src/styles.scss
index 8407ecb4..9d6c4649 100644
--- a/kdb-web/src/styles.scss
+++ b/kdb-web/src/styles.scss
@@ -373,7 +373,7 @@ footer {
.login-form-wrapper,
.auth-header {
width: 350px;
- height: 350px;
+ height: 450px;
display: flex;
justify-content: center;