staxriver
/
LeStorage
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds user uuid system to use with subscriptions

Browse Source
multistore
Laurent 2 years ago
parent 92b35c7c0f
commit 4939888dd5
7 changed files with 125 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 26
      LeStorage.xcodeproj/project.pbxproj
  2. 0
      LeStorage/Codables/ApiCall.swift
  3. 22
      LeStorage/Codables/Settings.swift
  4. 46
      LeStorage/MicroStorage.swift
  5. 21
      LeStorage/Services.swift
  6. 17
      LeStorage/Store.swift
  7. 1
      LeStorage/StoredCollection.swift

26
LeStorage.xcodeproj/project.pbxproj
Unescape View File

@ -18,12 +18,14 @@
C4A47D552B6D2DBF00ADC637 /* FileUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D542B6D2DBF00ADC637 /* FileUtils.swift */; };
C4A47D612B6D3C1300ADC637 /* Services.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D602B6D3C1300ADC637 /* Services.swift */; };
C4A47D652B6E92FE00ADC637 /* Storable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D642B6E92FE00ADC637 /* Storable.swift */; };
C4A47D672B6FF83A00ADC637 /* ApiCall.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D662B6FF83A00ADC637 /* ApiCall.swift */; };
C4A47D6B2B71244100ADC637 /* Collection+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D6A2B71244100ADC637 /* Collection+Extension.swift */; };
C4A47D6D2B71364600ADC637 /* ModelObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D6C2B71364600ADC637 /* ModelObject.swift */; };
C4A47D6F2B7154F600ADC637 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = C4A47D6E2B7154F600ADC637 /* README.md */; };
C4A47D812B7665AD00ADC637 /* Migration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D802B76658F00ADC637 /* Migration.swift */; };
C4A47D842B7B97F000ADC637 /* KeychainStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D832B7B97F000ADC637 /* KeychainStore.swift */; };
C4A47D942B7CF7C500ADC637 /* MicroStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D932B7CF7C500ADC637 /* MicroStorage.swift */; };
C4A47D9B2B7CFFDA00ADC637 /* ApiCall.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D992B7CFFC500ADC637 /* ApiCall.swift */; };
C4A47D9C2B7CFFE000ADC637 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A47D9A2B7CFFC500ADC637 /* Settings.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -49,12 +51,14 @@
C4A47D542B6D2DBF00ADC637 /* FileUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileUtils.swift; sourceTree = "<group>"; };
C4A47D602B6D3C1300ADC637 /* Services.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Services.swift; sourceTree = "<group>"; };
C4A47D642B6E92FE00ADC637 /* Storable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Storable.swift; sourceTree = "<group>"; };
C4A47D662B6FF83A00ADC637 /* ApiCall.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiCall.swift; sourceTree = "<group>"; };
C4A47D6A2B71244100ADC637 /* Collection+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Collection+Extension.swift"; sourceTree = "<group>"; };
C4A47D6C2B71364600ADC637 /* ModelObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelObject.swift; sourceTree = "<group>"; };
C4A47D6E2B7154F600ADC637 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
C4A47D802B76658F00ADC637 /* Migration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Migration.swift; sourceTree = "<group>"; };
C4A47D832B7B97F000ADC637 /* KeychainStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeychainStore.swift; sourceTree = "<group>"; };
C4A47D932B7CF7C500ADC637 /* MicroStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicroStorage.swift; sourceTree = "<group>"; };
C4A47D992B7CFFC500ADC637 /* ApiCall.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiCall.swift; sourceTree = "<group>"; };
C4A47D9A2B7CFFC500ADC637 /* Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -100,12 +104,13 @@
C4A47D6E2B7154F600ADC637 /* README.md */,
C425D4372B6D24E1002A7B48 /* LeStorage.h */,
C425D4382B6D24E1002A7B48 /* LeStorage.docc */,
C4A47D602B6D3C1300ADC637 /* Services.swift */,
C4A47D662B6FF83A00ADC637 /* ApiCall.swift */,
C4A47D9D2B7CFFF500ADC637 /* Codables */,
C4A47D6C2B71364600ADC637 /* ModelObject.swift */,
C4A47D602B6D3C1300ADC637 /* Services.swift */,
C425D4572B6D2519002A7B48 /* Store.swift */,
C4A47D642B6E92FE00ADC637 /* Storable.swift */,
C4A47D4E2B6D280200ADC637 /* StoredCollection.swift */,
C4A47D932B7CF7C500ADC637 /* MicroStorage.swift */,
C4A47D822B7665BC00ADC637 /* Wip */,
C4A47D582B6D352900ADC637 /* Utils */,
);
@ -140,6 +145,15 @@
path = Wip;
sourceTree = "<group>";
};
C4A47D9D2B7CFFF500ADC637 /* Codables */ = {
isa = PBXGroup;
children = (
C4A47D9A2B7CFFC500ADC637 /* Settings.swift */,
C4A47D992B7CFFC500ADC637 /* ApiCall.swift */,
);
path = Codables;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@ -259,8 +273,10 @@
C4A47D652B6E92FE00ADC637 /* Storable.swift in Sources */,
C4A47D6D2B71364600ADC637 /* ModelObject.swift in Sources */,
C4A47D4F2B6D280200ADC637 /* StoredCollection.swift in Sources */,
C4A47D9C2B7CFFE000ADC637 /* Settings.swift in Sources */,
C4A47D812B7665AD00ADC637 /* Migration.swift in Sources */,
C4A47D672B6FF83A00ADC637 /* ApiCall.swift in Sources */,
C4A47D9B2B7CFFDA00ADC637 /* ApiCall.swift in Sources */,
C4A47D942B7CF7C500ADC637 /* MicroStorage.swift in Sources */,
C425D4582B6D2519002A7B48 /* Store.swift in Sources */,
C4A47D6B2B71244100ADC637 /* Collection+Extension.swift in Sources */,
);

