Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Uploader
Commits
92b21fd3
Commit
92b21fd3
authored
Apr 22, 2021
by
Matija Obreza
Browse files
Merge branch '37-api-v1' into 'master'
Resolve "API v1" Closes
#37
See merge request
!31
parents
8d9d3a91
689191dc
Changes
3
Hide whitespace changes
Inline
Side-by-side
anno-gui/src/main/java/org/genesys2/anno/gui/DwcaBuilder.java
View file @
92b21fd3
...
...
@@ -85,7 +85,6 @@ public class DwcaBuilder extends AbstractModelObject {
JSONObject
oauthSettings
=
new
JSONObject
();
oauthSettings
.
put
(
"accessToken"
,
sourceSettings
.
getOauthSettings
().
getAccessToken
());
oauthSettings
.
put
(
"apiUrl"
,
sourceSettings
.
getOauthSettings
().
getApiUrl
());
oauthSettings
.
put
(
"authorizationEndpoint"
,
sourceSettings
.
getOauthSettings
().
getAuthorizationEndpoint
());
oauthSettings
.
put
(
"clientKey"
,
sourceSettings
.
getOauthSettings
().
getClientKey
());
oauthSettings
.
put
(
"clientSecret"
,
sourceSettings
.
getOauthSettings
().
getClientSecret
());
...
...
@@ -317,7 +316,6 @@ public class DwcaBuilder extends AbstractModelObject {
OAuthSettings
oAuthSettings
=
new
OAuthSettings
();
oAuthSettings
.
setAccessToken
(
jsonOauthSettings
.
getString
(
"accessToken"
));
oAuthSettings
.
setApiUrl
(
jsonOauthSettings
.
getString
(
"apiUrl"
));
oAuthSettings
.
setAuthorizationEndpoint
(
jsonOauthSettings
.
getString
(
"authorizationEndpoint"
));
oAuthSettings
.
setClientKey
(
jsonOauthSettings
.
getString
(
"clientKey"
));
oAuthSettings
.
setClientSecret
(
jsonOauthSettings
.
getString
(
"clientSecret"
));
...
...
anno-gui/src/main/java/org/genesys2/anno/gui/SettingsDialog.java
View file @
92b21fd3
...
...
@@ -87,7 +87,6 @@ public class SettingsDialog extends Dialog {
private
Text
txtGenesysURL
;
private
Text
txtAuthorizationEndpoint
;
private
Text
txtTokenEndpoint
;
private
Text
txtApiUrl
;
private
Text
txtAccessToken
;
private
Text
txtRefreshToken
;
private
Text
txtClientKey
;
...
...
@@ -447,14 +446,6 @@ public class SettingsDialog extends Dialog {
txtTokenEndpoint
=
new
Text
(
grpGenesysApiConfiguration
,
SWT
.
BORDER
);
txtTokenEndpoint
.
setLayoutData
(
new
GridData
(
SWT
.
FILL
,
SWT
.
CENTER
,
true
,
false
,
1
,
1
));
Label
lblGenesysApiUrl
=
new
Label
(
grpGenesysApiConfiguration
,
SWT
.
NONE
);
lblGenesysApiUrl
.
setLayoutData
(
new
GridData
(
SWT
.
FILL
,
SWT
.
CENTER
,
false
,
false
,
1
,
1
));
lblGenesysApiUrl
.
setAlignment
(
SWT
.
RIGHT
);
lblGenesysApiUrl
.
setText
(
"Genesys API URL"
);
txtApiUrl
=
new
Text
(
grpGenesysApiConfiguration
,
SWT
.
BORDER
);
txtApiUrl
.
setLayoutData
(
new
GridData
(
SWT
.
FILL
,
SWT
.
CENTER
,
true
,
false
,
1
,
1
));
Label
lblClientApiKey
=
new
Label
(
grpGenesysApiConfiguration
,
SWT
.
NONE
);
lblClientApiKey
.
setAlignment
(
SWT
.
RIGHT
);
lblClientApiKey
.
setLayoutData
(
new
GridData
(
SWT
.
RIGHT
,
SWT
.
CENTER
,
false
,
false
,
1
,
1
));
...
...
@@ -592,10 +583,6 @@ public class SettingsDialog extends Dialog {
IObservableValue
oauthSettingstokenEndpointSettingsObserveValue
=
BeanProperties
.
value
(
"oauthSettings.tokenEndpoint"
).
observe
(
settings
);
bindingContext
.
bindValue
(
observeTextTxtTokenEndpointObserveWidget
,
oauthSettingstokenEndpointSettingsObserveValue
,
null
,
null
);
//
IObservableValue
observeTextTxtApiUrlObserveWidget
=
WidgetProperties
.
text
(
SWT
.
Modify
).
observe
(
txtApiUrl
);
IObservableValue
oauthSettingsapiUrlSettingsObserveValue
=
BeanProperties
.
value
(
"oauthSettings.apiUrl"
).
observe
(
settings
);
bindingContext
.
bindValue
(
observeTextTxtApiUrlObserveWidget
,
oauthSettingsapiUrlSettingsObserveValue
,
null
,
null
);
//
IObservableValue
observeTextTxtAccessTokenObserveWidget
=
WidgetProperties
.
text
(
SWT
.
Modify
).
observe
(
txtAccessToken
);
IObservableValue
oauthSettingsaccessTokenSettingsObserveValue
=
BeanProperties
.
value
(
"oauthSettings.accessToken"
).
observe
(
settings
);
bindingContext
.
bindValue
(
observeTextTxtAccessTokenObserveWidget
,
oauthSettingsaccessTokenSettingsObserveValue
,
null
,
null
);
...
...
anno-gui/src/main/java/org/genesys2/anno/model/OAuthSettings.java
View file @
92b21fd3
...
...
@@ -22,7 +22,6 @@ public class OAuthSettings extends AbstractModelObject {
private
String
serverUrl
=
SettingsDialog
.
CUSTOM_SERVER_URL
;
private
String
authorizationEndpoint
=
SettingsDialog
.
CUSTOM_SERVER_URL
+
"/oauth/authorize"
;
private
String
tokenEndpoint
=
SettingsDialog
.
CUSTOM_SERVER_URL
+
"/oauth/token"
;
private
String
apiUrl
=
SettingsDialog
.
CUSTOM_SERVER_URL
+
"/api/v0"
;
private
String
accessToken
=
""
;
private
String
refreshToken
=
""
;
private
String
clientKey
=
""
;
...
...
@@ -37,7 +36,6 @@ public class OAuthSettings extends AbstractModelObject {
this
.
serverUrl
=
serverUrl
;
setAuthorizationEndpoint
(
this
.
serverUrl
+
"/oauth/authorize"
);
setTokenEndpoint
(
this
.
serverUrl
+
"/oauth/token"
);
setApiUrl
(
this
.
serverUrl
+
"/api/v0"
);
firePropertyChange
(
"serverUrl"
,
null
,
this
.
serverUrl
);
}
...
...
@@ -59,15 +57,6 @@ public class OAuthSettings extends AbstractModelObject {
firePropertyChange
(
"tokenEndpoint"
,
null
,
this
.
tokenEndpoint
);
}
public
String
getApiUrl
()
{
return
apiUrl
;
}
public
void
setApiUrl
(
String
apiUrl
)
{
this
.
apiUrl
=
apiUrl
;
firePropertyChange
(
"apiUrl"
,
null
,
this
.
apiUrl
);
}
public
String
getAccessToken
()
{
return
accessToken
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment