end authservice

Sources/allin/allin.xcodeproj/project.pbxproj

@@ -39,6 +39,8 @@
 		ECA7010B2AC4003400532444 /* RankingRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECA7010A2AC4003400532444 /* RankingRowView.swift */; };
 		ECA7010D2AC4948600532444 /* FriendsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECA7010C2AC4948600532444 /* FriendsScreen.swift */; };
 		ECA7010F2AC4949D00532444 /* FriendView.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECA7010E2AC4949D00532444 /* FriendView.swift */; };
+		ECCD6DD92AD7228B00F947C4 /* Singleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECCD6DD82AD7228B00F947C4 /* Singleton.swift */; };
+		ECCD6DDB2AD7233F00F947C4 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECCD6DDA2AD7233F00F947C4 /* User.swift */; };
 		ECDF624A2AC1CAFD00BA8213 /* RegisterScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECDF62492AC1CAFD00BA8213 /* RegisterScreen.swift */; };
 		ECFC54442AC0C39E00195760 /* LoginScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFC54432AC0C39E00195760 /* LoginScreen.swift */; };
 /* End PBXBuildFile section */
@@ -97,6 +99,8 @@
 		ECA7010A2AC4003400532444 /* RankingRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RankingRowView.swift; path = allin/Views/RankingRowView.swift; sourceTree = SOURCE_ROOT; };
 		ECA7010C2AC4948600532444 /* FriendsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FriendsScreen.swift; path = allin/Screens/FriendsScreen.swift; sourceTree = SOURCE_ROOT; };
 		ECA7010E2AC4949D00532444 /* FriendView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FriendView.swift; path = allin/Views/FriendView.swift; sourceTree = SOURCE_ROOT; };
+		ECCD6DD82AD7228B00F947C4 /* Singleton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Singleton.swift; path = allin/Models/Singleton.swift; sourceTree = SOURCE_ROOT; };
+		ECCD6DDA2AD7233F00F947C4 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = User.swift; path = allin/Models/User.swift; sourceTree = SOURCE_ROOT; };
 		ECDF62492AC1CAFD00BA8213 /* RegisterScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RegisterScreen.swift; path = allin/Screens/RegisterScreen.swift; sourceTree = SOURCE_ROOT; };
 		ECFC54432AC0C39E00195760 /* LoginScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = LoginScreen.swift; path = allin/Screens/LoginScreen.swift; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
@@ -170,6 +174,7 @@
 		D98C4D622AB9D017007A6B4D /* AllIn */ = {
 			isa = PBXGroup;
 			children = (
+				ECCD6DD72AD7227500F947C4 /* Models */,
 				EC55565B2AD6E59C00E5CA3F /* Services */,
 				EC9A45AE2ABDF47A00125D41 /* Screens */,
 				EC0EA7AD2ABDAAAC006BA4A0 /* Fonts */,
@@ -250,6 +255,15 @@
 			path = Screens;
 			sourceTree = "<group>";
 		};
+		ECCD6DD72AD7227500F947C4 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				ECCD6DD82AD7228B00F947C4 /* Singleton.swift */,
+				ECCD6DDA2AD7233F00F947C4 /* User.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
 		ECF816C72ABB51E300DE30A4 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -392,6 +406,7 @@
 				EC31955E2ACD3B8E00D0A4DC /* ConfidentialityView.swift in Sources */,
 				ECA701092AC3FE3300532444 /* RankingScreen.swift in Sources */,
 				ECFC54442AC0C39E00195760 /* LoginScreen.swift in Sources */,
+				ECCD6DDB2AD7233F00F947C4 /* User.swift in Sources */,
 				EC87FCD62ABBA24000363986 /* Extensions.swift in Sources */,
 				EC46D7DD2ABCCC270030AC04 /* MenuView.swift in Sources */,
 				EC2C1EEB2AC08BE80091D57C /* BetCard.swift in Sources */,
@@ -401,6 +416,7 @@
 				EC3737EA2AC5A58B00E6BDB5 /* RecapBetCard.swift in Sources */,
 				EC55565D2AD6E5B900E5CA3F /* AuthService.swift in Sources */,
 				D98C4D662AB9D017007A6B4D /* ContentView.swift in Sources */,
+				ECCD6DD92AD7228B00F947C4 /* Singleton.swift in Sources */,
 				D92EC57C2ABADA2800CCD30E /* CoinCounterView.swift in Sources */,
 				EC3737E42AC2F5FB00E6BDB5 /* ChoiceCapsule.swift in Sources */,
 				EC3737E62AC41DB000E6BDB5 /* WinModal.swift in Sources */,

Sources/allin/allin/ContentView.swift

@@ -11,7 +11,7 @@ struct ContentView: View {
     
     var body: some View {
         NavigationView {
-            Home(page: "CreationBet")
+            Welcome()
         }
     }
 }

Sources/allin/allin/Models/Singleton.swift

@@ -0,0 +1,19 @@
+//
+//  Singleton.swift
+//  AllIn
+//
+//  Created by étudiant on 11/10/2023.
+//
+
+import Foundation
+
+class Singleton {
+    
+    static let singleton = Singleton()
+    
+    var user: User?
+    
+    var auth: AuthService = AuthService()
+    
+    private init() { }
+}

Sources/allin/allin/Models/User.swift

@@ -0,0 +1,21 @@
+//
+//  User.swift
+//  AllIn
+//
+//  Created by étudiant on 11/10/2023.
+//
+
+import Foundation
+
+class User {
+    
+    public var Username: String
+    public var Email: String
+    public var NbCoins: Int
+
+    public init(Username: String, andEmail Email: String, NbCoins: Int) {
+        self.Username = Username
+        self.Email = Email
+        self.NbCoins = NbCoins
+    }
+}

Sources/allin/allin/Screens/LoginScreen.swift

@@ -12,6 +12,10 @@ struct Login: View {
     @State private var isPasswordVisible = true
     @State private var username: String = ""
     @State private var password: String = ""
+    @State private var showErrorAlert = false
+    @State private var errorAlertMessage = ""
+    @State private var isLoginSuccessful = false
+
     var body: some View {
         GeometryReader { geometry in
             VStack(spacing: 15) {
@@ -33,6 +37,7 @@ struct Login: View {
                         RoundedRectangle(cornerRadius: 9, style: .continuous)
                             .stroke(AllinColor.StrokeGrayColor, lineWidth: 1)
                     )
+                    .autocapitalization(.none)
                     .padding(.bottom, 8)
                 
                 Group {
@@ -69,8 +74,9 @@ struct Login: View {
                     .padding(.leading, 150)
                     .betTextStyle(weight: .medium, color: AllinColor.StartTextColor, size: 14)
                 
-                NavigationLink(destination: Home(page: "Bet").navigationBarBackButtonHidden(true))
+                Button(action: {
-                {
+                        login(email: username, password: password)
+                    }) {
                     Text("Se connecter")
                         .betTextStyle(weight: .bold, color: .white, size: 17)
                         .frame(width: 300, height: 60)
@@ -79,6 +85,10 @@ struct Login: View {
                                                    startPoint: .leading, endPoint: .trailing))
                         .cornerRadius(13)
                 }
+                .background(
+                    NavigationLink("", destination: Home(page: "Bet").navigationBarBackButtonHidden(true), isActive: $isLoginSuccessful)
+                        .opacity(0)
+                )
                 
                 Spacer()
                 HStack(spacing: 0) {
@@ -95,6 +105,9 @@ struct Login: View {
             .frame(width: geometry.size.width, height: geometry.size.height)
             .background(AllinColor.StartBackground)
         }
+        .alert(isPresented: $showErrorAlert) {
+            Alert(title: Text("Erreur de connexion"), message: Text(errorAlertMessage), dismissButton: .default(Text("OK")))
+        }
     }
     
     func login(email: String, password: String) {
@@ -103,7 +116,7 @@ struct Login: View {
         api.login(email: email, password: password) { statusCode in
             DispatchQueue.main.async {
                 if statusCode == 200 {
-
+                    isLoginSuccessful = true
                 } else {
                     errorAlertMessage = "La connexion a échoué. Veuillez réessayer."
                     showErrorAlert = true

Sources/allin/allin/Screens/RegisterScreen.swift

@@ -10,18 +10,20 @@ import SwiftUI
 struct Register: View {
     
     @State private var isPasswordVisible = true
-    @State private var pseudo: String = ""
     @State private var username: String = ""
+    @State private var email: String = ""
     @State private var password: String = ""
     @State private var passwordConfirm: String = ""
+    @State private var isRegisterSuccessful = false
+
     var body: some View {
         GeometryReader { geometry in
             ScrollView(showsIndicators: false) {
                 VStack(spacing: 15) {
                     Spacer()
                     VStack {
-                        if (pseudo != "") {
+                        if (username != "") {
-                            Text("Bonjour "+pseudo+",")
+                            Text("Bonjour "+username+",")
                                 .betTextStyle(weight: .semibold, color: AllinColor.StartTextColor, size: 40)
                                 .padding([.trailing, .leading], 30)
                         } else {
@@ -40,7 +42,7 @@ struct Register: View {
                         .betTextStyle(weight: .regular, color: AllinColor.StartTextColor, size: 20)
                         .padding(.bottom, 60)
                     
-                    TextField("", text: $pseudo, prompt: Text("Pseudo").foregroundColor(.gray))
+                    TextField("", text: $username, prompt: Text("Pseudo").foregroundColor(.gray))
                         .padding()
                         .background(Color.white.cornerRadius(9))
                         .frame(width: 300)
@@ -51,7 +53,7 @@ struct Register: View {
                         )
                         .padding(.bottom, 8)
                     
-                    TextField("", text: $username, prompt: Text("Email").foregroundColor(.gray))
+                    TextField("", text: $email, prompt: Text("Email").foregroundColor(.gray))
                         .padding()
                         .background(Color.white.cornerRadius(9))
                         .frame(width: 300)
@@ -67,6 +69,7 @@ struct Register: View {
                             SecureField("", text: $password, prompt: Text("Mot de passe").foregroundColor(.gray))
                         } else {
                             TextField("", text: $password, prompt: Text("Mot de passe").foregroundColor(.gray))
+                                .autocapitalization(.none)
                         }
                     }
                     .padding()
@@ -97,6 +100,7 @@ struct Register: View {
                             SecureField("", text: $passwordConfirm, prompt: Text("Confirmation du Mot de passe").foregroundColor(.gray))
                         } else {
                             TextField("", text: $passwordConfirm, prompt: Text("Confirmation du Mot de passe").foregroundColor(.gray))
+                                .autocapitalization(.none)
                         }
                     }
                     .padding()
@@ -121,7 +125,9 @@ struct Register: View {
                     .foregroundColor(.black)
                     .padding(.bottom, 50)
                     
-                    Button(action: {}) {
+                    Button(action: {
+                        register(email: email, username: username, password: password)
+                    }) {
                         Text("S'inscrire")
                             .betTextStyle(weight: .bold, color: .white, size: 17)
                     }
@@ -129,6 +135,10 @@ struct Register: View {
                     .background(LinearGradient(gradient:
                                                 Gradient(colors:[AllinColor.TopBarColorPink,AllinColor.TopBarColorPurple,AllinColor.TopBarColorBlue]),
                                                startPoint: .leading, endPoint: .trailing))
+                    .background(
+                        NavigationLink("", destination: Home(page: "Bet").navigationBarBackButtonHidden(true), isActive: $isRegisterSuccessful)
+                            .opacity(0)
+                    )
                     .cornerRadius(13)
                     
                     Spacer()
@@ -151,4 +161,18 @@ struct Register: View {
         }
     }
     
+    func register(email: String, username: String, password: String) {
+        let api = AuthService()
+
+        api.register(email: email, password: password, username: username) { statusCode in
+            DispatchQueue.main.async {
+                if statusCode == 201 {
+                    isRegisterSuccessful = true
+                } else {
+
+                }
+            }
+        }
+    }
+    
 }

Sources/allin/allin/Services/AuthService.swift

@@ -6,17 +6,19 @@
 //
 
 import Foundation
+
 class AuthService {
     
     let baseURL : String = "https://codefirst.iut.uca.fr/containers/AllDev-api/"
     
     public func login(email : String, password : String, completion : @escaping (Int)-> ()){
-        let url = URL(string: baseURL+"/users/login")!
+        let url = URL(string: baseURL+"users/login")!
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let json = [
-            "email":email,
+            "username":email,
             "password":password,
         ]
         
@@ -35,11 +37,13 @@ class AuthService {
         let url = URL(string: baseURL+"/users/register")!
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
-        
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+
         let json = [
             "email":email,
             "username":username,
             "password":password,
+            "nbCoins": "0"
         ]
         
         if let jsonData = try? JSONSerialization.data(withJSONObject: json, options: []){