itsscb/df
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: itsscb:master
Branches Tags
itsscb:master
itsscb:ft/app
itsscb:itsscb/issue85
itsscb:83-move-personal-data-out-of-the-createaccount-process
..
compare: itsscb:ft/app
Branches Tags
itsscb:master
itsscb:ft/app
itsscb:itsscb/issue85
itsscb:83-move-personal-data-out-of-the-createaccount-process

No commits in common. "master" and "ft/app" have entirely different histories.
master ... ft/app

6 changed files with 2 additions and 19 deletions
Show Stats Expand all files Collapse all files

11
Jenkinsfile vendored
View File

@ -1,11 +0,0 @@
pipeline {
agent any
stages {
stage('Build') {
steps {
echo 'Test Building..'
}
}
}
}

1
bff/app.env
View File

@ -8,7 +8,6 @@ ACCESS_TOKEN_DURATION=15m
MIGRATION_URL=file://db/migration
MIGRATION_RETRIES=5
SWAGGER=true
URL=https://df.itsscb.de
REFRESH_TOKEN_DURATION=24h
TOKEN_PRIVATEKEY_HEX=099c0b96725b99e95719c92aec580809ac58fc14be2105ed2656f1f6c464593d8cacd6c7bed924b9cf207ab3cff1c59be4e5865260c4dafa29699244bd4ea2de
SMTP_ADDRESS=smtp.gmail.com:587

2
bff/gapi/rpc_create_account.go
View File

@ -32,7 +32,7 @@ func (server *Server) CreateAccount(ctx context.Context, req *pb.CreateAccountRe
Email: req.GetEmail(),
},
AfterCreate: func(a db.Account) error {
return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,</br></br>please verify your E-Mail Addres by clicking on the following link:</br><a href=\"%s/v1/verify_email/%d/%s\">Verification Link</a></br></br></br>Your Team of DF", req.GetEmail(), server.config.Url, a.ID, a.SecretKey.String), []string{req.GetEmail()}, nil, nil, nil)
return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,</br></br>please verify your E-Mail Addres by clicking on the following link:</br><a href=\"https://df.itsscb.de/v1/verify_email/%d/%s\">Verification Link</a></br></br></br>Your Team of DF", req.GetEmail(), a.ID, a.SecretKey.String), []string{req.GetEmail()}, nil, nil, nil)
},
}

2
bff/gapi/rpc_update_account.go
View File

@ -69,7 +69,7 @@ func (server *Server) UpdateAccount(ctx context.Context, req *pb.UpdateAccountRe
}
} else {
arg.AfterUpdate = func(a db.Account) error {
return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,</br></br>please verify your E-Mail Addres by clicking on the following link:</br><a href=\"%s/v1/verify_email/%d/%s\">Verification Link</a></br></br></br>Your Team of DF", req.GetEmail(), server.config.Url, a.ID, a.SecretKey.String), []string{req.GetEmail()}, nil, nil, nil)
return server.mailSender.SendEmail("Verify your E-Mail Address", fmt.Sprintf("Hello %s,</br></br>please verify your E-Mail Addres by clicking on the following link:</br><a href=\"https://df.itsscb.de/v1/verify_email/%d/%s\">Verification Link</a></br></br></br>Your Team of DF", req.GetEmail(), a.ID, a.SecretKey.String), []string{req.GetEmail()}, nil, nil, nil)
}
}
}

2
bff/util/config.go
View File

@ -15,8 +15,6 @@ type Config struct {
LogOutput string `mapstructure:"LOG_OUTPUT"`
TokenPrivateKeyHex string `mapstructure:"TOKEN_PRIVATEKEY_HEX"`
MigrationURL string `mapstructure:"MIGRATION_URL"`
Swagger bool `mapstructure:"SWAGGER"`
Url string `mapstructure:"URL"`
SMTPAddress string `mapstructure:"SMTP_ADDRESS"`
SMTPPassword string `mapstructure:"SMTP_PASSWORD"`
SMTPMail string `mapstructure:"SMTP_MAIL"`

3
frontend/app/lib/model/services/backend_service.dart
View File

@ -225,9 +225,6 @@ class BackendService {
} on SocketException {
throw FetchDataException('Keine Internet Verbindung');
} on GrpcError catch (err) {
if (err.code == 12) {
throw UnauthorizedException('${err.message}');
}
throw FetchDataException('${err.message}');
} catch (err) {
throw InternalException(err.toString());