TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a flag to imap settings to enable/disable oauth2 scheme

Browse Source
This commit is contained in:
Eike Kettner
2021-01-03 16:36:19 +01:00
parent ac6a7b28be
commit 0cfd8974d3
8 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/store/src/main/resources/db/migration/h2/V1.16.0__add_imap_oauth.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE "userimap"
ADD COLUMN "imap_oauth2" boolean NULL;
UPDATE "userimap" SET "imap_oauth2" = false;
ALTER TABLE "userimap"
ALTER COLUMN "imap_oauth2" SET NOT NULL;

7
modules/store/src/main/resources/db/migration/mariadb/V1.16.0__add_imap_oauth.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE `userimap`
ADD COLUMN (`imap_oauth2` boolean);
UPDATE `userimap` SET `imap_oauth2` = false;
ALTER TABLE `userimap`
MODIFY `imap_oauth2` boolean NOT NULL;

7
modules/store/src/main/resources/db/migration/postgresql/V1.16.0__add_imap_oauth.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE "userimap"
ADD COLUMN "imap_oauth2" boolean NULL;
UPDATE "userimap" SET "imap_oauth2" = false;
ALTER TABLE "userimap"
ALTER COLUMN "imap_oauth2" SET NOT NULL;

17
modules/store/src/main/scala/docspell/store/records/RUserImap.scala
View File

@ -22,6 +22,7 @@ case class RUserImap(
imapPassword: Option[Password],
imapSsl: SSLType,
imapCertCheck: Boolean,
imapOAuth2: Boolean,
created: Timestamp
) {
@ -32,6 +33,7 @@ case class RUserImap(
imapUser.getOrElse(""),
imapPassword.map(_.pass).getOrElse(""),
imapSsl,
imapOAuth2,
!imapCertCheck
)
}
@ -47,7 +49,8 @@ object RUserImap {
imapUser: Option[String],
imapPassword: Option[Password],
imapSsl: SSLType,
imapCertCheck: Boolean
imapCertCheck: Boolean,
imapOAuth2: Boolean
): F[RUserImap] =
for {
now <- Timestamp.current[F]
@ -62,6 +65,7 @@ object RUserImap {
imapPassword,
imapSsl,
imapCertCheck,
imapOAuth2,
now
)
@ -73,7 +77,8 @@ object RUserImap {
imapUser: Option[String],
imapPassword: Option[Password],
imapSsl: SSLType,
imapCertCheck: Boolean
imapCertCheck: Boolean,
imapOAuth2: Boolean
): OptionT[ConnectionIO, RUserImap] =
for {
now <- OptionT.liftF(Timestamp.current[ConnectionIO])
@ -89,6 +94,7 @@ object RUserImap {
imapPassword,
imapSsl,
imapCertCheck,
imapOAuth2,
now
)
@ -104,6 +110,7 @@ object RUserImap {
val imapPass = Column[Password]("imap_password", this)
val imapSsl = Column[SSLType]("imap_ssl", this)
val imapCertCheck = Column[Boolean]("imap_certcheck", this)
val imapOAuth2 = Column[Boolean]("imap_oauth2", this)
val created = Column[Timestamp]("created", this)
val all = NonEmptyList.of[Column[_]](
@ -116,6 +123,7 @@ object RUserImap {
imapPass,
imapSsl,
imapCertCheck,
imapOAuth2,
created
)
}
@ -129,7 +137,7 @@ object RUserImap {
.insert(
t,
t.all,
sql"${v.id},${v.uid},${v.name},${v.imapHost},${v.imapPort},${v.imapUser},${v.imapPassword},${v.imapSsl},${v.imapCertCheck},${v.created}"
sql"${v.id},${v.uid},${v.name},${v.imapHost},${v.imapPort},${v.imapUser},${v.imapPassword},${v.imapSsl},${v.imapCertCheck},${v.imapOAuth2},${v.created}"
)
}
@ -145,7 +153,8 @@ object RUserImap {
t.imapUser.setTo(v.imapUser),
t.imapPass.setTo(v.imapPassword),
t.imapSsl.setTo(v.imapSsl),
t.imapCertCheck.setTo(v.imapCertCheck)
t.imapCertCheck.setTo(v.imapCertCheck),
t.imapOAuth2.setTo(v.imapOAuth2)
)
)
}