0
LeStorage/ApiCall.swift → LeStorage/Codables/ApiCall.swift
Unescape View File

22
LeStorage/Codables/Settings.swift
Unescape View File

@ -0,0 +1,22 @@
//
// Settings.swift
// LeStorage
//
// Created by Laurent Morvillier on 14/02/2024.
//
import Foundation
class Settings: MicroStorable {
static var fileName: String { "settings.json" }
required init() {
}
var id: String = Store.randomId()
var userUUID: UUID? = nil
}

46
LeStorage/MicroStorage.swift
Unescape View File

@ -0,0 +1,46 @@
//
// StoredItem.swift
// LeStorage
//
// Created by Laurent Morvillier on 14/02/2024.
//
import Foundation
protocol MicroStorable : Codable {
init()
static var fileName: String { get }
}
class MicroStorage<T : MicroStorable> {
fileprivate(set) var item: T
init() {
var instance: T? = nil
do {
let jsonString = try FileUtils.readDocumentFile(fileName: T.fileName)
if let decoded: T = try jsonString.decode() {
instance = decoded
}
} catch {
Logger.error(error)
}
self.item = instance ?? T()
}
func update(handler: (T) -> ()) {
handler(self.item)
self._write()
}
fileprivate func _write() {
do {
let jsonString: String = try self.item.jsonString()
let _ = try FileUtils.writeToDocumentDirectory(content: jsonString, fileName: T.fileName)
} catch {
Logger.error(error)
}
}
}

21
LeStorage/Services.swift
Unescape View File

@ -16,6 +16,7 @@ enum Method: String {
enum ServiceError: Error {
case urlCreationError(url: String)
case cantConvertToUUID(id: String)
}
public class Services {
@ -119,7 +120,6 @@ public class Services {
// MARK: - Authentication
public func createAccount(username: String, password: String, email: String) async throws {
var postRequest = try self._baseRequest(servicePath: "users/", method: .post)
let user = User(username: username, password: password, email: email)
postRequest.httpBody = try jsonEncoder.encode(user)
@ -135,6 +135,13 @@ public class Services {
return response.token
}
public func login(username: String, password: String) async throws -> User {
var postRequest = try self._baseRequest(servicePath: "users/", method: .post)
let credentials = Credentials(username: username, password: password)
postRequest.httpBody = try jsonEncoder.encode(credentials)
return try await self.runRequest(postRequest)
}
func forgotPassword(user: User) async throws {
// var postRequest = try self._baseRequest(servicePath: "forgot-password/", method: .post)
@ -157,9 +164,17 @@ struct Credentials: Codable {
var password: String
}
struct User: Codable {
var id: Int = 0
public struct User: Codable {
var id: String = Store.randomId()
var username: String
var password: String?
var email: String?
func uuid() throws -> UUID {
if let uuid = UUID(uuidString: self.id) {
return uuid
}
throw ServiceError.cantConvertToUUID(id: self.id)
}
}

17
LeStorage/Store.swift
Unescape View File

@ -6,6 +6,7 @@
//
import Foundation
import UIKit
enum StoreError: Error {
case missingService
@ -20,6 +21,8 @@ public class Store {
/// The Store singleton
public static let main = Store()
// public fileprivate(set) var currentUser: User? = nil
/// A method to provide ids corresponding to the django storage
public static func randomId() -> String {
return UUID().uuidString.lowercased()
@ -50,6 +53,8 @@ public class Store {
fileprivate lazy var _migrationCollection: StoredCollection<MigrationHistory> = { StoredCollection(synchronized: false, store: Store.main, asynchronousIO: false)
}()
fileprivate var settingsStorage: MicroStorage<Settings> = MicroStorage()
public init() { }
/// Registers a collection
@ -70,6 +75,18 @@ public class Store {
return collection
}
public func currentUserUUID() throws -> UUID {
if let uuid = self.settingsStorage.item.userUUID {
return uuid
} else {
let uuid = UIDevice.current.identifierForVendor ?? UUID()
self.settingsStorage.update { settings in
settings.userUUID = uuid
}
return uuid
}
}
/// The service instance
public var service: Services? {
return self._services

1
LeStorage/StoredCollection.swift
Unescape View File

@ -10,6 +10,7 @@ import Foundation
enum StoredCollectionError : Error {
case unmanagedHTTPMethod(method: String)
case missingApiCallCollection
case missingInstance
}
protocol SomeCollection : Identifiable {

Write Preview
Loading…
Cancel
Save