From 3533342a9c70c21044a94997d4069d351b688e57 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Thu, 14 Sep 2023 01:42:01 +0200 Subject: [PATCH] minor whitespace refactorings --- .../ios_apns/ios_apns_jwt/iosAPNsToken.go | 15 ++++++--------- .../ios_crypto/encryptedString.go | 4 ---- .../iosRequestResponseService.go | 3 --- server/backend/rpcserver.go | 1 - server/model/ios_grade.go | 8 +------- 5 files changed, 7 insertions(+), 24 deletions(-) diff --git a/server/backend/ios_notifications/ios_apns/ios_apns_jwt/iosAPNsToken.go b/server/backend/ios_notifications/ios_apns/ios_apns_jwt/iosAPNsToken.go index 0b6fe133..bf00d984 100644 --- a/server/backend/ios_notifications/ios_apns/ios_apns_jwt/iosAPNsToken.go +++ b/server/backend/ios_notifications/ios_apns/ios_apns_jwt/iosAPNsToken.go @@ -39,7 +39,6 @@ type Token struct { func NewToken() (*Token, error) { encryptionKey, err := APNsEncryptionKeyFromFile() - if err != nil { return nil, err } @@ -50,9 +49,7 @@ func NewToken() (*Token, error) { TeamId: ApnsTeamId, } - _, err = token.Generate() - - if err != nil { + if err = token.Generate(); err != nil { return nil, err } @@ -106,7 +103,7 @@ func (t *Token) GenerateNewTokenIfExpired() (bearer string) { defer t.Unlock() if t.IsExpired() { - _, err := t.Generate() + err := t.Generate() if err != nil { return "" } @@ -119,9 +116,9 @@ func (t *Token) IsExpired() bool { return currentTimestamp() >= (t.IssuedAt + TokenTimeout) } -func (t *Token) Generate() (bool, error) { +func (t *Token) Generate() error { if t.EncryptionKey == nil { - return false, ErrorAuthKeyNil + return ErrorAuthKeyNil } issuedAt := currentTimestamp() @@ -141,13 +138,13 @@ func (t *Token) Generate() (bool, error) { token, err := jwtToken.SignedString(t.EncryptionKey) if err != nil { - return false, err + return err } t.IssuedAt = issuedAt t.Bearer = token - return true, nil + return nil } func currentTimestamp() int64 { diff --git a/server/backend/ios_notifications/ios_crypto/encryptedString.go b/server/backend/ios_notifications/ios_crypto/encryptedString.go index 24a04a53..5ee0aa4b 100644 --- a/server/backend/ios_notifications/ios_crypto/encryptedString.go +++ b/server/backend/ios_notifications/ios_crypto/encryptedString.go @@ -97,19 +97,16 @@ func SymmetricEncrypt(plaintext string, key string) (*EncryptedString, error) { func SymmetricDecrypt(encryptedString EncryptedString, key string) (string, error) { bytesKey := []byte(key) bytesEncryptedString, err := base64.StdEncoding.DecodeString(string(encryptedString)) - if err != nil { return "", err } c, err := aes.NewCipher(bytesKey) - if err != nil { return "", err } gcm, err := cipher.NewGCM(c) - if err != nil { return "", err } @@ -118,7 +115,6 @@ func SymmetricDecrypt(encryptedString EncryptedString, key string) (string, erro nonce, ciphertext := bytesEncryptedString[:nonceSize], bytesEncryptedString[nonceSize:] plaintext, err := gcm.Open(nil, nonce, ciphertext, nil) - if err != nil { return "", err } diff --git a/server/backend/ios_notifications/ios_request_response/iosRequestResponseService.go b/server/backend/ios_notifications/ios_request_response/iosRequestResponseService.go index 4de49cb5..cbd57102 100644 --- a/server/backend/ios_notifications/ios_request_response/iosRequestResponseService.go +++ b/server/backend/ios_notifications/ios_request_response/iosRequestResponseService.go @@ -177,13 +177,11 @@ func (service *Service) encryptGradesAndStoreInDatabase(grades []model.IOSGrade, } err := encryptedGrade.Encrypt(campusToken) - if err != nil { log.WithError(err).Error("Could not encrypt grade") } err = service.Repository.SaveEncryptedGrade(&encryptedGrade) - if err != nil { log.WithError(err).Error("Could not save grade") } @@ -213,7 +211,6 @@ func sendGradesToDevice(device *model.IOSDevice, grades []model.IOSGrade, apns * log.WithField("DeviceID", device.DeviceID).Info("Sending push notification") _, err := apns.SendAlertNotification(notificationPayload) - if err != nil { log.WithField("DeviceID", device.DeviceID).WithError(err).Error("Could not send notification") } diff --git a/server/backend/rpcserver.go b/server/backend/rpcserver.go index 4e20e970..5201d289 100644 --- a/server/backend/rpcserver.go +++ b/server/backend/rpcserver.go @@ -56,7 +56,6 @@ func NewIOSNotificationsService() *IOSNotificationsService { } token, err := ios_apns_jwt.NewToken() - if err != nil { log.WithError(err).Fatal("failed to create new token") } diff --git a/server/model/ios_grade.go b/server/model/ios_grade.go index 4d6d282a..5bd8c31b 100644 --- a/server/model/ios_grade.go +++ b/server/model/ios_grade.go @@ -33,13 +33,11 @@ type customDate struct { func (c *customDate) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { var v string - err := d.DecodeElement(&v, &start) - if err != nil { + if err := d.DecodeElement(&v, &start); err != nil { return err } t, err := time.Parse("2006-01-02", v) - if err != nil { return err } @@ -66,13 +64,11 @@ type IOSEncryptedGrade struct { func (e *IOSEncryptedGrade) Encrypt(key string) error { encryptedTitle, err := ios_crypto.SymmetricEncrypt(e.LectureTitle, key) - if err != nil { return err } encryptedGrade, err := ios_crypto.SymmetricEncrypt(e.Grade, key) - if err != nil { return err } @@ -86,13 +82,11 @@ func (e *IOSEncryptedGrade) Encrypt(key string) error { func (e *IOSEncryptedGrade) Decrypt(key string) error { decryptedTitle, err := ios_crypto.SymmetricDecrypt(ios_crypto.EncryptedString(e.LectureTitle), key) - if err != nil { return err } decryptedGrade, err := ios_crypto.SymmetricDecrypt(ios_crypto.EncryptedString(e.Grade), key) - if err != nil { return err }