Added logic to register by discord #70

kdb-bot/src/bot_api/abc/auth_service_abc.py

@@ -7,6 +7,7 @@ from bot_api.filter.auth_user_select_criteria import AuthUserSelectCriteria
 from bot_api.model.auth_user_dto import AuthUserDTO
 from bot_api.model.auth_user_filtered_result_dto import AuthUserFilteredResultDTO
 from bot_api.model.email_string_dto import EMailStringDTO
+from bot_api.model.o_auth_dto import OAuthDTO
 from bot_api.model.reset_password_dto import ResetPasswordDTO
 from bot_api.model.token_dto import TokenDTO
 from bot_api.model.update_auth_user_dto import UpdateAuthUserDTO
@@ -37,7 +38,7 @@ class AuthServiceABC(ABC):
     async def get_filtered_auth_users_async(self, criteria: AuthUserSelectCriteria) -> AuthUserFilteredResultDTO: pass
 
     @abstractmethod
-    async def get_auth_user_by_email_async(self, email: str) -> AuthUserDTO: pass
+    async def get_auth_user_by_email_async(self, email: str, with_password: bool = False) -> AuthUserDTO: pass
 
     @abstractmethod
     async def find_auth_user_by_email_async(self, email: str) -> AuthUserDTO: pass
@@ -46,7 +47,10 @@ class AuthServiceABC(ABC):
     async def add_auth_user_async(self, user_dto: AuthUserDTO): pass
 
     @abstractmethod
-    async def add_auth_user_by_discord_async(self, user_dto: AuthUserDTO): pass
+    async def add_auth_user_by_oauth_async(self, dto: OAuthDTO): pass
+
+    @abstractmethod
+    async def add_auth_user_by_discord_async(self, user_dto: AuthUserDTO) -> OAuthDTO: pass
 
     @abstractmethod
     async def update_user_async(self, update_user_dto: UpdateAuthUserDTO): pass

kdb-bot/src/bot_api/config/apisettings.edrafts-lapi.json

