diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..3da93e2 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,11 @@ +pipeline { + agent any + + stages { + stage('Build') { + steps { + echo 'Test Building..' + } + } + } +} \ No newline at end of file diff --git a/bff/gapi/rpc_resend_verification.go b/bff/gapi/rpc_resend_verification.go index 47a0f9c..f3803c2 100644 --- a/bff/gapi/rpc_resend_verification.go +++ b/bff/gapi/rpc_resend_verification.go @@ -50,7 +50,7 @@ func (server *Server) ResendVerification(ctx context.Context, req *pb.ResendVeri ID: req.GetAccountId(), }, AfterCreate: func(a db.Account) error { - return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,

please verify your E-Mail Addres by clicking on the following link:
Verification Link


Your Team of DF", account.Email, server.config.Url, a.ID, a.SecretKey.String), []string{account.Email}, nil, nil, nil) + return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,

please verify your E-Mail Addres by clicking on the following link:
Verification Link


Your Team of DF", account.Email, a.ID, a.SecretKey.String), []string{account.Email}, nil, nil, nil) }, } diff --git a/bff/util/config.go b/bff/util/config.go index 0ae11dd..ca3481e 100644 --- a/bff/util/config.go +++ b/bff/util/config.go @@ -21,6 +21,7 @@ type Config struct { SMTPPassword string `mapstructure:"SMTP_PASSWORD"` SMTPMail string `mapstructure:"SMTP_MAIL"` MigrationRetries int `mapstructure:"MIGRATION_RETRIES"` + Swagger bool `mapstructure:"SWAGGER"` AccessTokenDuration time.Duration `mapstructure:"ACCESS_TOKEN_DURATION"` RefreshTokenDuration time.Duration `mapstructure:"REFRESH_TOKEN_DURATION"` } diff --git a/frontend/app/lib/main.dart b/frontend/app/lib/main.dart index b48949c..03bf01c 100644 --- a/frontend/app/lib/main.dart +++ b/frontend/app/lib/main.dart @@ -88,16 +88,25 @@ class _DigitalerFriedenState extends State { accountLevel = await _storageService.accountLevel; accessToken = await _storageService.accessToken; verified = await _storageService.verified; - if (accountLevel! > 1) { - authenticated = await AuthService.authenticateWithBiometrics(); - } - if (authenticated && accountLevel != null && accountLevel! > 3) { + + if (accessToken != null) { account = await _vm.account; } - if (account != null && !verified && account!.emailVerified) { - await _storageService.setVerified(account!.emailVerified); - verified = account!.emailVerified; + if (account != null) { + if (verified != account!.emailVerified) { + verified = account!.emailVerified; + _storageService.setVerified(verified); + } + + if (accountLevel == null || account!.accountLevel > accountLevel!) { + accountLevel = account!.accountLevel; + _storageService.setAccountLevel(account!.accountLevel); + } + } + + if (accountLevel! > 1) { + authenticated = await AuthService.authenticateWithBiometrics(); } print(