Merge branch 'master' into mf/rssInboundManager

# Conflicts:
#	client/pages/config/rss-feeds.vue
#	client/strings/en-us.json
#	server/managers/PodcastManager.js
#	server/models/Podcast.js

server/models/Book.js

@@ -211,6 +211,32 @@ class Book extends Model {
     }
   }
 
+  getAbsMetadataJson() {
+    return {
+      tags: this.tags || [],
+      chapters: this.chapters?.map(c => ({ ...c })) || [],
+      title: this.title,
+      subtitle: this.subtitle,
+      authors: this.authors.map(a => a.name),
+      narrators: this.narrators,
+      series: this.series.map(se => {
+        const sequence = se.bookSeries?.sequence || ''
+        if (!sequence) return se.name
+        return `${se.name} #${sequence}`
+      }),
+      genres: this.genres || [],
+      publishedYear: this.publishedYear,
+      publishedDate: this.publishedDate,
+      publisher: this.publisher,
+      description: this.description,
+      isbn: this.isbn,
+      asin: this.asin,
+      language: this.language,
+      explicit: !!this.explicit,
+      abridged: !!this.abridged
+    }
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize 

server/models/Library.js

@@ -11,6 +11,7 @@ const oldLibrary = require('../objects/Library')
  * @property {string} autoScanCronExpression
  * @property {boolean} audiobooksOnly
  * @property {boolean} hideSingleBookSeries Do not show series that only have 1 book 
+ * @property {string[]} metadataPrecedence
  */
 
 class Library extends Model {
@@ -79,6 +80,9 @@ class Library extends Model {
       mediaType: libraryExpanded.mediaType,
       provider: libraryExpanded.provider,
       settings: libraryExpanded.settings,
+      lastScan: libraryExpanded.lastScan?.valueOf() || null,
+      lastScanVersion: libraryExpanded.lastScanVersion || null,
+      lastScanMetadataPrecedence: libraryExpanded.extraData?.lastScanMetadataPrecedence || null,
       createdAt: libraryExpanded.createdAt.valueOf(),
       lastUpdate: libraryExpanded.updatedAt.valueOf()
     })
@@ -151,6 +155,9 @@ class Library extends Model {
     if (oldLibrary.oldLibraryId) {
       extraData.oldLibraryId = oldLibrary.oldLibraryId
     }
+    if (oldLibrary.lastScanMetadataPrecedence) {
+      extraData.lastScanMetadataPrecedence = oldLibrary.lastScanMetadataPrecedence
+    }
     return {
       id: oldLibrary.id,
       name: oldLibrary.name,
@@ -159,6 +166,8 @@ class Library extends Model {
       mediaType: oldLibrary.mediaType || null,
       provider: oldLibrary.provider,
       settings: oldLibrary.settings?.toJSON() || {},
+      lastScan: oldLibrary.lastScan || null,
+      lastScanVersion: oldLibrary.lastScanVersion || null,
       createdAt: oldLibrary.createdAt,
       updatedAt: oldLibrary.lastUpdate,
       extraData

server/models/LibraryItem.js

@@ -69,7 +69,7 @@ class LibraryItem extends Model {
    * 
    * @param {number} offset
    * @param {number} limit
-   * @returns {Promise<Model<LibraryItem>[]>} LibraryItem
+   * @returns {Promise<LibraryItem[]>} LibraryItem
    */
   static getLibraryItemsIncrement(offset, limit, where = null) {
     return this.findAll({

server/models/Podcast.js

@@ -126,6 +126,25 @@ class Podcast extends Model {
     return podcastsFiltered.map(p => this.getOldPodcast({media: p.dataValues}))
   }
 
+  getAbsMetadataJson() {
+    return {
+      tags: this.tags || [],
+      title: this.title,
+      author: this.author,
+      description: this.description,
+      releaseDate: this.releaseDate,
+      genres: this.genres || [],
+      feedURL: this.feedURL,
+      imageURL: this.imageURL,
+      itunesPageURL: this.itunesPageURL,
+      itunesId: this.itunesId,
+      itunesArtistId: this.itunesArtistId,
+      language: this.language,
+      explicit: !!this.explicit,
+      podcastType: this.podcastType
+    }
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize 

server/models/PodcastEpisode.js

@@ -79,6 +79,7 @@ class PodcastEpisode extends Model {
       subtitle: this.subtitle,
       description: this.description,
       enclosure,
+      guid: this.extraData?.guid || null,
       pubDate: this.pubDate,
       chapters: this.chapters,
       audioFile: this.audioFile,
@@ -98,6 +99,9 @@ class PodcastEpisode extends Model {
     if (oldEpisode.oldEpisodeId) {
       extraData.oldEpisodeId = oldEpisode.oldEpisodeId
     }
+    if (oldEpisode.guid) {
+      extraData.guid = oldEpisode.guid
+    }
     return {
       id: oldEpisode.id,
       index: oldEpisode.index,

server/models/User.js

@@ -1,7 +1,9 @@
 const uuidv4 = require("uuid").v4
-const { DataTypes, Model, Op } = require('sequelize')
+const sequelize = require('sequelize')
 const Logger = require('../Logger')
 const oldUser = require('../objects/user/User')
+const SocketAuthority = require('../SocketAuthority')
+const { DataTypes, Model } = sequelize
 
 class User extends Model {
   constructor(values, options) {
@@ -46,6 +48,12 @@ class User extends Model {
     return users.map(u => this.getOldUser(u))
   }
 
+  /**
+   * Get old user model from new
+   * 
+   * @param {Object} userExpanded 
+   * @returns {oldUser}
+   */
   static getOldUser(userExpanded) {
     const mediaProgress = userExpanded.mediaProgresses.map(mp => mp.getOldMediaProgress())
 
@@ -59,6 +67,7 @@ class User extends Model {
       id: userExpanded.id,
       oldUserId: userExpanded.extraData?.oldUserId || null,
       username: userExpanded.username,
+      email: userExpanded.email || null,
       pash: userExpanded.pash,
       type: userExpanded.type,
       token: userExpanded.token,
@@ -71,18 +80,32 @@ class User extends Model {
       createdAt: userExpanded.createdAt.valueOf(),
       permissions,
       librariesAccessible,
-      itemTagsSelected
+      itemTagsSelected,
+      authOpenIDSub: userExpanded.extraData?.authOpenIDSub || null
     })
   }
 
+  /**
+   * 
+   * @param {oldUser} oldUser 
+   * @returns {Promise<User>}
+   */
   static createFromOld(oldUser) {
     const user = this.getFromOld(oldUser)
     return this.create(user)
   }
 
-  static updateFromOld(oldUser) {
+  /**
+   * Update User from old user model
+   * 
+   * @param {oldUser} oldUser 
+   * @param {boolean} [hooks=true] Run before / after bulk update hooks?
+   * @returns {Promise<boolean>}
+   */
+  static updateFromOld(oldUser, hooks = true) {
     const user = this.getFromOld(oldUser)
     return this.update(user, {
+      hooks: !!hooks,
       where: {
         id: user.id
       }
@@ -92,19 +115,31 @@ class User extends Model {
     })
   }
 
+  /**
+   * Get new User model from old
+   * 
+   * @param {oldUser} oldUser 
+   * @returns {Object}
+   */
   static getFromOld(oldUser) {
+    const extraData = {
+      seriesHideFromContinueListening: oldUser.seriesHideFromContinueListening || [],
+      oldUserId: oldUser.oldUserId
+    }
+    if (oldUser.authOpenIDSub) {
+      extraData.authOpenIDSub = oldUser.authOpenIDSub
+    }
+
     return {
       id: oldUser.id,
       username: oldUser.username,
+      email: oldUser.email || null,
       pash: oldUser.pash || null,
       type: oldUser.type || null,
       token: oldUser.token || null,
       isActive: !!oldUser.isActive,
       lastSeen: oldUser.lastSeen || null,
-      extraData: {
-        seriesHideFromContinueListening: oldUser.seriesHideFromContinueListening || [],
-        oldUserId: oldUser.oldUserId
-      },
+      extraData,
       createdAt: oldUser.createdAt || Date.now(),
       permissions: {
         ...oldUser.permissions,
@@ -128,12 +163,12 @@ class User extends Model {
    * @param {string} username 
    * @param {string} pash 
    * @param {Auth} auth 
-   * @returns {oldUser}
+   * @returns {Promise<oldUser>}
    */
   static async createRootUser(username, pash, auth) {
     const userId = uuidv4()
 
-    const token = await auth.generateAccessToken({ userId, username })
+    const token = await auth.generateAccessToken({ id: userId, username })
 
     const newRoot = new oldUser({
       id: userId,
@@ -148,6 +183,38 @@ class User extends Model {
     return newRoot
   }
 
+  /**
+   * Create user from openid userinfo
+   * @param {Object} userinfo 
+   * @param {Auth} auth 
+   * @returns {Promise<oldUser>}
+   */
+  static async createUserFromOpenIdUserInfo(userinfo, auth) {
+    const userId = uuidv4()
+    // TODO: Ensure username is unique?
+    const username = userinfo.preferred_username || userinfo.name || userinfo.sub
+    const email = (userinfo.email && userinfo.email_verified) ? userinfo.email : null
+
+    const token = await auth.generateAccessToken({ id: userId, username })
+
+    const newUser = new oldUser({
+      id: userId,
+      type: 'user',
+      username,
+      email,
+      pash: null,
+      token,
+      isActive: true,
+      authOpenIDSub: userinfo.sub,
+      createdAt: Date.now()
+    })
+    if (await this.createFromOld(newUser)) {
+      SocketAuthority.adminEmitter('user_added', newUser.toJSONForBrowser())
+      return newUser
+    }
+    return null
+  }
+
   /**
    * Get a user by id or by the old database id
    * @temp User ids were updated in v2.3.0 migration and old API tokens may still use that id
@@ -158,13 +225,13 @@ class User extends Model {
     if (!userId) return null
     const user = await this.findOne({
       where: {
-        [Op.or]: [
+        [sequelize.Op.or]: [
           {
             id: userId
           },
           {
             extraData: {
-              [Op.substring]: userId
+              [sequelize.Op.substring]: userId
             }
           }
         ]
@@ -185,7 +252,26 @@ class User extends Model {
     const user = await this.findOne({
       where: {
         username: {
-          [Op.like]: username
+          [sequelize.Op.like]: username
+        }
+      },
+      include: this.sequelize.models.mediaProgress
+    })
+    if (!user) return null
+    return this.getOldUser(user)
+  }
+
+  /**
+   * Get user by email case insensitive
+   * @param {string} username 
+   * @returns {Promise<oldUser|null>} returns null if not found
+   */
+  static async getUserByEmail(email) {
+    if (!email) return null
+    const user = await this.findOne({
+      where: {
+        email: {
+          [sequelize.Op.like]: email
         }
       },
       include: this.sequelize.models.mediaProgress
@@ -208,6 +294,21 @@ class User extends Model {
     return this.getOldUser(user)
   }
 
+  /**
+   * Get user by openid sub
+   * @param {string} sub 
+   * @returns {Promise<oldUser|null>} returns null if not found
+   */
+  static async getUserByOpenIDSub(sub) {
+    if (!sub) return null
+    const user = await this.findOne({
+      where: sequelize.where(sequelize.literal(`extraData->>"authOpenIDSub"`), sub),
+      include: this.sequelize.models.mediaProgress
+    })
+    if (!user) return null
+    return this.getOldUser(user)
+  }
+
   /**
    * Get array of user id and username
    * @returns {object[]} { id, username }