web_socket_chat_server 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9356cf8630f6b51f1247c21e7fd19f6e03683999
-  data.tar.gz: 398040ec2b8113457d03b5112adc29593fd2632d
+  metadata.gz: 1eaef39c1692af8b3d3abe96c5a30a1fe8862fea
+  data.tar.gz: a06f9c5102984f25c0384b0fe16a7fd6781b2dd0
 SHA512:
-  metadata.gz: f707f960a1357669e3a70b65ce8ab4e899c19630f97654701a0a6b6f40bdbd9bcc9478be4ea1892629936827d218c4678d8280e1bd671553f7f90eb0e18155c1
-  data.tar.gz: 692171123a58fcecbff5900ccec3dbe94de978166b48016d4eadbeb593001c8cbf84d7a849bfa4d46e17383980ee4e1c9c7d6df836fd4c0a8539441f6281195c
+  metadata.gz: 512396a5563d14b6d956d66cea89b53e6f9f8ce55447afdc596cdde336082aedbcb60d43a3c58ffad91c677a267d8fff002276d1a83b926b513b32a288401e34
+  data.tar.gz: 71165fbef526906a5317c15562defda07afe38adb263daeba061c4b109fb6f2e362aa53004a109b96f077a0a0964ac940f9cb505d3b43505b4f20165544ac9c5

data/CHAT_CLIENT_EXAMPLE/chatapp.html

@@ -18,8 +18,8 @@
 						<input type="text" class="form-control" id="username" placeholder="username">
 					</div>
 					<div class="form-group">
-						<label for="password">Email</label>
-						<input type="password" class="form-control" id="password" placeholder="********">
+						<label for="password">Password</label>
+						<input type="password" class="form-control" id="password" placeholder="">
 					</div>
 					<button type="submit" class="btn btn-primary">Login</button>
 				</form>

data/lib/web_socket_chat_server/version.rb

@@ -1,3 +1,3 @@
 module WebSocketChatServer
-	VERSION = "0.0.4"
+	VERSION = "0.0.5"
 end

data/lib/web_socket_chat_server.rb

@@ -136,14 +136,6 @@ end
 							break
 						end 
 
-						if admin_credentials_invalid?(username, password)
-							response = create_response_json("failed_connection", nil, "Invalid credentials.")
-							yield response if block_given?
-							ws.send(response)
-							ws.close
-							break
-						end
-
 						if user_credentials_valid?(username, password) == false 
 							response = create_response_json("failed_connection", nil, "Invalid user creadentials. The username has to be at least 3 alphanumeric characters, and the password at least 6 alphanumeric characters.")
 							yield response if block_given?
@@ -160,12 +152,27 @@ end
 							break
 						end
 
+
+						number_of_tries = 0
+						while admin_credentials_invalid?(user.username, user.password)
+							number_of_tries = number_of_tries + 1
+							user.username = user.username + Random.rand(1..@max_connections).to_s
+
+							if number_of_tries > 30 
+								response = create_response_json("failed_connection", nil, "The username exists already.")
+								yield response if block_given?
+								ws.send(response)
+								ws.close
+								break
+							end
+						end
+
 						number_of_tries = 0
 						while user_exists?(user)
 							number_of_tries = number_of_tries + 1
-							user.username = user.username + Random.rand(1..9999).to_s
+							user.username = user.username + Random.rand(1..@max_connections).to_s
 
-							if number_of_tries > 15 
+							if number_of_tries > 30 
 								response = create_response_json("failed_connection", nil, "The username exists already.")
 								yield response if block_given?
 								ws.send(response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_socket_chat_server
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jone Samra