diff options
author | Pacien TRAN-GIRARD | 2014-07-06 01:07:50 +0200 |
---|---|---|
committer | Pacien TRAN-GIRARD | 2014-07-06 01:07:50 +0200 |
commit | 34eaf5c90ef315227114994a00d43228b33b55aa (patch) | |
tree | b25f075d3031d85965a2fd6c3ef6fbad5b8b6c6d /webcastor.js | |
parent | f22194b52527fa19582dbb2504b50a66e303d216 (diff) | |
download | webcastor-34eaf5c90ef315227114994a00d43228b33b55aa.tar.gz |
Use node-uuid for true uuids
Diffstat (limited to 'webcastor.js')
-rw-r--r-- | webcastor.js | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/webcastor.js b/webcastor.js index 8dabe52..39c37a9 100644 --- a/webcastor.js +++ b/webcastor.js | |||
@@ -29,6 +29,7 @@ var imports = { | |||
29 | redis : require('redis'), | 29 | redis : require('redis'), |
30 | 30 | ||
31 | passwordHash : require('password-hash'), | 31 | passwordHash : require('password-hash'), |
32 | uuid : require('node-uuid'), | ||
32 | }; | 33 | }; |
33 | 34 | ||
34 | var params = { | 35 | var params = { |
@@ -69,7 +70,7 @@ var Channel = { | |||
69 | }, | 70 | }, |
70 | 71 | ||
71 | open : function(name, password) { | 72 | open : function(name, password) { |
72 | var hashedPassword | 73 | var hashedPassword; |
73 | if (password === '') { | 74 | if (password === '') { |
74 | hashedPassword = 'none'; | 75 | hashedPassword = 'none'; |
75 | } else { | 76 | } else { |
@@ -79,12 +80,7 @@ var Channel = { | |||
79 | }, | 80 | }, |
80 | 81 | ||
81 | generateUniqueName : function() { | 82 | generateUniqueName : function() { |
82 | var uniqueName; | 83 | return imports.uuid.v1(); |
83 | while (uniqueName === this.previousName) { | ||
84 | uniqueName = (+new Date()).toString(36).toUpperCase(); | ||
85 | } | ||
86 | this.previousName = uniqueName; | ||
87 | return uniqueName; | ||
88 | }, | 84 | }, |
89 | 85 | ||
90 | getPassword : function(name, callback) { | 86 | getPassword : function(name, callback) { |