@@ -13,7 +13,8 @@
   },
   "DiscordAuthentication": {
     "ClientSecret": "V3FTb3JYVFBiVktEeHZxdWJDWW4xcnBCbXRwdmpwcy0=",
-    "RedirectURL": "http://localhost:5000/api/auth/discord/register",
+    "_RedirectURL": "http://localhost:5000/api/auth/discord/register",
+    "RedirectURL": "http://localhost:4200/auth/register",
     "Scope": [
       "identify",
       "email"

kdb-bot/src/bot_api/controller/auth_discord_controller.py

@@ -7,15 +7,17 @@ from cpl_core.mailing import EMailClientABC, EMailClientSettings
 from cpl_core.utils import CredentialManager
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
-from flask import jsonify
+from flask import jsonify, Response
 from flask import request, session
 from requests_oauthlib import OAuth2Session
 
 from bot_api.abc.auth_service_abc import AuthServiceABC
 from bot_api.api import Api
 from bot_api.configuration.discord_authentication_settings import DiscordAuthenticationSettings
+from bot_api.json_processor import JSONProcessor
 from bot_api.logging.api_logger import ApiLogger
 from bot_api.model.auth_user_dto import AuthUserDTO
+from bot_api.model.o_auth_dto import OAuthDTO
 from bot_api.route.route import Route
 from bot_data.model.auth_role_enum import AuthRoleEnum
 
@@ -50,27 +52,26 @@ class AuthDiscordController:
         self._mailer = mailer
         self._auth_service = auth_service
 
-    @Route.get(f'{BasePath}/get-url')
+    def _get_user_from_discord_response(self) -> dict:
-    async def get_url(self):
+        discord = OAuth2Session(self._bot.user.id, redirect_uri=self._auth_settings.redirect_url, state=request.args.get('state'), scope=self._auth_settings.scope)
-        oauth = OAuth2Session(self._bot.user.id, redirect_uri=self._auth_settings.redirect_url, scope=self._auth_settings.scope)
-        login_url, state = oauth.authorization_url(self._auth_settings.auth_url)
-        session['state'] = state
-        # return jsonify({'loginURL': login_url})
-        return '<a href="' + login_url + '">Login with Discord</a>'
-
-    @Route.get(f'{BasePath}/register')
-    async def discord_register(self):
-        discord = OAuth2Session(self._bot.user.id, redirect_uri=self._auth_settings.redirect_url, state=session['state'], scope=self._auth_settings.scope)
         token = discord.fetch_token(
             self._auth_settings.token_url,
             client_secret=CredentialManager.decrypt(self._auth_settings.client_secret),
             authorization_response=request.url,
         )
-        session['discord_token'] = token
         discord = OAuth2Session(self._bot.user.id, token=token)
-        response = discord.get('https://discordapp.com/api' + '/users/@me').json()
+        return discord.get('https://discordapp.com/api' + '/users/@me').json()
 
-        await self._auth_service.add_auth_user_by_discord_async(AuthUserDTO(
+    @Route.get(f'{BasePath}/get-url')
+    async def get_url(self):
+        oauth = OAuth2Session(self._bot.user.id, redirect_uri=self._auth_settings.redirect_url, scope=self._auth_settings.scope)
+        login_url, state = oauth.authorization_url(self._auth_settings.auth_url)
+        return jsonify({'loginUrl': login_url})
+
+    @Route.get(f'{BasePath}/create-user')
+    async def discord_create_user(self) -> Response:
+        response = self._get_user_from_discord_response()
+        result = await self._auth_service.add_auth_user_by_discord_async(AuthUserDTO(
             0,
             response['username'],
             response['discriminator'],
@@ -80,4 +81,10 @@ class AuthDiscordController:
             AuthRoleEnum.normal,
             response['id']
         ))
+        return jsonify(result.to_dict())
+
+    @Route.post(f'{BasePath}/register')
+    async def discord_register(self):
+        dto: OAuthDTO = JSONProcessor.process(OAuthDTO, request.get_json(force=True, silent=True))
+        await self._auth_service.add_auth_user_by_oauth_async(dto)
         return '', 200

kdb-bot/src/bot_api/model/auth_user_dto.py

@@ -8,14 +8,14 @@ class AuthUserDTO(DtoABC):
 
     def __init__(
             self,
-            id: int,
+            id: int = None,
-            first_name: str,
+            first_name: str = None,
-            last_name: str,
+            last_name: str = None,
-            email: str,
+            email: str = None,
-            password: str,
+            password: str = None,
-            confirmation_id: Optional[str],
+            confirmation_id: Optional[str] = None,
-            auth_role: AuthRoleEnum,
+            auth_role: AuthRoleEnum = None,
-            user_id: Optional[int],
+            user_id: Optional[int] = None,
     ):
         DtoABC.__init__(self)
 

kdb-bot/src/bot_api/model/o_auth_dto.py

@@ -0,0 +1,44 @@
+from typing import Optional
+
+from bot_api.abc.dto_abc import DtoABC
+from bot_api.model.auth_user_dto import AuthUserDTO
+from bot_data.model.auth_role_enum import AuthRoleEnum
+
+
+class OAuthDTO(DtoABC):
+
+    def __init__(
+            self,
+            user: AuthUserDTO,
+            o_auth_id: Optional[str],
+    ):
+        DtoABC.__init__(self)
+
+        self._user = user
+        self._oauth_id = o_auth_id
+
+    @property
+    def user(self) -> AuthUserDTO:
+        return self._user
+
+    @user.setter
+    def user(self, value: AuthUserDTO):
+        self._user = value
+
+    @property
+    def oauth_id(self) -> Optional[str]:
+        return self._oauth_id
+
+    @oauth_id.setter
+    def oauth_id(self, value: Optional[str]):
+        self._oauth_id = value
+
+    def from_dict(self, values: dict):
+        self._user = AuthUserDTO().from_dict(values['user'])
+        self._oauth_id = values['oAuthId']
+
+    def to_dict(self) -> dict:
+        return {
+            'user': self._user.to_dict(),
+            'oAuthId': self._oauth_id
+        }

kdb-bot/src/bot_api/service/auth_service.py

@@ -25,6 +25,7 @@ from bot_api.mail.mail_thread import MailThread
 from bot_api.model.auth_user_dto import AuthUserDTO
 from bot_api.model.auth_user_filtered_result_dto import AuthUserFilteredResultDTO
 from bot_api.model.email_string_dto import EMailStringDTO
+from bot_api.model.o_auth_dto import OAuthDTO
 from bot_api.model.reset_password_dto import ResetPasswordDTO
 from bot_api.model.token_dto import TokenDTO
 from bot_api.model.update_auth_user_dto import UpdateAuthUserDTO
@@ -190,9 +191,10 @@ class AuthService(AuthServiceABC):
             users.total_count
         )
 
-    async def get_auth_user_by_email_async(self, email: str) -> AuthUserDTO:
+    async def get_auth_user_by_email_async(self, email: str, with_password: bool = False) -> AuthUserDTO:
         try:
-            return AUT.to_dto(self._auth_users.get_auth_user_by_email(email))
+            user = self._auth_users.get_auth_user_by_email(email)
+            return AUT.to_dto(user, password=user.password if with_password else None)
         except Exception as e:
             self._logger.error(__name__, f'AuthUser not found', e)
             raise ServiceException(ServiceErrorCode.InvalidData, f'User not found {email}')
@@ -225,24 +227,54 @@ class AuthService(AuthServiceABC):
             self._logger.error(__name__, f'Cannot add user with E-Mal {user_dto.email}', e)
             raise ServiceException(ServiceErrorCode.UnableToAdd, "Invalid E-Mail")
 
-    async def add_auth_user_by_discord_async(self, user_dto: AuthUserDTO):
+    async def add_auth_user_by_oauth_async(self, dto: OAuthDTO):
+        db_user = self._auth_users.find_auth_user_by_email(dto.user.email)
+
+        if db_user is None:
+            raise ServiceException(ServiceErrorCode.InvalidUser, 'User not found')
+
+        if db_user.oauth_id != dto.oauth_id:
+            raise ServiceException(ServiceErrorCode.InvalidUser, 'Wrong OAuthId')
+
+        db_user.first_name = dto.user.first_name
+        db_user.last_name = dto.user.last_name
+        db_user.password_salt = uuid.uuid4()
+        db_user.password = self._hash_sha256(dto.user.password, db_user.password_salt)
+        db_user.oauth_id = None
+        self._auth_users.update_auth_user(db_user)
+        self._db.save_changes()
+
+    async def add_auth_user_by_discord_async(self, user_dto: AuthUserDTO) -> OAuthDTO:
         db_user = self._auth_users.find_auth_user_by_email(user_dto.email)
         # user exists
         if db_user is not None and db_user.user_id is not None:
-            raise ServiceException(ServiceErrorCode.InvalidUser, 'User already exists')
+            # raise ServiceException(ServiceErrorCode.InvalidUser, 'User already exists')
+            self._logger.debug(__name__, f'Discord user already exists')
+            return OAuthDTO(AUT.to_dto(db_user), None)
 
         # user exists but discord user id not set
         elif db_user is not None and db_user.user_id is None:
+            self._logger.debug(__name__, f'Auth user exists but not linked with discord')
             user = self._users.get_users_by_discord_id(user_dto.user_id).single()
             db_user.user_id = user.user_id
-            self._auth_users.update_auth_user(db_user)
+            db_user.oauth_id = None
-            self._db.save_changes()
-            return AUT.to_dto(db_user)
 
+        else:
             # user does not exists
+            self._logger.debug(__name__, f'Auth user does not exist')
+            try:
+                user_dto.user_id = self._users.get_users_by_discord_id(user_dto.user_id).single().user_id
+            except Exception as e:
+                self._logger.error(__name__, f'User not found')
+                user_dto.user_id = None
+
             await self.add_auth_user_async(user_dto)
             db_user = self._auth_users.get_auth_user_by_email(user_dto.email)
-        return AUT.to_dto(db_user, password=db_user.password)
+            db_user.oauth_id = uuid.uuid4()
+
+        self._auth_users.update_auth_user(db_user)
+        self._db.save_changes()
+        return OAuthDTO(AUT.to_dto(db_user), db_user.oauth_id)
 
     async def update_user_async(self, update_user_dto: UpdateAuthUserDTO):
         if update_user_dto is None:

kdb-bot/src/bot_api/transformer/auth_user_transformer.py

@@ -19,6 +19,7 @@ class AuthUserTransformer(TransformerABC):
             None,
             None,
             None,
+            None,
             datetime.now(tz=timezone.utc),
             AuthRoleEnum.normal if dto.auth_role is None else AuthRoleEnum(dto.auth_role),
             dto.user_id,

kdb-bot/src/bot_data/migration/api_migration.py

@@ -27,6 +27,7 @@ class ApiMigration(MigrationABC):
               `RefreshToken` VARCHAR(255),
               `ConfirmationId` VARCHAR(255) DEFAULT NULL,
               `ForgotPasswordId` VARCHAR(255) DEFAULT NULL,
+              `OAuthId` VARCHAR(255) DEFAULT NULL,
               `RefreshTokenExpiryTime` DATETIME(6) NOT NULL,
               `AuthRole` INT NOT NULL DEFAULT '0',
               `UserId` BIGINT DEFAULT NULL,

kdb-bot/src/bot_data/model/auth_user.py

@@ -19,6 +19,7 @@ class AuthUser(TableABC):
             refresh_token: Optional[str],
             confirmation_id: Optional[str],
             forgot_password_id: Optional[str],
+            oauth_id: Optional[str],
             refresh_token_expire_time: datetime,
             auth_role: AuthRoleEnum,
             user_id: Optional[int],
@@ -34,6 +35,7 @@ class AuthUser(TableABC):
         self._password_salt = uuid.uuid4() if password_salt is None else password_salt
         self._refresh_token = refresh_token
         self._confirmation_id = confirmation_id
+        self._oauth_id = oauth_id
         self._forgot_password_id = forgot_password_id
         self._refresh_token_expire_time = refresh_token_expire_time
 
@@ -112,6 +114,14 @@ class AuthUser(TableABC):
     def forgot_password_id(self, value: Optional[str]):
         self._forgot_password_id = value
 
+    @property
+    def oauth_id(self) -> Optional[str]:
+        return self._oauth_id
+
+    @oauth_id.setter
+    def oauth_id(self, value: Optional[str]):
+        self._oauth_id = value
+
     @property
     def refresh_token_expire_time(self) -> datetime:
         return self._refresh_token_expire_time
@@ -183,6 +193,7 @@ class AuthUser(TableABC):
                 `RefreshToken`,
                 `ConfirmationId`,
                 `ForgotPasswordId`,
+                `OAuthId`,
                 `RefreshTokenExpiryTime`,
                 `AuthRole`,
                 `UserId`,
@@ -198,6 +209,7 @@ class AuthUser(TableABC):
                     '{"NULL" if self._refresh_token is None else self._refresh_token}',
                     '{"NULL" if self._confirmation_id is None else self._confirmation_id}',
                     '{"NULL" if self._forgot_password_id is None else self._forgot_password_id}',
+                    '{"NULL" if self._oauth_id is None else self._oauth_id}',
                     '{self._refresh_token_expire_time}',
                     {self._auth_role_id.value},
                     {"NULL" if self._user_id is None else self._user_id},
@@ -218,6 +230,7 @@ class AuthUser(TableABC):
             `RefreshToken` = '{self._refresh_token}', 
             `ConfirmationId` = '{"NULL" if self._confirmation_id is None else self._confirmation_id}', 
             `ForgotPasswordId` = '{"NULL" if self._forgot_password_id is None else self._forgot_password_id}',
+            `OAuthId` = '{"NULL" if self._oauth_id is None else self._oauth_id}',
             `RefreshTokenExpiryTime` = '{self._refresh_token_expire_time}',
             `AuthRole` = {self._auth_role_id.value},
             `UserId` = {"NULL" if self._user_id is None else self._user_id},

kdb-bot/src/bot_data/service/auth_user_repository_service.py

@@ -37,8 +37,9 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
             self._get_value_from_result(result[7]),
             self._get_value_from_result(result[8]),
             self._get_value_from_result(result[9]),
-            AuthRoleEnum(self._get_value_from_result(result[10])),
+            self._get_value_from_result(result[10]),
-            self._get_value_from_result(result[11]),
+            AuthRoleEnum(self._get_value_from_result(result[11])),
+            self._get_value_from_result(result[12]),
             id=self._get_value_from_result(result[0])
         )
 

kdb-web/src/app/models/auth/discord-auth-url.dto.ts

@@ -0,0 +1,3 @@
+export interface DiscordAuthURL {
+  loginUrl: string;
+}

kdb-web/src/app/models/auth/oauth.dto.ts

@@ -0,0 +1,6 @@
+import { AuthUserDTO } from "./auth-user.dto";
+
+export interface OAuthDTO {
+  user: AuthUserDTO;
+    oAuthId: string;
+}

kdb-web/src/app/modules/auth/components/registration/registration.component.html

@@ -72,6 +72,12 @@
                   [disabled]="loginForm.invalid"></button>
         </div>
 
+        <div class="login-form-sub-button-wrapper" *ngIf="!code && !state">
+          <div class="login-form-sub-btn-wrapper">
+            <button pButton label="{{'auth.register.register_with_discord' | translate}}" class="btn login-form-sub-btn" (click)="discordLogin()"></button>
+          </div>
+        </div>
+
         <div class="login-form-sub-button-wrapper">
           <div class="login-form-sub-btn-wrapper">
             <button pButton label="{{'auth.register.login' | translate}}" class="btn login-form-sub-btn" (click)="login()"></button>

kdb-web/src/app/modules/auth/components/registration/registration.component.ts

@@ -1,19 +1,21 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms";
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, Router } from "@angular/router";
-import { catchError } from 'rxjs/operators';
+import { catchError, finalize } from "rxjs/operators";
-import { AuthErrorMessages } from 'src/app/models/auth/auth-error-messages.enum';
+import { AuthErrorMessages } from "src/app/models/auth/auth-error-messages.enum";
-import { AuthUserDTO } from 'src/app/models/auth/auth-user.dto';
+import { AuthUserDTO } from "src/app/models/auth/auth-user.dto";
-import { AuthUserAtrErrors } from 'src/app/models/auth/auth-user-atr-errors';
+import { AuthUserAtrErrors } from "src/app/models/auth/auth-user-atr-errors";
-import { ErrorDTO } from 'src/app/models/error/error-dto';
+import { ErrorDTO } from "src/app/models/error/error-dto";
-import { ServiceErrorCode } from 'src/app/models/error/service-error-code.enum';
+import { ServiceErrorCode } from "src/app/models/error/service-error-code.enum";
-import { AuthService } from 'src/app/services/auth/auth.service';
+import { AuthService } from "src/app/services/auth/auth.service";
-import { SpinnerService } from 'src/app/services/spinner/spinner.service';
+import { SpinnerService } from "src/app/services/spinner/spinner.service";
+import { throwError } from "rxjs";
+import { OAuthDTO } from "../../../../models/auth/oauth.dto";
 
 @Component({
-  selector: 'app-registration',
+  selector: "app-registration",
-  templateUrl: './registration.component.html',
+  templateUrl: "./registration.component.html",
-  styleUrls: ['./registration.component.scss']
+  styleUrls: ["./registration.component.scss"]
 })
 export class RegistrationComponent implements OnInit {
 
@@ -35,6 +37,11 @@ export class RegistrationComponent implements OnInit {
   showEMailConfirmation = false;
   showEMailConfirmationError = false;
 
+  code!: string;
+  state!: string;
+  user!: AuthUserDTO;
+  oAuthId!: string;
+
   constructor(
     private authService: AuthService,
     private formBuilder: FormBuilder,
@@ -45,16 +52,64 @@ export class RegistrationComponent implements OnInit {
     this.spinnerService.showSpinner();
     this.authService.isUserLoggedInAsync().then(res => {
       if (res) {
-        this.router.navigate(['/dashboard']);
+        this.router.navigate(["/dashboard"]);
       }
       this.spinnerService.hideSpinner();
     });
   }
 
   ngOnInit(): void {
+    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();
+      }
+    );
+  }
+
+  initData() {
     this.initLoginForm();
     this.resetStateFlags();
     this.confirmEMail();
+    this.spinnerService.hideSpinner();
   }
 
   resetStateFlags(): void {
@@ -66,18 +121,23 @@ export class RegistrationComponent implements OnInit {
   }
 
   login(): void {
-    this.router.navigate(['/auth/login']);
+    this.router.navigate(["/auth/login"]);
   }
 
   initLoginForm(): void {
     this.loginForm = this.formBuilder.group({
-      firstName: ['', Validators.required],
+      firstName: [this.user ? this.user.firstName : "", Validators.required],
-      lastName: ['', Validators.required],
+      lastName: [this.user ? this.user.lastName : "", Validators.required],
-      email: ['', [Validators.required, Validators.email]],
+      email: [this.user ? this.user.email : "", [Validators.required, Validators.email]],
-      emailRepeat: ['', [Validators.required, Validators.email]],
+      emailRepeat: [this.user ? this.user.email : "", [Validators.required, Validators.email]],
-      password: ['', [Validators.required, Validators.minLength(8)]],
+      password: [this.user ? this.user.password : "", [Validators.required, Validators.minLength(8)]],
-      passwordRepeat: ['', [Validators.required, Validators.minLength(8)]]
+      passwordRepeat: [this.user ? this.user.password : "", [Validators.required, Validators.minLength(8)]]
     });
+
+    if (this.user) {
+      this.loginForm.controls.email.disable();
+      this.loginForm.controls.emailRepeat.disable();
+    }
   }
 
   register(): void {
@@ -100,13 +160,49 @@ 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,
       lastName: this.loginForm.value.lastName ?? null,
       email: this.loginForm.value.email ?? null,
       password: this.loginForm.value.password ?? null
     };
-
     this.authService.register(user)
       .pipe(catchError(error => {
         if (error.error !== null) {
@@ -121,24 +217,30 @@ export class RegistrationComponent implements OnInit {
       }))
       .subscribe(resp => {
         this.spinnerService.hideSpinner();
-        this.router.navigate(['/auth/login']);
+        this.router.navigate(["/auth/login"]);
       });
   }
 
   confirmEMail(): void {
-    const id = this.route.snapshot.params['id'];
+    const id = this.route.snapshot.params["id"];
     if (id) {
       this.spinnerService.showSpinner();
       this.authService.confirmEMail(id)
         .pipe(catchError(error => {
-          this.router.navigate(['/auth/login']);
+          this.router.navigate(["/auth/login"]);
           this.spinnerService.hideSpinner();
           throw error;
         }))
         .subscribe(resp => {
           this.spinnerService.hideSpinner();
-          this.router.navigate(['/auth/login']);
+          this.router.navigate(["/auth/login"]);
         });
     }
   }
+
+  discordLogin() {
+    this.authService.getDiscordAuthURL().subscribe(url => {
+      window.location.href = url.loginUrl;
+    });
+  }
 }

kdb-web/src/app/services/auth/auth.service.ts

@@ -1,20 +1,22 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { HttpClient, HttpHeaders } from "@angular/common/http";
-import { Injectable } from '@angular/core';
+import { Injectable } from "@angular/core";
-import { Router } from '@angular/router';
+import { Router } from "@angular/router";
-import { JwtHelperService } from '@auth0/angular-jwt';
+import { JwtHelperService } from "@auth0/angular-jwt";
-import { firstValueFrom, Observable, Subject, Subscription } from 'rxjs';
+import { firstValueFrom, Observable, Subject, Subscription } from "rxjs";
-import { catchError } from 'rxjs/operators';
+import { catchError } from "rxjs/operators";
-import { AdminUpdateUserDTO } from 'src/app/models/auth/admin-update-user.dto';
+import { AdminUpdateUserDTO } from "src/app/models/auth/admin-update-user.dto";
-import { AuthRoles } from 'src/app/models/auth/auth-roles.enum';
+import { AuthRoles } from "src/app/models/auth/auth-roles.enum";
-import { AuthUserDTO } from 'src/app/models/auth/auth-user.dto';
+import { AuthUserDTO } from "src/app/models/auth/auth-user.dto";
-import { EMailStringDTO } from 'src/app/models/auth/email-string.dto';
+import { EMailStringDTO } from "src/app/models/auth/email-string.dto";
-import { ResetPasswordDTO } from 'src/app/models/auth/reset-password.dto';
+import { ResetPasswordDTO } from "src/app/models/auth/reset-password.dto";
-import { TokenDTO } from 'src/app/models/auth/token.dto';
+import { TokenDTO } from "src/app/models/auth/token.dto";
-import { UpdateUserDTO } from 'src/app/models/auth/update-user.dto';
+import { UpdateUserDTO } from "src/app/models/auth/update-user.dto";
-import { AuthUserSelectCriterion } from 'src/app/models/selection/auth-user/auth-user-select-criterion.dto';
+import { AuthUserSelectCriterion } from "src/app/models/selection/auth-user/auth-user-select-criterion.dto";
-import { GetFilteredAuthUsersResultDTO } from 'src/app/models/selection/auth-user/get-filtered-auth-users-result.dto';
+import { GetFilteredAuthUsersResultDTO } from "src/app/models/selection/auth-user/get-filtered-auth-users-result.dto";
-import { SettingsService } from '../settings/settings.service';
+import { SettingsService } from "../settings/settings.service";
-import { SpinnerService } from '../spinner/spinner.service';
+import { SpinnerService } from "../spinner/spinner.service";
+import { DiscordAuthURL } from "../../models/auth/discord-auth-url.dto";
+import { OAuthDTO } from "../../models/auth/oauth.dto";
 
 @Injectable({
   providedIn: 'root'
@@ -157,6 +159,39 @@ export class AuthService {
     });
   }
 
+  /* discord auth */
+  getDiscordAuthURL() {
+    return this.http.get<DiscordAuthURL>(`${this.appsettings.getApiURL()}/api/auth/discord/get-url`, {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json'
+      })
+    });
+  }
+  discordCreateUser(code: string, state: string) {
+    return this.http.get<OAuthDTO>(`${this.appsettings.getApiURL()}/api/auth/discord/create-user?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, {
+      headers: new HttpHeaders({
+        'Content-Type': 'application/json'
+      })
+    });
+  }
+
+  // discordGetUser(code: string, state: string) {
+  //   return this.http.get<AuthUserDTO>(`${this.appsettings.getApiURL()}/api/auth/discord/get-user?code=${code}&state=${state}`, {
+  //     headers: new HttpHeaders({
+  //       'Content-Type': 'application/json'
+  //     })
+  //   });
+  // }
+
   /* utils */
   saveToken(token: TokenDTO): void {
     localStorage.setItem('jwt', token.token);

kdb-web/src/assets/i18n/de.json

@@ -107,8 +107,9 @@
       "e_mail": "E-Mail",
       "repeat_e_mail": "E-mail wiederholen",
       "password": "Password",
-            "repeat_password": "password wiederholen",
+      "repeat_password": "Password wiederholen",
       "register": "Registrieren",
+      "register_with_discord": "Mit Discord Registrieren",
       "login": "Einloggen",
       "user_already_exists": "Benutzer existiert bereits",
       "passwords_not_match": "Passwörter sitmmen nicht überein",
@@ -244,8 +245,24 @@
       "Freitag",
       "Samstag"
     ],
-        "dayNamesShort": ["Son", "Mon", "Die", "Mit", "Don", "Fre", "Sam"],
+    "dayNamesShort": [
-        "dayNamesMin": ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"],
+      "Son",
+      "Mon",
+      "Die",
+      "Mit",
+      "Don",
+      "Fre",
+      "Sam"
+    ],
+    "dayNamesMin": [
+      "So",
+      "Mo",
+      "Di",
+      "Mi",
+      "Do",
+      "Fr",
+      "Sa"
+    ],
     "monthNames": [
       "Januar",
       "Februar",

kdb-web/src/styles.scss

@@ -421,7 +421,7 @@ footer {
     }
 
     .register-form-wrapper {
-        height: 550px;
+        height: 600px;
     }
 
     .register-confirm-form-wrapper {