Skip to content

fix: auth flow fix #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dk-a-dev merged 1 commit into from
Jul 17, 2025
Merged

fix: auth flow fix #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions VITTY/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ struct ContentView: View {

var body: some View {
Group {
// Check if backend user exists first

if authViewModel.loggedInBackendUser != nil {
HomeView()
}
// If no backend user but Firebase user exists, show instruction

else if authViewModel.loggedInFirebaseUser != nil {
InstructionView()
}
// If neither exists, show login

else {
LoginView()
}
Expand Down
4 changes: 4 additions & 0 deletions VITTY/VITTY.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
4B37F1E62E03D7D300DCEE5F /* ExistingHotelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B37F1E52E03D7D300DCEE5F /* ExistingHotelView.swift */; };
4B37F1E92E04173A00DCEE5F /* SettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B37F1E82E04173500DCEE5F /* SettingsViewModel.swift */; };
4B40E1DA2E27E133004F8447 /* SettingsTololtip.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B40E1D92E27E12B004F8447 /* SettingsTololtip.swift */; };
4B40E1DC2E28D0C0004F8447 /* EmptyTimeTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B40E1DB2E28D0B9004F8447 /* EmptyTimeTable.swift */; };
4B40FE5D2E0A917F000BDD07 /* QrCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B40FE5C2E0A9179000BDD07 /* QrCode.swift */; };
4B47CD7B2D7DCB8B00A46FEF /* CreateReminder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B47CD7A2D7DCB8400A46FEF /* CreateReminder.swift */; };
4B5977472DF97D5C009CC224 /* RemainderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5977462DF97D5A009CC224 /* RemainderModel.swift */; };
Expand Down Expand Up @@ -205,6 +206,7 @@
4B37F1E52E03D7D300DCEE5F /* ExistingHotelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExistingHotelView.swift; sourceTree = "<group>"; };
4B37F1E82E04173500DCEE5F /* SettingsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewModel.swift; sourceTree = "<group>"; };
4B40E1D92E27E12B004F8447 /* SettingsTololtip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTololtip.swift; sourceTree = "<group>"; };
4B40E1DB2E28D0B9004F8447 /* EmptyTimeTable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyTimeTable.swift; sourceTree = "<group>"; };
4B40FE5C2E0A9179000BDD07 /* QrCode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QrCode.swift; sourceTree = "<group>"; };
4B47CD7A2D7DCB8400A46FEF /* CreateReminder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateReminder.swift; sourceTree = "<group>"; };
4B5977462DF97D5A009CC224 /* RemainderModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemainderModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -863,6 +865,7 @@
527E3E042B7662760086F23D /* Views */ = {
isa = PBXGroup;
children = (
4B40E1DB2E28D0B9004F8447 /* EmptyTimeTable.swift */,
527E3E072B7662920086F23D /* TimeTableView.swift */,
525F759C2B809F8400E3B418 /* LectureDetailView.swift */,
4B7DA5DB2D708BCD007354A3 /* LectureItemView.swift */,
Expand Down Expand Up @@ -1160,6 +1163,7 @@
4B7DA5DC2D708BD3007354A3 /* LectureItemView.swift in Sources */,
4B37F1E62E03D7D300DCEE5F /* ExistingHotelView.swift in Sources */,
4BC853C32DF693780092B2E2 /* SaveTimeTableView.swift in Sources */,
4B40E1DC2E28D0C0004F8447 /* EmptyTimeTable.swift in Sources */,
52D5AB892B6FE3B200B2E66D /* AppUser.swift in Sources */,
31128D0C277300470084C9EA /* StringConstants.swift in Sources */,
4B341C102E1803070073906B /* FreindRequestViewModel.swift in Sources */,
Expand Down
32 changes: 19 additions & 13 deletions VITTY/VITTY/Auth/Models/AppUser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,23 @@
import Foundation

class AppUser: Codable {
let name: String
let picture: String
let role: String
let token: String
let username: String

init(name: String, picture: String, role: String, token: String, username: String) {
self.name = name
self.picture = picture
self.role = role
self.token = token
self.username = username
}
let name: String
let picture: String
let role: String
let token: String
let username: String
let campus: String?

init(name: String, picture: String, role: String, token: String, username: String, campus: String?) {
self.name = name
self.picture = picture
self.role = role
self.token = token
self.username = username
self.campus = campus
}

var hasCampus: Bool {
return campus != nil && !campus!.isEmpty
}
}
7 changes: 4 additions & 3 deletions VITTY/VITTY/Auth/Models/AuthRequestBody.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
import Foundation

struct AuthRequestBody: Codable {
let uuid: String
let reg_no: String
let username: String
let uuid: String
let reg_no: String
let username: String
let campus: String
}
Loading
Loading