Allow user registration w. local. Add qr code icon

Author: skadefro

OpenFlow/src/LoginProvider.ts

@@ -143,6 +143,7 @@ export class LoginProvider {
             var res2 = {
                 wshost: _url,
                 domain: Config.domain,
+                allow_user_registration: Config.allow_user_registration,
                 allow_personal_nodered: Config.allow_personal_nodered,
                 namespace: Config.namespace,
                 nodered_domain_schema: Config.nodered_domain_schema
@@ -293,10 +294,21 @@ export class LoginProvider {
                     return done(null, tuser);
                 }
                 user = await User.FindByUsername(username);
-                if (user === undefined || user === null) { return done(null, false); }
-                if (!(await user.ValidatePassword(password))) {
-                    Audit.LoginFailed(username, "weblogin", "local", "");
-                    return done(null, false);
+                if (user === undefined || user === null) {
+                    if (!Config.allow_user_registration) {
+                        return done(null, false);
+                    }
+                    user = new User(); user.name = username; user.username = username;
+                    await user.SetPassword(password);
+                    user = await Config.db.InsertOne(user, "users", 0, false, TokenUser.rootToken());
+                    var users: Role = await Role.FindByNameOrId("users", TokenUser.rootToken());
+                    users.AddMember(user);
+                    await users.Save(TokenUser.rootToken())
+                } else {
+                    if (!(await user.ValidatePassword(password))) {
+                        Audit.LoginFailed(username, "weblogin", "local", "");
+                        return done(null, false);
+                    }
                 }
                 tuser = new TokenUser(user);
                 Audit.LoginSuccess(tuser, "weblogin", "local", "");

OpenFlow/src/public/Controllers.ts

@@ -399,6 +399,7 @@ module openflow {
         public password: string = "";
         public message: string = "";
         public domain: string = "";
+        public allow_user_registration: boolean = false;
         public static $inject = [
             "$scope",
             "$location",
@@ -415,6 +416,7 @@ module openflow {
             this.domain = window.location.hostname;
             WebSocketClient.getJSON("/loginproviders", async (error: any, data: any) => {
                 this.providers = data;
+                this.allow_user_registration = WebSocketClient.allow_user_registration;
                 for (var i: number = this.providers.length - 1; i >= 0; i--) {
                     if (this.providers[i].provider == "local") {
                         this.providers.splice(i, 1);

OpenFlow/src/public/Login.html

@@ -22,19 +22,26 @@ <h5 class="card-title text-center"><span translate lib="web">signin</span> {{ctr
             <button class="btn btn-lg btn-primary btn-block text-uppercase" type="submit" ng-show="ctrl.localenabled"
               translate lib="web">signin</button>
             <hr class="my-4" ng-show="ctrl.localenabled">
-            <div class="form-label-group" ng-show="ctrl.qrcodescan">
-              <button value="Scan now" ng-click="ctrl.Scan()" type="button">QRCode Scan</button>
-            </div>
 
             <a ng-href="/{{model.id}}" ng-repeat="model in ctrl.providers" class="btn btn-lg btn-block text-uppercase">
               <i class="fab {{model.logo}} mr-2"></i><span translate lib="web">{{model.name}}</span>
             </a>
+
+            <a href ng-click="ctrl.Scan()" ng-show="ctrl.qrcodescan" class="btn btn-lg btn-block text-uppercase">
+              <i class="fas fa-qrcode mr-2"></i><span translate lib="web">QRCode Scan</span>
+            </a>
+            <div class="card-body" ng-show="ctrl.allow_user_registration==true">
+              Select a provider or login using a local username and password.<br>
+              A new user will automaticly be created if username is unknown.<br>
+              Email validation will be requered to use the core functions.
+            </div>
           </form>
         </div>
       </div>
     </div>
   </div>
 </div>
 <div class="cameraView" ng-show="ctrl.scanning==true">
-  <button value="Scan now" ng-click="ctrl.Scan()" type="button" ng-show="ctrl.scanning==true">QRCode Scan</button>
+  <a href ng-click="ctrl.Scan()" ng-show="ctrl.scanning==true" class="btn btn-lg btn-block text-uppercase">
+    <i class="fas fa-qrcode mr-2"></i><span translate lib="web">QRCode Scan</span>
 </div>

OpenFlow/src/public/WebSocketClient.ts

@@ -26,6 +26,8 @@ module openflow {
 
         public domain: string = null;
         public allow_personal_nodered: boolean = false;
+        public allow_user_registration: boolean = false;
+
         public namespace: string = null;
         public nodered_domain_schema: string = null;
 
@@ -206,6 +208,7 @@ module openflow {
                 console.debug("WebSocketClient::onopen: connecting to " + data.wshost);
                 this.domain = data.domain;
                 this.allow_personal_nodered = data.allow_personal_nodered;
+                this.allow_user_registration = data.allow_user_registration;
                 this.namespace = data.namespace;
                 this.nodered_domain_schema = data.nodered_domain_schema;
                 this._socketObject = new ReconnectingWebSocket(data.wshost);

VERSION

@@ -1 +1 @@
-0.0.250
+0.0.251