Support logout and add id and pass tests

2 files changed, 5 insertions, 2 deletions

diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index d0d9a0508..1bff955df 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -222,7 +222,7 @@ enum ScopeNames {
 export class UserModel extends Model<UserModel> {
 
   @AllowNull(true)
-  @Is('UserPassword', value => throwIfNotValid(value, isUserPasswordValid, 'user password'))
+  @Is('UserPassword', value => throwIfNotValid(value, isUserPasswordValid, 'user password', true))
   @Column
   password: string
 
@@ -388,7 +388,7 @@ export class UserModel extends Model<UserModel> {
   @BeforeCreate
   @BeforeUpdate
   static cryptPasswordIfNeeded (instance: UserModel) {
-    if (instance.changed('password')) {
+    if (instance.changed('password') && instance.password) {
       return cryptPassword(instance.password)
         .then(hash => {
           instance.password = hash
diff --git a/server/models/oauth/oauth-token.ts b/server/models/oauth/oauth-token.ts
index d2101ce86..e73c4be7d 100644
--- a/server/models/oauth/oauth-token.ts
+++ b/server/models/oauth/oauth-token.ts
@@ -97,6 +97,9 @@ export class OAuthTokenModel extends Model<OAuthTokenModel> {
   @Column
   refreshTokenExpiresAt: Date
 
+  @Column
+  authName: string
+
   @CreatedAt
   createdAt: Date