Remove auto signup (#154)

defaultdino · web-flow · commit 76754381510a · 2025-02-03T20:12:55.000+01:00
* Remove all references

* Remove kubernetes scheme and auto signup

* Bump version to proper
diff --git a/App/Core/Factories/PopupFactory.swift b/App/Core/Factories/PopupFactory.swift
@@ -115,24 +115,6 @@ class PopupFactory {
         )
     }
     
-    func autoSignupEnabled() -> Popup {
-        Popup(
-            type: .info,
-            title: NSLocalizedString("Automatic signup", comment: ""),
-            message: NSLocalizedString(
-                "Automatic exam/event signup has been enabled, but make sure you are always registered for exams through your institution.",
-                comment: "")
-        )
-    }
-    
-    func autoSignupDisabled() -> Popup {
-        Popup(
-            type: .info,
-            title: NSLocalizedString("Automatic signup", comment: ""),
-            message: NSLocalizedString("Automatic exam/event signup has been disabled.", comment: "")
-        )
-    }
-    
     func genericError() -> Popup {
         Popup(type: .error, title: NSLocalizedString("Something went wrong", comment: ""))
     }
diff --git a/App/Core/NetworkSettings/NetworkSettings.swift b/App/Core/NetworkSettings/NetworkSettings.swift
@@ -22,11 +22,6 @@ struct NetworkSettings {
         static let development = NetworkSettings(
             port: 7036, scheme: "http", tumbleUrl: "localhost"
         )
-        
-        // Port forward whatever the backend service is to port 80
-        static let kubernetes = NetworkSettings(
-            port: 32157, scheme: "http", tumbleUrl: "localhost"
-        )
     }
 
     let port: Int
