add vpn config to wizard #100

andibraeu · 2017-08-20T13:48:37Z

No description provided.

andrenarchy

There are a few minor things in the comments.

The most important thing is that we should decide how to proceed with the mesh tunnel. It doesn't fit where it is right now. Any ideas?

andrenarchy · 2017-08-20T18:58:36Z

src/components/wizard-internet/wizard-internet.js

+          {
+            fileExtensions: '.ovpn,.cnf,text/*',
+            property: 'config',
+            tunnelType: 'internettunnel',


This is repeated in every element here so we should remove it. If we really need it for the ids then we can pass it as an extra binding to the wizard-upload-file component.

andrenarchy · 2017-08-20T19:01:18Z

src/components/wizard-internet/wizard-internet.js

+          {
+            fileExtensions: '.crt,text/*',
+            tunnelType: 'internettunnel',
+            property: 'cacert',


this should be ca

andrenarchy · 2017-08-20T19:02:58Z

src/components/wizard-internet/wizard-internet.js

+          {
+            fileExtensions: '.key,text/*',
+            tunnelType: 'internettunnel',
+            property: 'takey',


what is this?

tls auth key

Ah, this is called tls-auth. We have to match the openvpn option names here, there is no additional translation of these options in the backend.

andrenarchy · 2017-08-20T19:06:02Z

src/components/wizard-internet/wizard-internet.js

      constructor($scope) {
        'ngInject';

        this.newInternet = {};
+        this.internetTunnelEnabled = false;
+        this.meshTunnelEnabled = false;
+        this.internetTunnelConf = [


We could call this tunnelFiles because it's independent of the tunnelType if we decide to remove this (see below)

andrenarchy · 2017-08-20T19:06:50Z

src/components/wizard-internet/wizard-internet.js

+          },
+        ];
+
+        this.internetTunnelConfSecret = [


why are these separate? Can't we simply include them above?

it is for display reasons, to seperate it and show a help text in between

Hmm, we don't have a help text for the others either. The configs can be arbitrarily complex and we can't document all of them. We could explain the most common combinations in the proposed wiki page, what do you think?

who will write the wiki page? :)

I added #102 to solve this

andrenarchy · 2017-08-20T19:24:30Z

src/components/wizard-internet/wizard-internet.html

-            <div ng-click="toggleVpnList()">
-              <span ng-show="!state.internet.showVpnList">&#9658;</span>
-              <span ng-show="state.internet.showVpnList">&#9660;</span>
+            <div ng-click="$ctrl.toggleVpnList()">


I think we should just link to a wiki page and remove the list from the wizard. The wiki page can also go into more detail.

I created #101 to solve this

andrenarchy · 2017-08-20T19:26:04Z

src/components/wizard-internet/wizard-internet.js

      constructor($scope) {
        'ngInject';

        this.newInternet = {};
+        this.internetTunnelEnabled = false;
+        this.meshTunnelEnabled = false;


it's not wrong to initialize these here but we don't need to. They're undefined by default and updateFromInput() will set them anyway.

stupid javascript ;)

but done

andrenarchy · 2017-08-20T19:26:15Z

src/components/wizard-internet/wizard-internet.js

@@ -8,17 +8,128 @@ export default module('app.components.wizard-internet', [])
    },
    // TODO: handle vpn


remove this comment :)

andrenarchy · 2017-08-20T19:27:01Z

src/components/wizard-upload-configfile/wizard-upload-configfile.html

+            accept="{{$ctrl.details.fileExtensions}}"
+            base64="true"
+            on-loaded="$ctrl.uploadContent(content)"
+            required="{{$ctrl.details.required}}">


without {{}} (unless you really want a string here which I doubt)

in fact we need a string here, for conditions like !ctrl.internet.share

I don't understand this one. Can you explain?

you're right, it would be just true or false... done

andrenarchy · 2017-08-20T19:31:54Z

src/components/wizard-internet/wizard-internet.js

+
+      setMeshTunnelType(type) {
+        if (!this.newInternet.meshTunnel) {
+          this.newInternet.meshTunnel = {};


It's still a bit weird to have the mesh tunnel in the Internet sharing section and in the internet object. Any idea where we should put it? We can also create a new section for this or for mesh-related things in general. Could also be an advanced feature? Any opinions?

I'm not sure. On the other hand, mesh vpn doesn't make sense without internet sharing. Should we discuss it in a separate issue?

I think it does make sense without internet sharing. But yeah, let's discuss it in a separate issue. What do you think about removing mesh tunnel for now from the UI?

Why do we need mesh vpn when we don't have internet access?

I'd like to let it here for now, so we don't forget it later

opened #103 for this

Share internet is not about having internet access but about sharing your internet connection. Even if you don't want to share it your router may be connected to the internet and you may want to connect with other mesh nodes via a tunnel, right?

sounds like an edge case :)

I'd like to let it here for now, until we have another solution, i.e. something for advanced or mesh settings, as I think this feature should be supported

andrenarchy · 2017-08-21T07:51:04Z

src/components/wizard-upload-configfile/wizard-upload-configfile.js

+import {copy, fromJson, module} from 'angular';
+
+export default module('app.components.wizard-upload-configfile', [])
+  .component('wizardUploadConfigfile', {


This component looks fairly generic now and maybe we also want to use it outside of the wizard or for other than config files. What do you think about renaming it to load-file-form (it basically wraps load-file-button for use in a form)?

… uploading same file twice)

andrenarchy · 2017-08-27T00:16:54Z

@andibraeu can you test this one last time please? I did some refactoring and fixed the data flow (had non-terminating angular digest cycles)... And I didn't change any of the DE translations yet.

andibraeu · 2017-08-27T07:57:30Z

Am 27.08.2017 um 02:16 schrieb André Gaul ***@***.*** ***@***.***>>: @andibraeu <https://github.com/andibraeu> can you test this one last time please? I did some refactoring and fixed the data flow (had non-terminating angular digest cycles)... And I didn't change any of the DE translations yet.

I did the translations and tested. Unfortunately file uploads don’t work anymore for me. I don’t see any success hints and the downloaded file doesn’t contain any content of these files. The checkboxes aren’t set, too, when I select Internet Sharing and Internet tunnel. (maybe it’s just deleted when updated?) The clear all files button is missing, too.

andrenarchy · 2017-08-27T08:04:14Z

You can clear files individually now so we don't need the clear all button anymore. Did you use Firefox? Will check this in ~30min.

andibraeu · 2017-08-27T08:05:28Z

I used Chromium

andrenarchy · 2017-08-27T08:09:45Z

Does it work with mesh tunnel?

andrenarchy · 2017-08-27T08:23:21Z

I can reproduce it here. Will work on it later. :)

fixes #95

andrenarchy · 2017-08-27T10:45:09Z

Fixed. @andibraeu can you verify?

andibraeu · 2017-08-27T13:09:44Z

not it works! do you press the button, please? Reinhold!

andrenarchy · 2017-08-27T13:49:58Z

With pleasure :)

carsifreifunk and others added 16 commits August 19, 2017 16:36

Create config-schema.json

bea6b21

update dependencies

6a38f9f

rename antistoererhaftung to internettunnel

7eef022

add vpn config for internet tunnel

6e4e244

fixes package names

d45aab8

add required keyword

4cbd09a

remove unused code

c55e4bf

emable upload of vpn configs

f6f49dc

fix lint issues

bb73e84

fix indentation

b3cb3d2

set internet tunneltype

97d7f18

add feature to clear all vpn config files

c5bb573

add mesh vpn configuration

28d3b10

re-enable vpn provider list

f05544f

fix typo

bbcbf57

update translations

5818a1f

andibraeu assigned andrenarchy Aug 20, 2017

fix translations and spacing

604f698

andrenarchy self-requested a review August 20, 2017 18:54

andrenarchy suggested changes Aug 20, 2017

View reviewed changes

andibraeu and others added 5 commits August 20, 2017 21:57

Update config-schema.json

804b9ce

Merge remote-tracking branch 'andi/patch-2' into vpn-config

678106d

add vpn stuff to config schema

e3d3c27

remove todo and variable initialisation

4269e69

refactor upload file component and internet wizard

196df17

andrenarchy reviewed Aug 21, 2017

View reviewed changes

andibraeu added 4 commits August 22, 2017 07:46

move design elements out of component

61aa833

use button instead of span

845e023

fix lint issues

ea40cc7

renamed wizard-upload-configfile

82b33b0

andrenarchy added 10 commits August 26, 2017 17:24

wizard-internet: improve text

b9c9f5b

load-file-button: reset button after reading (otherwise prevents from…

8634a4f

… uploading same file twice)

load-file-form: simplify

9ecb52a

wizard-tunnel: create tunnel component

47950c0

load-file-form: add clear button

e9af9fd

wizard-internet: remove wizard-tunnel code

8c1a308

components: add wizard-tunnel

0b02dc5

package: add lodash

21073eb

i18n: adapt en strings

6880600

fix linting error

23aa6bb

andrenarchy approved these changes Aug 27, 2017

View reviewed changes

update translations

149ec12

andrenarchy added 6 commits August 27, 2017 12:42

wizard-internet: fix data handling

e8eea74

load-file-form: add title to button

16f00a0

wizard-tunnel: simplify component

02b9bbd

i18n: remove unused keys

96f3cd5

wizard-internet: improve speedLimit handling

88cd61d

fixes #95

fix linting error

77e3598

wizard-tunnel: fix ca property and add file extensions

349aa74

andrenarchy merged commit 4434aee into master Aug 27, 2017

andrenarchy deleted the vpn-config branch August 27, 2017 13:50

		@@ -8,17 +8,128 @@ export default module('app.components.wizard-internet', [])
		},
		// TODO: handle vpn

add vpn config to wizard #100

add vpn config to wizard #100

Conversation

andibraeu commented Aug 20, 2017

andrenarchy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andibraeu Aug 21, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrenarchy commented Aug 27, 2017

andibraeu commented Aug 27, 2017 via email

andrenarchy commented Aug 27, 2017

andibraeu commented Aug 27, 2017

andrenarchy commented Aug 27, 2017

andrenarchy commented Aug 27, 2017

andrenarchy commented Aug 27, 2017

andibraeu commented Aug 27, 2017

andrenarchy commented Aug 27, 2017

andibraeu Aug 21, 2017 •

edited

Loading