Skip to content

Commit 8abeeec

Browse files
r-brownr-brown
committed
- fine-tune .env properties names
- revisit texts closes #5 #6
1 parent 716cc87 commit 8abeeec

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

‎.env.example

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@ MAIL_ENCRYPTION=tls
8080
#TWITTER_CLIENT_SECRET=
8181
#TWITTER_REDIRECT=
8282

83-
# Nlic
84-
NLIC_CONTEXT_BASE_URL=https://go.netlicensing.io/core/v2/rest
83+
# NetLicensing configuration
84+
NLIC_BASE_URL=https://go.netlicensing.io/core/v2/rest
8585
NLIC_AUTH_USERNAME=demo
8686
NLIC_AUTH_PASSWORD=demo
8787
NLIC_AUTH_API_KEY=
88-
NLIC_DEFAULTS_USE_API_KEY_FOR_VALIDATION_AND_TOKEN=false
88+
# Use API Key for LienseeService.validate() and TockenService.create() calls
89+
NLIC_USE_API_KEY=true

‎app/Http/Controllers/SubscriptionController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ protected function createSetup()
515515
$setup = $this->generate()->except(['username', 'password'])->toArray();
516516

517517
//default connection type
518-
$setup['use_api_key'] = config('nlic.defaults.use_api_key_for_validation_and_token');
518+
$setup['use_api_key'] = config('nlic.defaults.use_api_key');
519519

520520
return $auth + $setup;
521521
}

‎app/Http/Controllers/TryAndBuyController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ protected function createSetup()
517517
$setup = $this->generate()->except(['username', 'password'])->toArray();
518518

519519
//default connection type
520-
$setup['use_api_key'] = config('nlic.defaults.use_api_key_for_validation_and_token');
520+
$setup['use_api_key'] = config('nlic.defaults.use_api_key');
521521

522522
return $auth + $setup;
523523
}

‎config/nlic.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
'lifetime' => 90,
1010
],
1111
'context' => [
12-
'base_url' => env('NLIC_CONTEXT_BASE_URL', 'https://go.netlicensing.io/core/v2/rest')
12+
'base_url' => env('NLIC_BASE_URL', 'https://go.netlicensing.io/core/v2/rest')
1313
],
1414
'auth' => [
1515
'username' => env('NLIC_AUTH_USERNAME', 'demo'),
1616
'password' => env('NLIC_AUTH_PASSWORD', 'demo'),
1717
'api_key' => env('NLIC_AUTH_API_KEY'),
1818
],
1919
'defaults' => [
20-
'use_api_key_for_validation_and_token' => env('NLIC_DEFAULTS_USE_API_KEY_FOR_VALIDATION_AND_TOKEN', false)
20+
'use_api_key' => env('NLIC_USE_API_KEY', false)
2121
]
2222
];

‎resources/views/pages/subscription/panels/setup.blade.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
</div>
148148
<div class="col-md-12">
149149
<small class="description">
150-
Login name and password for the NetLicensing vendor account.
150+
Login name and password for the NetLicensing vendor account
151151
</small>
152152
</div>
153153
</div>
@@ -158,21 +158,21 @@
158158
'data-toggle'=>'toggle',
159159
'data-width'=>'200',
160160
'data-height'=>'34',
161-
'data-on'=>'Validate by Api Key',
162-
'data-off'=>'Validate by Basic auth',
161+
'data-on'=>'Validate using API Key',
162+
'data-off'=>'Validate using Basic Auth',
163163
'data-onstyle'=>'success',
164164
'data-offstyle'=>'warning',
165165
'autocomplete'=>'off'
166166
]) }}
167167
</div>
168168
</div>
169169
<div class="security_api_key @if(old('use_api_key', $setup->get('use_api_key'))) active @endif">
170-
<div class="col-md-6 {{$errors->has('api_key') ? 'has-error' : '' }}">
170+
<div class="col-md-12 {{$errors->has('api_key') ? 'has-error' : '' }}">
171171
<div class="input-group">
172172
<span class="input-group-addon">
173173
<i class="fa fa-key" aria-hidden="true"></i>
174174
</span>
175-
<input name="api_key" class="form-control" type="text" placeholder="Api Key"
175+
<input name="api_key" class="form-control" type="text" placeholder="API Key"
176176
value="{{ old('api_key', $setup->get('api_key')) }}">
177177
<span class="input-group-btn">
178178
<button type="button" class="btn btn-primary generate">
@@ -188,7 +188,7 @@
188188
</div>
189189
<div class="col-md-12">
190190
<small class="description">
191-
Api Key for the NetLicensing vendor account.
191+
<a href="https://www.labs64.de/confluence/x/-gHk" target="_blank">API Key</a> for the NetLicensing vendor account
192192
</small>
193193
</div>
194194
</div>

‎resources/views/pages/try_and_buy/panels/setup.blade.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
</div>
147147
<div class="col-md-12">
148148
<small class="description">
149-
Login name and password for the NetLicensing vendor account.
149+
Login name and password for the NetLicensing vendor account
150150
</small>
151151
</div>
152152
</div>
@@ -157,21 +157,21 @@
157157
'data-toggle'=>'toggle',
158158
'data-width'=>'200',
159159
'data-height'=>'34',
160-
'data-on'=>'Validate by Api Key',
161-
'data-off'=>'Validate by Basic auth',
160+
'data-on'=>'Validate using API Key',
161+
'data-off'=>'Validate using Basic Auth',
162162
'data-onstyle'=>'success',
163163
'data-offstyle'=>'warning',
164164
'autocomplete'=>'off'
165165
]) }}
166166
</div>
167167
</div>
168168
<div class="security_api_key @if(old('use_api_key', $setup->get('use_api_key'))) active @endif">
169-
<div class="col-md-6 {{$errors->has('api_key') ? 'has-error' : '' }}">
169+
<div class="col-md-12 {{$errors->has('api_key') ? 'has-error' : '' }}">
170170
<div class="input-group">
171171
<span class="input-group-addon">
172172
<i class="fa fa-key" aria-hidden="true"></i>
173173
</span>
174-
<input name="api_key" class="form-control" type="text" placeholder="Api Key"
174+
<input name="api_key" class="form-control" type="text" placeholder="API Key"
175175
value="{{ old('api_key', $setup->get('api_key')) }}">
176176
<span class="input-group-btn">
177177
<button type="button" class="btn btn-primary generate">
@@ -187,7 +187,7 @@
187187
</div>
188188
<div class="col-md-12">
189189
<small class="description">
190-
Api Key for the NetLicensing vendor account.
190+
<a href="https://www.labs64.de/confluence/x/-gHk" target="_blank">API Key</a> for the NetLicensing vendor account
191191
</small>
192192
</div>
193193
</div>

0 commit comments

Comments
 (0)