diff --git a/App/Data/Repository/Preferences/PreferenceManager.swift b/App/Data/Repository/Preferences/PreferenceManager.swift
@@ -16,7 +16,6 @@ class PreferenceManager: ObservableObject {
     @Published var userOnboarded: Bool
     @Published var authSchoolId: Int
     @Published var appearance: AppearanceType  // Using AppearanceType directly
-    @Published var autoSignup: Bool
     @Published var notificationOffset: NotificationOffset  // Using NotificationOffset directly
     @Published var language: String
     @Published var viewTypeIndex: Int
@@ -31,7 +30,6 @@ class PreferenceManager: ObservableObject {
         onboardingPreference: OnboardingPreference = OnboardingPreference(),
         authSchoolPreference: AuthSchoolPreference = AuthSchoolPreference(),
         appearancePreference: AppearancePreference = AppearancePreference(),
-        autoSignupPreference: AutoSignupPreference = AutoSignupPreference(),
         notificationOffsetPreference: NotificationOffsetPreference = NotificationOffsetPreference(),
         languagePreference: LanguagePreference = LanguagePreference(),
         viewTypePreference: ViewTypeIndexPreference = ViewTypeIndexPreference(),
@@ -43,7 +41,6 @@ class PreferenceManager: ObservableObject {
         self.userOnboarded = onboardingPreference.get()
         self.authSchoolId = authSchoolPreference.get()
         self.appearance = AppearanceType.fromRawValue(appearancePreference.get()) ?? .system  // Convert String to enum
-        self.autoSignup = autoSignupPreference.get()
         self.notificationOffset = NotificationOffset(rawValue: notificationOffsetPreference.get()) ?? .hour  // Convert Int to enum
         self.language = languagePreference.get()
         self.viewTypeIndex = viewTypePreference.get()
@@ -56,7 +53,6 @@ class PreferenceManager: ObservableObject {
         bindPreference($userOnboarded, initialValue: userOnboarded, to: onboardingPreference)
         bindPreference($authSchoolId, initialValue: authSchoolId, to: authSchoolPreference)
         bindEnumPreference($appearance, initialValue: appearance, to: appearancePreference)  // Special handling for AppearanceType
-        bindPreference($autoSignup, initialValue: autoSignup, to: autoSignupPreference)
         bindEnumPreference($notificationOffset, initialValue: notificationOffset, to: notificationOffsetPreference)  // Special handling for NotificationOffset
         bindPreference($language, initialValue: language, to: languagePreference)
         bindPreference($viewTypeIndex, initialValue: viewTypeIndex, to: viewTypePreference)
diff --git a/App/Data/Repository/Preferences/Services/AutoSingupPreference.swift b/App/Data/Repository/Preferences/Services/AutoSingupPreference.swift
diff --git a/App/Domain/Model/Preferences/SharedPreferenceKey.swift b/App/Domain/Model/Preferences/SharedPreferenceKey.swift
@@ -13,7 +13,6 @@ enum SharedPreferenceKey: String {
     case userOnboarded = "user_onboarded"
     case locale = "locale"
     case notificationOffset = "notification_offset"
-    case autoSignup = "auto_signup"
     case viewType = "view_type"
     case networkSettings = "network_settings"
     case lastUpdated = "last_updated"
diff --git a/App/Extensions/Presentation/Types/NetworkExtensions.swift b/App/Extensions/Presentation/Types/NetworkExtensions.swift
@@ -15,8 +15,6 @@ extension NetworkSettings {
         switch resolvedEnvironment {
         case "development":
             self = Environments.development
-        case "kubernetes":
-            self = Environments.kubernetes
         default:
             self = Environments.production
         }
diff --git a/App/Observables/ViewModels/AccountViewModel.swift b/App/Observables/ViewModels/AccountViewModel.swift
@@ -29,7 +29,6 @@ final class AccountViewModel: ObservableObject {
     @Published var resourceDetailsSheetModel: ResourceDetailSheetModel? = nil
     @Published var examDetailSheetModel: ExamDetailSheetModel? = nil
     @Published var authSchoolId: Int = -1
-    @Published var autoSignupEnabled: Bool = false
     @Published var registeredForExams: Bool = false
     @Published var currentUser: String = ""
     
@@ -81,25 +80,16 @@ final class AccountViewModel: ObservableObject {
     private func setupPublishers() {
         let authStatusPublisher = userController.$authStatus.receive(on: RunLoop.main)
         let authSchoolIdPublisher = preferenceManager.$authSchoolId.receive(on: RunLoop.main)
-        let autoSignupPublisher = preferenceManager.$autoSignup.receive(on: RunLoop.main)
         let currentUserPublisher = preferenceManager.$currentUser.receive(on: RunLoop.main)
 
-        Publishers.CombineLatest4(authStatusPublisher, authSchoolIdPublisher, autoSignupPublisher, currentUserPublisher)
-            .sink { [weak self] authStatus, authSchoolId, autoSignupEnabled, currentUser in
+        Publishers.CombineLatest3(authStatusPublisher, authSchoolIdPublisher, currentUserPublisher)
+            .sink { [weak self] authStatus, authSchoolId, currentUser in
                 guard let self else { return }
                 
                 DispatchQueue.main.async {
                     self.authStatus = authStatus
                     self.authSchoolId = authSchoolId
-                    self.autoSignupEnabled = autoSignupEnabled
                     self.currentUser = currentUser
-
-                    if authStatus == .authorized && !self.registeredForExams && self.autoSignupEnabled {
-                        Task.detached(priority: .userInitiated) {
-                            AppLogger.shared.debug("Auto signup is \(autoSignupEnabled), registering for exams")
-                            await self.registerAutoSignup()
-                        }
-                    }
                 }
             }
             .store(in: &cancellables)
@@ -241,18 +231,6 @@ final class AccountViewModel: ObservableObject {
         }
     }
     
-    /// Registers the user for automatic event/exam signup,
-    /// and attempts to sign up for any currently available exams/events
-    func toggleAutoSignup(value: Bool) {
-        preferenceManager.autoSignup.toggle()
-        if value && !self.registeredForExams {
-            Task {
-                await registerAutoSignup()
-            }
-            getResourcesAndEvents()
-        }
-    }
-    
     /// Decides if there are any user bookings for the current user, and if so attempts
     /// to schedule any confirmation notifications for those bookings
     func checkNotificationsForUserBookings(bookings: Response.KronoxUserBookings? = nil) async {
@@ -273,8 +251,8 @@ final class AccountViewModel: ObservableObject {
             }
         } catch {
             AppLogger.shared.debug("\(error)")
-            DispatchQueue.main.async {
-                self.bookingSectionState = .error
+            DispatchQueue.main.async { [weak self] in
+                self?.bookingSectionState = .error
             }
         }
     }
@@ -298,21 +276,6 @@ final class AccountViewModel: ObservableObject {
             }
         }
     }
-
-    /// Registers for any available events through auto signup
-    func registerAutoSignup() async {
-        AppLogger.shared.debug("Attempting to automatically sign up for exams")
-        do {
-            let request = Endpoint.registerAllEvents(schoolId: String(authSchoolId))
-            let _: Response.KronoxEventRegistration?
-            = try await kronoxManager.put(
-                request, refreshToken: userController.refreshToken?.value,
-                sessionDetails: userController.sessionDetails?.value, body: NetworkRequest.Empty())
-            self.registeredForExams = true
-        } catch {
-            AppLogger.shared.error("Failed to sign up for exams: \(error)")
-        }
-    }
     
     /// Sets current user, updates tokens in keychain, updates user resources
     func setCurrentUser(to user: String) async {
diff --git a/App/Observables/ViewModels/SettingsViewModel.swift b/App/Observables/ViewModels/SettingsViewModel.swift
@@ -40,14 +40,6 @@ final class SettingsViewModel: ObservableObject {
             }
         }
     }
-    @Published var autoSignup: Bool = false {
-        didSet {
-            if oldValue != autoSignup {
-                AppLogger.shared.debug("Auto signup is \(autoSignup)")
-                self.setAutoSignup(value: autoSignup)
-            }
-        }
-    }
     @Published var openEventFromWidget: Bool = true {
         didSet {
             if oldValue != openEventFromWidget {
@@ -69,7 +61,6 @@ final class SettingsViewModel: ObservableObject {
         let authSchoolIdPublisher = preferenceManager.$authSchoolId.receive(on: RunLoop.main)
         let appearancePublisher = preferenceManager.$appearance.receive(on: RunLoop.main)
         let notificationOffsetPublisher = preferenceManager.$notificationOffset.receive(on: RunLoop.main)
-        let autoSignupPublisher = preferenceManager.$autoSignup.receive(on: RunLoop.main)
         let openEventFromWidgetPublisher = preferenceManager.$openEventFromWidget.receive(on: RunLoop.main)
         let authStatusPublisher = userController.$authStatus.receive(on: RunLoop.main)
         
@@ -83,9 +74,8 @@ final class SettingsViewModel: ObservableObject {
             }
             .store(in: &cancellables)
         
-        Publishers.CombineLatest3(autoSignupPublisher, authStatusPublisher, openEventFromWidgetPublisher)
-            .sink { [weak self] autoSignup, authStatus, openEventFromWidget in
-                self?.autoSignup = autoSignup
+        Publishers.CombineLatest(authStatusPublisher, openEventFromWidgetPublisher)
+            .sink { [weak self] authStatus, openEventFromWidget in
                 self?.authStatus = authStatus
                 self?.openEventFromWidget = openEventFromWidget
             }
@@ -193,10 +183,6 @@ final class SettingsViewModel: ObservableObject {
     func setNotificationOffset(offset: NotificationOffset) {
         preferenceManager.notificationOffset = offset
     }
-    
-    func setAutoSignup(value: Bool) {
-        preferenceManager.autoSignup = value
-    }
 
     func setOpenEventFromWidget(value: Bool) {
         preferenceManager.openEventFromWidget = value
diff --git a/App/Presentation/Views/Settings/Preferences/PreferenceSettings.swift b/App/Presentation/Views/Settings/Preferences/PreferenceSettings.swift
@@ -60,15 +60,6 @@ struct PreferenceSettings: View {
                     leadingIconBackgroundColor: Color(uiColor: UIColor.systemTeal),
                     condition: $viewModel.openEventFromWidget
                 )
-                if viewModel.authStatus == .authorized {
-                    Divider()
-                    SettingsToggleButton(
-                        title: NSLocalizedString("Automatic exam signup", comment: ""),
-                        leadingIcon: "paperclip",
-                        leadingIconBackgroundColor: .primary,
-                        condition: $viewModel.autoSignup
-                    )
-                }
             }
         }
     }
diff --git a/Assets/ar.lproj/Localizable.strings b/Assets/ar.lproj/Localizable.strings
@@ -345,12 +345,6 @@
 
 "We couldn't unbook the specified resource"="لم نتمكن من إلغاء حجز المصدر المحدد";
 
-"Automatic signup"="التسجيل التلقائي";
-
-"Automatic exam/event signup has been enabled, but make sure you are always registered for exams through your institution."="تم تمكين التسجيل التلقائي للاختبارات/الأحداث، ولكن تأكد من تسجيلك دائمًا للاختبارات من خلال مؤسستك.";
-
-"Automatic exam/event signup has been disabled."="تم تعطيل التسجيل التلقائي للاختبارات/الأحداث.";
-
 "See all"="عرض الكل";
 
 "Book more"="حجز المزيد";
diff --git a/Assets/bs-BA.lproj/Localizable.strings b/Assets/bs-BA.lproj/Localizable.strings
@@ -344,12 +344,6 @@
 
 "We couldn't unbook the specified resource"="Nismo mogli poništiti rezervaciju navedenog resursa";
 
-"Automatic signup"="Automatska prijava";
-
-"Automatic exam/event signup has been enabled, but make sure you are always registered for exams through your institution."="Automatska prijava za ispit/događaj je omogućena, ali vodite računa da ste uvijek prijavljeni za ispite preko svoje institucije.";
-
-"Automatic exam/event signup has been disabled."="Automatska prijava na ispit/događaj je onemogućena.";
-
 "See all"="Vidjeti sve";
 
 "Book more"="Rezervišite više";
diff --git a/Assets/de.lproj/Localizable.strings b/Assets/de.lproj/Localizable.strings
@@ -344,12 +344,6 @@
 
 "We couldn't unbook the specified resource"="Wir konnten die angegebene Ressource nicht abbuchen";
 
-"Automatic signup"="Automatische Anmeldung";
-
-"Automatic exam/event signup has been enabled, but make sure you are always registered for exams through your institution."="Die automatische Prüfungs-/Veranstaltungsanmeldung wurde aktiviert, aber stellen sie sicher, dass sie sich immer über ihre Institution für Prüfungen angemeldet haben.";
-
-"Automatic exam/event signup has been disabled."="Die automatische Prüfungs-/Veranstaltungsanmeldung wurde deaktiviert.";
-
 "See all"="Alles sehen";
 
 "Book more"="Buchen sie mehr";
diff --git a/Assets/en.lproj/Localizable.strings b/Assets/en.lproj/Localizable.strings
@@ -340,12 +340,6 @@
 
 "We couldn't unbook the specified resource"="We couldn't unbook the specified resource";
 
-"Automatic signup"="Automatic signup";
-
-"Automatic exam/event signup has been enabled, but make sure you are always registered for exams through your institution."="Automatic exam/event signup has been enabled, but make sure you are always registered for exams through your institution.";
-
-"Automatic exam/event signup has been disabled."="Automatic exam/event signup has been disabled.";
-
 "See all"="See all";
 
 "Book more"="Book more";
diff --git a/Assets/fr.lproj/Localizable.strings b/Assets/fr.lproj/Localizable.strings
@@ -344,12 +344,6 @@
 
 "We couldn't unbook the specified resource"="Nous n'avons pas pu annuler la réservation de la ressource spécifiée";
 
-"Automatic signup"="Inscription automatique";
-
-"Automatic exam/event signup has been enabled, but make sure you are always registered for exams through your institution."="L'inscription automatique aux examens/événements a été activée, mais assurez-vous que vous êtes toujours inscrit aux examens par l'intermédiaire de votre établissement.";
-
-"Automatic exam/event signup has been disabled."="L'inscription automatique aux examens/événements a été désactivée.";
-
 "See all"="Voir tout";
 
 "Book more"="Réserver plus";
diff --git a/Assets/it.lproj/Localizable.strings b/Assets/it.lproj/Localizable.strings
@@ -344,12 +344,6 @@
 
 "We couldn't unbook the specified resource"="Non è stato possibile annullare la prenotazione della risorsa specificata";
 
-"Automatic signup"="Iscrizione automatica";
-
-"Automatic exam/event signup has been enabled, but make sure you are always registered for exams through your institution."="L'iscrizione automatica a esami/eventi è stata abilitata, ma assicurati di essere sempre registrato agli esami tramite il tuo istituto.";
-
-"Automatic exam/event signup has been disabled."="L'iscrizione automatica a esami/eventi è stata disabilitata.";
-
 "See all"="Vedi tutto";
 
 "Book more"="Prenota di più";
diff --git a/Assets/ru.lproj/Localizable.strings b/Assets/ru.lproj/Localizable.strings
@@ -340,12 +340,6 @@
 
 "We couldn't unbook the specified resource"="Мы не смогли отменить выбранный ресурс";
 
-"Automatic signup"="Автоматическая запись";
-
-"Automatic exam/event signup has been enabled, but make sure you are always registered for exams through your institution."="Автоматическая регистрация на экзамены/события включена, но убедитесь, что вы всегда регистрируетесь на экзамены через своё учебное заведение.";
-
-"Automatic exam/event signup has been disabled."="Автоматическая регистрация на экзамены/события отменена";
-
 "See all"="Посмотреть все";
 
 "Book more"="Добавить ещё";
diff --git a/Assets/sv.lproj/Localizable.strings b/Assets/sv.lproj/Localizable.strings
@@ -344,12 +344,6 @@
 
 "We couldn't unbook the specified resource"="Vi kunde inte avboka den angivna resursen";
 
-"Automatic signup"="Automatisk registrering";
-
-"Automatic exam/event signup has been enabled, but make sure you are always registered for exams through your institution."="Automatisk examens-/eventregistrering har aktiverats, men se till att du alltid är registrerad för examen via din institution.";
-
-"Automatic exam/event signup has been disabled."="Automatisk examen/eventregistrering har inaktiverats.";
-
 "See all"="Se allt";
 
 "Book more"="Boka mer";
diff --git a/Tumble.xcodeproj/project.pbxproj b/Tumble.xcodeproj/project.pbxproj
diff --git a/Tumble.xcodeproj/xcshareddata/xcschemes/Tumble-DEV.xcscheme b/Tumble.xcodeproj/xcshareddata/xcschemes/Tumble-DEV.xcscheme
diff --git a/Tumble.xcodeproj/xcshareddata/xcschemes/Tumble-KUBERNETES.xcscheme b/Tumble.xcodeproj/xcshareddata/xcschemes/Tumble-KUBERNETES.xcscheme
diff --git a/Tumble.xcodeproj/xcshareddata/xcschemes/Tumble-PROD.xcscheme b/Tumble.xcodeproj/xcshareddata/xcschemes/Tumble-PROD.xcscheme
diff --git a/Tumble.xcodeproj/xcshareddata/xcschemes/Tumble-RELEASE.xcscheme b/Tumble.xcodeproj/xcshareddata/xcschemes/Tumble-RELEASE.xcscheme
diff --git a/Tumble.xcodeproj/xcshareddata/xcschemes/WidgetExtension.xcscheme b/Tumble.xcodeproj/xcshareddata/xcschemes/WidgetExtension.xcscheme

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,6 @@ struct NetworkSettings {`
`22`	`22`	`static let development = NetworkSettings(`
`23`	`23`	`port: 7036, scheme: "http", tumbleUrl: "localhost"`
`24`	`24`	`)`
`25`		`-`
`26`		`- // Port forward whatever the backend service is to port 80`
`27`		`- static let kubernetes = NetworkSettings(`
`28`		`- port: 32157, scheme: "http", tumbleUrl: "localhost"`
`29`		`- )`
`30`	`25`	`}`
`31`	`26`
`32`	`27`	`let port: Int`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@ extension NetworkSettings {`
`15`	`15`	`switch resolvedEnvironment {`
`16`	`16`	`case "development":`
`17`	`17`	`self = Environments.development`
`18`		`- case "kubernetes":`
`19`		`- self = Environments.kubernetes`
`20`	`18`	`default:`
`21`	`19`	`self = Environments.production`
`22`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,15 +60,6 @@ struct PreferenceSettings: View {`
`60`	`60`	`leadingIconBackgroundColor: Color(uiColor: UIColor.systemTeal),`
`61`	`61`	`condition: $viewModel.openEventFromWidget`
`62`	`62`	`)`
`63`		`- if viewModel.authStatus == .authorized {`
`64`		`- Divider()`
`65`		`- SettingsToggleButton(`
`66`		`- title: NSLocalizedString("Automatic exam signup", comment: ""),`
`67`		`- leadingIcon: "paperclip",`
`68`		`- leadingIconBackgroundColor: .primary,`
`69`		`- condition: $viewModel.autoSignup`
`70`		`- )`
`71`		`- }`
`72`	`63`	`}`
`73`	`64`	`}`
`74`	`65`	`}`