fix/qg-253: WIP: GoogleAccount.refreshToken переведён на CharArray

Чтобы он не светился в логах через toString

Author: d-r-q

app/src/main/kotlin/pro/qyoga/app/therapist/oauth2/GoogleCallbackController.kt

@@ -47,7 +47,7 @@ class GoogleOAuthController(
         val picture = response["picture"] as? String?
 
         googleCalendarsService.addGoogleAccount(
-            GoogleAccount(therapistId, email, authorizedClient.refreshToken!!.tokenValue)
+            GoogleAccount(therapistId, email, authorizedClient.refreshToken!!.tokenValue.toCharArray())
         )
 
         // Греем кэш, чтобы улучшить UX пользователя при возврате на страницу расписания

app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleAccount.kt

@@ -15,7 +15,37 @@ typealias GoogleAccountRef = AggregateReference<GoogleAccount, UUID>
 data class GoogleAccount(
     val ownerRef: TherapistRef,
     val email: String,
-    val refreshToken: String,
+    val refreshToken: CharArray,
 
     @Id override val id: UUID = UUIDv7.randomUUID()
-) : Identifiable<UUID>
+) : Identifiable<UUID> {
+
+    constructor(
+        ownerRef: TherapistRef,
+        email: String,
+        refreshToken: String
+    ) : this(ownerRef, email, refreshToken.toCharArray())
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as GoogleAccount
+
+        if (ownerRef != other.ownerRef) return false
+        if (email != other.email) return false
+        if (!refreshToken.contentEquals(other.refreshToken)) return false
+        if (id != other.id) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = ownerRef.hashCode()
+        result = 31 * result + email.hashCode()
+        result = 31 * result + refreshToken.contentHashCode()
+        result = 31 * result + id.hashCode()
+        return result
+    }
+
+}

app/src/main/kotlin/pro/qyoga/core/calendar/google/GoogleCalendarsClient.kt

@@ -5,6 +5,7 @@ import com.google.api.services.calendar.Calendar
 import com.google.api.services.calendar.model.Event
 import com.google.auth.http.HttpCredentialsAdapter
 import com.google.auth.oauth2.UserCredentials
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties
 import org.springframework.cache.annotation.Cacheable
@@ -25,6 +26,8 @@ class GoogleCalendarsClient(
     @Value("\${trainer-advisor.integrations.google-calendar.root-url}") private val googleCalendarRootUri: URI
 ) {
 
+    private val log = LoggerFactory.getLogger(javaClass)
+
     private val servicesCache = mutableMapOf<GoogleAccount, Calendar>()
         .withDefault { createCalendarService(it) }
 
@@ -37,6 +40,8 @@ class GoogleCalendarsClient(
         calendarSettings: GoogleCalendarSettings,
         interval: Interval<ZonedDateTime>
     ): List<GoogleCalendarItem<ZonedDateTime>> {
+        log.info("Fetching events in {} for calendar {} using {}", interval, calendarSettings.calendarId, account)
+
         val service = servicesCache.getValue(account)
         val events =
             service.events().list(calendarSettings.calendarId)
@@ -77,6 +82,7 @@ class GoogleCalendarsClient(
         therapist: TherapistRef,
         account: GoogleAccount
     ): List<GoogleCalendar> {
+        log.info("Fetching calendars for therapist {} using {}", therapist, account)
         val service = servicesCache.getValue(account)
 
         return service.CalendarList().list()
@@ -89,7 +95,7 @@ class GoogleCalendarsClient(
         val credentials = UserCredentials.newBuilder()
             .setClientId(googleOAuthProps.registration["google"]!!.clientId)
             .setClientSecret(googleOAuthProps.registration["google"]!!.clientSecret)
-            .setRefreshToken(account.refreshToken)
+            .setRefreshToken(String(account.refreshToken))
             .setTokenServerUri(tokenUri)
             .build()