Merge pull request #154 from TaskarCenterAtUW/feature-prod-env

Add prod env

Author: iAKM

GoInfoGame/GoInfoGame.xcodeproj/project.pbxproj

@@ -2603,10 +2603,10 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 4;
-				DEVELOPMENT_TEAM = NPCMG529DV;
+				DEVELOPMENT_TEAM = G8MQVE5WWW;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = GoInfoGame/Info.plist;
-				INFOPLIST_KEY_NSCameraUsageDescription = "This app requires to access your camera to measure width of sidewalk";
+				INFOPLIST_KEY_NSCameraUsageDescription = "This app requires access to your camera to upload images to Kartaview";
 				INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "";
 				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "We need your location";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "We need your location";
@@ -2644,7 +2644,7 @@
 				DEVELOPMENT_TEAM = G8MQVE5WWW;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = GoInfoGame/Info.plist;
-				INFOPLIST_KEY_NSCameraUsageDescription = "This app requires to access your camera to measure width of sidewalk";
+				INFOPLIST_KEY_NSCameraUsageDescription = "This app requires access to your camera to upload images to Kartaview";
 				INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "";
 				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "We need your location";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "We need your location";

GoInfoGame/GoInfoGame/Network/APIEnvironment.swift

@@ -10,7 +10,7 @@ import Foundation
 enum APIEnvironment: String, CaseIterable {
     case development = "Development"
     case staging = "Staging"
-//    case production = "Production"
+    case production = "Production"
 //    case osm = "OSM"
 //
     var workspaceBaseURL: String {
@@ -19,10 +19,8 @@ enum APIEnvironment: String, CaseIterable {
             return "https://api.workspaces-dev.sidewalks.washington.edu/api/v1"
         case .staging:
             return "https://api.workspaces-stage.sidewalks.washington.edu/api/v1"
-//        case .production:
-//            return "https://api.workspaces-prod.sidewalks.washington.edu/api/v1"
-//        case .osm:
-//            return ""
+        case .production:
+            return "https://workspaces.sidewalks.washington.edu/api/v1"
         }
     }
 
@@ -32,10 +30,8 @@ enum APIEnvironment: String, CaseIterable {
             return "https://tdei-api-dev.azurewebsites.net/api/v1"
         case .staging:
             return "https://tdei-gateway-stage.azurewebsites.net/api/v1"
-//        case .production:
-//            return "https://tdei-gateway-prod.azurewebsites.net/api/v1"
-//        case .osm:
-//            return ""
+        case .production:
+            return "https://tdei-gateway-prod.azurewebsites.net/api/v1"
         }
     }
 
@@ -45,10 +41,8 @@ enum APIEnvironment: String, CaseIterable {
             return "https://osm.workspaces-dev.sidewalks.washington.edu/api/0.6"
         case .staging:
             return "https://osm.workspaces-stage.sidewalks.washington.edu/api/0.6"
-//        case .production:
-//            return "https://osm.workspaces-prod.sidewalks.washington.edu/api/0.6"
-//        case .osm:
-//            return ""
+        case .production:
+            return "https://osm.workspaces.sidewalks.washington.edu/api/0.6"
         }
     }
 
@@ -58,10 +52,8 @@ enum APIEnvironment: String, CaseIterable {
             return "https://tdei-usermanagement-be-dev.azurewebsites.net/api/v1"
         case .staging:
             return "https://tdei-usermanagement-stage.azurewebsites.net/api/v1"
-//        case .production:
-//            return ""
-//        case .osm:
-//            return ""
+        case .production:
+            return "https://tdei-usermanagement-prod.azurewebsites.net/api/v1"
         }
     }
 
@@ -71,6 +63,8 @@ enum APIEnvironment: String, CaseIterable {
             return "https://api.openstreetcam.org/1.0"
         case .staging:
             return "https://api.openstreetcam.org/1.0"
+        case .production:
+            return "https://api.openstreetcam.org/1.0"
         }
     }
 }

GoInfoGame/GoInfoGame/Network/models/WorkspacesResponse.swift

@@ -22,31 +22,21 @@ class WorkSpacesResponse: Codable {
 }
 
 // MARK: - Workspace
-struct Workspace: Codable, CustomStringConvertible,Hashable {
+struct Workspace: Codable,Hashable {
     let id: Int
     let title: String
-//    let tdeiRecordId:String
-//    let tdeiProjectGroupId:String
-//    let tdeiServiceId: String
-//    let tdeiMetadata: String
+    let type: String?
 
-    init(id: Int, title: String) {
-        self.id = id
-        self.title = title
-//        self.tdeiRecordId = tdeiRecordId
-//        self.tdeiProjectGroupId = tdeiProjectGroupId
-//        self.tdeiServiceId = tdeiServiceId
-//        self.tdeiMetadata = tdeiMetadata
-//        
-    }
-
-    var description: String {
-        var d = "{ \n"
-        d += "name: \(self.title) \n"
-        d += "id: \(self.id) \n"
-        d += "}\n"
-        return d
-    }
+    init(from decoder: Decoder) throws {
+           let container = try decoder.container(keyedBy: CodingKeys.self)
+           id = try container.decode(Int.self, forKey: .id)
+           title = try container.decode(String.self, forKey: .title)
+           type = try container.decodeIfPresent(String.self, forKey: .type) ?? "osw"
+       }
+
+       enum CodingKeys: String, CodingKey {
+           case id, title, type
+       }
 }
 
 // MARK: - Polygon

GoInfoGame/GoInfoGame/UI/InitialView/InitialView.swift

@@ -77,7 +77,7 @@ struct WorkspacesListView: View {
                 .padding()
                 ScrollView {
                     VStack(spacing: 20) {
-                        ForEach(workspaces, id: \.id) { workspace in
+                        ForEach(workspaces.filter({$0.type == "osw"}), id: \.id) { workspace in
                             Button {
                                 viewModel.fetchLongQuestsFor(workspaceId: "\(workspace.id)", completion: { success in
                                     if success {

GoInfoGame/GoInfoGame/UserProfile/View/UserProfileView.swift

@@ -67,6 +67,7 @@ struct UserProfileView: View {
             _ = KeychainManager.delete(key: "accessToken")
             _ = KeychainManager.delete(key: "username")
         loggedIn = false
+            UserProfileCache.shared.clearUserProfile()
 
             if let window = UIApplication.shared.windows.first {
                    window.rootViewController = UIHostingController(rootView: PosmLoginView())