mirror of https://github.com/oxen-io/session-ios
Fixed an issue where hidden mods/admins wouldn't be properly recognised
Added an isHidden flag to the GroupMember Reset the OpenGroup 'infoUpdates' value to force a re-fetch of the data and fix users affected by this bug Fixed the broken unit testspull/662/head
Morgan Pretty
3 years ago
parent
6c5d138bd6
commit
3ab8bdec77
@ -0,0 +1,30 @@
|
|||||||
|
// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
|
||||||
|
|
||||||
|
import Foundation
|
||||||
|
import GRDB
|
||||||
|
import SessionUtilitiesKit
|
||||||
|
|
||||||
|
/// This migration fixes an issue where hidden mods/admins weren't getting recognised as mods/admins, it reset's the `info_updates`
|
||||||
|
/// for open groups so they will fully re-fetch their mod/admin lists
|
||||||
|
enum _006_FixHiddenModAdminSupport: Migration {
|
||||||
|
static let target: TargetMigrations.Identifier = .messagingKit
|
||||||
|
static let identifier: String = "FixHiddenModAdminSupport"
|
||||||
|
static let needsConfigSync: Bool = false
|
||||||
|
static let minExpectedRunDuration: TimeInterval = 0.1
|
||||||
|
|
||||||
|
static func migrate(_ db: Database) throws {
|
||||||
|
try db.alter(table: GroupMember.self) { t in
|
||||||
|
t.add(.isHidden, .boolean)
|
||||||
|
.notNull()
|
||||||
|
.defaults(to: false)
|
||||||
|
}
|
||||||
|
|
||||||
|
// When modifying OpenGroup behaviours we should always look to reset the `infoUpdates`
|
||||||
|
// value for all OpenGroups to ensure they all have the correct state for newly
|
||||||
|
// added/changed fields
|
||||||
|
_ = try OpenGroup
|
||||||
|
.updateAll(db, OpenGroup.Columns.infoUpdates.set(to: 0))
|
||||||
|
|
||||||
|
Storage.update(progress: 1, for: self, in: target) // In case this is the last migration
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
|
||||||
|
|
||||||
|
import Foundation
|
||||||
|
import GRDB
|
||||||
|
|
||||||
|
/// This is a convenience wrapper around the GRDB `TableAlteration` class which allows for shorthand
|
||||||
|
/// when creating tables
|
||||||
|
public class TypedTableAlteration<T> where T: TableRecord, T: ColumnExpressible {
|
||||||
|
let alteration: TableAlteration
|
||||||
|
|
||||||
|
init(alteration: TableAlteration) {
|
||||||
|
self.alteration = alteration
|
||||||
|
}
|
||||||
|
|
||||||
|
@discardableResult public func add(_ key: T.Columns, _ type: Database.ColumnType? = nil) -> ColumnDefinition {
|
||||||
|
return alteration.add(column: key.name, type)
|
||||||
|
}
|
||||||
|
|
||||||
|
public func rename(column: String, to key: T.Columns) {
|
||||||
|
alteration.rename(column: column, to: key.name)
|
||||||
|
}
|
||||||
|
|
||||||
|
public func drop(_ key: T.Columns) {
|
||||||
|
return alteration.drop(column: key.name)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,105 @@
|
|||||||
|
// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
|
||||||
|
|
||||||
|
import Foundation
|
||||||
|
import GRDB
|
||||||
|
|
||||||
|
import Quick
|
||||||
|
import Nimble
|
||||||
|
|
||||||
|
@testable import SessionUtilitiesKit
|
||||||
|
|
||||||
|
class IdentitySpec: QuickSpec {
|
||||||
|
// MARK: - Spec
|
||||||
|
|
||||||
|
override func spec() {
|
||||||
|
var mockStorage: Storage!
|
||||||
|
|
||||||
|
describe("an Identity") {
|
||||||
|
beforeEach {
|
||||||
|
mockStorage = Storage(
|
||||||
|
customWriter: DatabaseQueue(),
|
||||||
|
customMigrations: [
|
||||||
|
SNUtilitiesKit.migrations()
|
||||||
|
]
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
it("correctly retrieves the user user public key") {
|
||||||
|
mockStorage.write { db in
|
||||||
|
try Identity(variant: .x25519PublicKey, data: "Test1".data(using: .utf8)!).insert(db)
|
||||||
|
}
|
||||||
|
|
||||||
|
mockStorage.read { db in
|
||||||
|
expect(Identity.fetchUserPublicKey(db))
|
||||||
|
.to(equal("Test1".data(using: .utf8)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
it("correctly retrieves the user private key") {
|
||||||
|
mockStorage.write { db in
|
||||||
|
try Identity(variant: .x25519PrivateKey, data: "Test2".data(using: .utf8)!).insert(db)
|
||||||
|
}
|
||||||
|
|
||||||
|
mockStorage.read { db in
|
||||||
|
expect(Identity.fetchUserPrivateKey(db))
|
||||||
|
.to(equal("Test2".data(using: .utf8)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
it("correctly retrieves the user key pair") {
|
||||||
|
mockStorage.write { db in
|
||||||
|
try Identity(variant: .x25519PublicKey, data: "Test3".data(using: .utf8)!).insert(db)
|
||||||
|
try Identity(variant: .x25519PrivateKey, data: "Test4".data(using: .utf8)!).insert(db)
|
||||||
|
}
|
||||||
|
|
||||||
|
mockStorage.read { db in
|
||||||
|
let keyPair = Identity.fetchUserKeyPair(db)
|
||||||
|
|
||||||
|
expect(keyPair?.publicKey)
|
||||||
|
.to(equal("Test3".data(using: .utf8)?.bytes))
|
||||||
|
expect(keyPair?.secretKey)
|
||||||
|
.to(equal("Test4".data(using: .utf8)?.bytes))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
it("correctly determines if the user exists") {
|
||||||
|
mockStorage.write { db in
|
||||||
|
try Identity(variant: .x25519PublicKey, data: "Test3".data(using: .utf8)!).insert(db)
|
||||||
|
try Identity(variant: .x25519PrivateKey, data: "Test4".data(using: .utf8)!).insert(db)
|
||||||
|
}
|
||||||
|
|
||||||
|
mockStorage.read { db in
|
||||||
|
expect(Identity.userExists(db))
|
||||||
|
.to(equal(true))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
it("correctly retrieves the user ED25519 key pair") {
|
||||||
|
mockStorage.write { db in
|
||||||
|
try Identity(variant: .ed25519PublicKey, data: "Test5".data(using: .utf8)!).insert(db)
|
||||||
|
try Identity(variant: .ed25519SecretKey, data: "Test6".data(using: .utf8)!).insert(db)
|
||||||
|
}
|
||||||
|
|
||||||
|
mockStorage.read { db in
|
||||||
|
let keyPair = Identity.fetchUserEd25519KeyPair(db)
|
||||||
|
|
||||||
|
expect(keyPair?.publicKey)
|
||||||
|
.to(equal("Test5".data(using: .utf8)?.bytes))
|
||||||
|
expect(keyPair?.secretKey)
|
||||||
|
.to(equal("Test6".data(using: .utf8)?.bytes))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
it("correctly retrieves the hex encoded seed") {
|
||||||
|
mockStorage.write { db in
|
||||||
|
try Identity(variant: .seed, data: "Test7".data(using: .utf8)!).insert(db)
|
||||||
|
}
|
||||||
|
|
||||||
|
mockStorage.read { db in
|
||||||
|
expect(Identity.fetchHexEncodedSeed(db))
|
||||||
|
.to(equal("5465737437"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue