Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-21 14:19:43 +02:00
Code Releases Activity

User-based secrets for Gemini sections, Un/MarshallSecrets()

Browse source
This commit is contained in:
Elliott Stoneham 2016-07-08 20:22:30 +01:00
parent 94c47eca93
commit c3ef29ff2c
4 changed files with 261 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

336
app/app/components/section/gemini/type-editor.js
View file

@ -15,194 +15,212 @@ import TooltipMixin from '../../../mixins/tooltip';
import SectionMixin from '../../../mixins/section'; import SectionMixin from '../../../mixins/section';
export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin, { export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin, {
sectionService: Ember.inject.service('section'), sectionService: Ember.inject.service('section'),
isDirty: false, isDirty: false,
waiting: false, waiting: false,
authenticated: false, authenticated: false,
user: {}, user: {},
workspaces: [], workspaces: [],
config: {}, config: {},
didReceiveAttrs() { didReceiveAttrs() {
let config = {}; let config = {};
try { try {
config = JSON.parse(this.get('meta.config')); config = JSON.parse(this.get('meta.config'));
} catch (e) {} } catch (e) {}
if (is.empty(config)) { if (is.empty(config)) {
config = { config = {
APIKey: "", APIKey: "",
filter: {}, filter: {},
itemCount: 0, itemCount: 0,
url: "", url: "",
userId: 0, userId: 0,
username: "", username: "",
workspaceId: 0, workspaceId: 0,
workspaceName: "", workspaceName: "",
}; };
} }
this.set('config', config); this.set('config', config);
if (this.get('config.userId') > 0) { let self = this;
this.send('auth'); self.set('waiting', true);
} this.get('sectionService').fetch(this.get('page'), "secrets", this.get('config'))
}, .then(function (response) {
console.log(response);
self.set('waiting', false);
willDestroyElement() { self.set('config.APIKey', response.apikey);
this.destroyTooltips(); self.set('config.url', response.url);
}, self.set('config.username', response.username);
getWorkspaces() { if (response.apikey.length > 0 && response.url.length > 0 && response.username.length > 0) {
let page = this.get('page'); self.send('auth');
let self = this; }
this.set('waiting', true); }, function (reason) { //jshint ignore: line
console.log(reason);
self.set('waiting', false);
if (self.get('config.userId') > 0) {
self.send('auth');
}
});
},
this.get('sectionService').fetch(page, "workspace", this.get('config')) willDestroyElement() {
.then(function(response) { this.destroyTooltips();
// console.log(response); },
let workspaceId = self.get('config.workspaceId');
if (response.length > 0 && workspaceId === 0) { getWorkspaces() {
workspaceId = response[0].Id; let page = this.get('page');
} let self = this;
this.set('waiting', true);
self.set("config.workspaceId", workspaceId); this.get('sectionService').fetch(page, "workspace", this.get('config'))
self.set('workspaces', response); .then(function (response) {
self.selectWorkspace(workspaceId); // console.log(response);
let workspaceId = self.get('config.workspaceId');
Ember.run.schedule('afterRender', function() { if (response.length > 0 && workspaceId === 0) {
window.scrollTo(0, document.body.scrollHeight); workspaceId = response[0].Id;
}
response.forEach(function(workspace) { self.set("config.workspaceId", workspaceId);
self.addTooltip(document.getElementById("gemini-workspace-" + workspace.Id)); self.set('workspaces', response);
}); self.selectWorkspace(workspaceId);
});
self.set('waiting', false);
}, function(reason) { //jshint ignore: line
self.set('workspaces', []);
self.set('waiting', false);
});
},
getItems() { Ember.run.schedule('afterRender', function () {
let page = this.get('page'); window.scrollTo(0, document.body.scrollHeight);
let self = this;
this.set('waiting', true); response.forEach(function (workspace) {
self.addTooltip(document.getElementById("gemini-workspace-" + workspace.Id));
});
});
self.set('waiting', false);
}, function (reason) { //jshint ignore: line
self.set('workspaces', []);
self.set('waiting', false);
});
},
this.get('sectionService').fetch(page, "items", this.get('config')) getItems() {
.then(function(response) { let page = this.get('page');
// console.log(response); let self = this;
self.set('items', response);
self.set('config.itemCount', response.length);
self.set('waiting', false);
}, function(reason) { //jshint ignore: line
self.set('items', []);
self.set('waiting', false);
});
},
selectWorkspace(id) { this.set('waiting', true);
let self = this;
let w = this.get('workspaces');
w.forEach(function(w) { this.get('sectionService').fetch(page, "items", this.get('config'))
Ember.set(w, 'selected', w.Id === id); .then(function (response) {
// console.log(response);
self.set('items', response);
self.set('config.itemCount', response.length);
self.set('waiting', false);
}, function (reason) { //jshint ignore: line
self.set('items', []);
self.set('waiting', false);
});
},
if (w.Id === id) { selectWorkspace(id) {
self.set("config.filter", w.Filter); let self = this;
self.set("config.workspaceId", id); let w = this.get('workspaces');
self.set("config.workspaceName", w.Title);
// console.log(self.get('config'));
}
});
this.set('workspaces', w); w.forEach(function (w) {
this.getItems(); Ember.set(w, 'selected', w.Id === id);
},
actions: { if (w.Id === id) {
isDirty() { self.set("config.filter", w.Filter);
return this.get('isDirty'); self.set("config.workspaceId", id);
}, self.set("config.workspaceName", w.Title);
// console.log(self.get('config'));
}
});
auth() { this.set('workspaces', w);
// missing data? this.getItems();
if (is.empty(this.get('config.url'))) { },
$("#gemini-url").addClass("error").focus();
return;
}
if (is.empty(this.get('config.username'))) {
$("#gemini-username").addClass("error").focus();
return;
}
if (is.empty(this.get('config.APIKey'))) {
$("#gemini-apikey").addClass("error").focus();
return;
}
// knock out spaces actions: {
this.set('config.url', this.get('config.url').trim()); isDirty() {
this.set('config.username', this.get('config.username').trim()); return this.get('isDirty');
this.set('config.APIKey', this.get('config.APIKey').trim()); },
// remove trailing slash in URL auth() {
let url = this.get('config.url'); // missing data?
if (url.indexOf("/", url.length - 1) !== -1) { if (is.empty(this.get('config.url'))) {
this.set('config.url', url.substring(0, url.length - 1)); $("#gemini-url").addClass("error").focus();
} return;
}
if (is.empty(this.get('config.username'))) {
$("#gemini-username").addClass("error").focus();
return;
}
if (is.empty(this.get('config.APIKey'))) {
$("#gemini-apikey").addClass("error").focus();
return;
}
let page = this.get('page'); // knock out spaces
let self = this; this.set('config.url', this.get('config.url').trim());
this.set('config.username', this.get('config.username').trim());
this.set('config.APIKey', this.get('config.APIKey').trim());
this.set('waiting', true); // remove trailing slash in URL
let url = this.get('config.url');
if (url.indexOf("/", url.length - 1) !== -1) {
this.set('config.url', url.substring(0, url.length - 1));
}
this.get('sectionService').fetch(page, "auth", this.get('config')) let page = this.get('page');
.then(function(response) { let self = this;
self.set('authenticated', true);
self.set('user', response);
self.set('config.userId', response.BaseEntity.id);
self.set('waiting', false);
self.getWorkspaces();
}, function(reason) { //jshint ignore: line
self.set('authenticated', false);
self.set('user', null);
self.set('config.userId', 0);
self.set('waiting', false);
switch (reason.status) { this.set('waiting', true);
case 400:
self.showNotification(`Unable to connect to Gemini URL`);
break;
case 403:
self.showNotification(`Unable to authenticate`);
break;
default:
self.showNotification(`Something went wrong, try again!`);
}
});
},
onWorkspaceChange(id) { this.get('sectionService').fetch(page, "auth", this.get('config'))
this.set('isDirty', true); .then(function (response) {
this.selectWorkspace(id); self.set('authenticated', true);
}, self.set('user', response);
self.set('config.userId', response.BaseEntity.id);
self.set('waiting', false);
self.getWorkspaces();
}, function (reason) { //jshint ignore: line
self.set('authenticated', false);
self.set('user', null);
self.set('config.userId', 0);
self.set('waiting', false);
onCancel() { switch (reason.status) {
this.attrs.onCancel(); case 400:
}, self.showNotification(`Unable to connect to Gemini URL`);
break;
case 403:
self.showNotification(`Unable to authenticate`);
break;
default:
self.showNotification(`Something went wrong, try again!`);
}
});
},
onAction(title) { onWorkspaceChange(id) {
let page = this.get('page'); this.set('isDirty', true);
let meta = this.get('meta'); this.selectWorkspace(id);
page.set('title', title); },
meta.set('rawBody', JSON.stringify(this.get("items")));
meta.set('config', JSON.stringify(this.get('config')));
meta.set('externalSource', true);
this.attrs.onAction(page, meta); onCancel() {
} this.attrs.onCancel();
} },
onAction(title) {
let page = this.get('page');
let meta = this.get('meta');
page.set('title', title);
meta.set('rawBody', JSON.stringify(this.get("items")));
meta.set('config', JSON.stringify(this.get('config')));
meta.set('externalSource', true);
this.attrs.onAction(page, meta);
}
}
}); });

30
documize/section/gemini/gemini.go
View file

@ -74,12 +74,14 @@ func (*Provider) Command(ctx *provider.Context, w http.ResponseWriter, r *http.R
} }
switch method { switch method {
case "secrets":
secs(ctx, w, r)
case "auth": case "auth":
auth(w, r) auth(ctx, w, r)
case "workspace": case "workspace":
workspace(w, r) workspace(ctx, w, r)
case "items": case "items":
items(w, r) items(ctx, w, r)
} }
} }
@ -93,7 +95,7 @@ func (*Provider) Refresh(ctx *provider.Context, config, data string) (newData st
return return
} }
c.Clean() c.Clean(ctx)
if len(c.URL) == 0 { if len(c.URL) == 0 {
log.Info("Gemini.Refresh received empty URL") log.Info("Gemini.Refresh received empty URL")
@ -150,7 +152,7 @@ func (*Provider) Refresh(ctx *provider.Context, config, data string) (newData st
return return
} }
func auth(w http.ResponseWriter, r *http.Request) { func auth(ctx *provider.Context, w http.ResponseWriter, r *http.Request) {
defer r.Body.Close() defer r.Body.Close()
body, err := ioutil.ReadAll(r.Body) body, err := ioutil.ReadAll(r.Body)
@ -167,7 +169,7 @@ func auth(w http.ResponseWriter, r *http.Request) {
return return
} }
config.Clean() config.Clean(nil) // don't look at the database for the parameters
if len(config.URL) == 0 { if len(config.URL) == 0 {
provider.WriteMessage(w, "gemini", "Missing URL value") provider.WriteMessage(w, "gemini", "Missing URL value")
@ -203,6 +205,8 @@ func auth(w http.ResponseWriter, r *http.Request) {
return return
} }
config.SaveSecrets(ctx)
defer res.Body.Close() defer res.Body.Close()
var g = geminiUser{} var g = geminiUser{}
@ -218,7 +222,7 @@ func auth(w http.ResponseWriter, r *http.Request) {
provider.WriteJSON(w, g) provider.WriteJSON(w, g)
} }
func workspace(w http.ResponseWriter, r *http.Request) { func workspace(ctx *provider.Context, w http.ResponseWriter, r *http.Request) {
defer r.Body.Close() defer r.Body.Close()
body, err := ioutil.ReadAll(r.Body) body, err := ioutil.ReadAll(r.Body)
@ -235,7 +239,7 @@ func workspace(w http.ResponseWriter, r *http.Request) {
return return
} }
config.Clean() config.Clean(ctx)
if len(config.URL) == 0 { if len(config.URL) == 0 {
provider.WriteMessage(w, "gemini", "Missing URL value") provider.WriteMessage(w, "gemini", "Missing URL value")
@ -291,7 +295,7 @@ func workspace(w http.ResponseWriter, r *http.Request) {
provider.WriteJSON(w, workspace) provider.WriteJSON(w, workspace)
} }
func items(w http.ResponseWriter, r *http.Request) { func items(ctx *provider.Context, w http.ResponseWriter, r *http.Request) {
defer r.Body.Close() defer r.Body.Close()
body, err := ioutil.ReadAll(r.Body) body, err := ioutil.ReadAll(r.Body)
@ -308,7 +312,7 @@ func items(w http.ResponseWriter, r *http.Request) {
return return
} }
config.Clean() config.Clean(ctx)
if len(config.URL) == 0 { if len(config.URL) == 0 {
provider.WriteMessage(w, "gemini", "Missing URL value") provider.WriteMessage(w, "gemini", "Missing URL value")
@ -367,3 +371,9 @@ func items(w http.ResponseWriter, r *http.Request) {
provider.WriteJSON(w, items) provider.WriteJSON(w, items)
} }
func secs(ctx *provider.Context, w http.ResponseWriter, r *http.Request) {
sec, err := getSecrets(ctx)
log.IfErr(err)
provider.WriteJSON(w, sec)
}

38
documize/section/gemini/model.go
View file

@ -11,7 +11,12 @@
package gemini package gemini
import "strings" import (
"strings"
"github.com/documize/community/documize/section/provider"
"github.com/documize/community/wordsmith/log"
)
// the HTML that is rendered by this section. // the HTML that is rendered by this section.
const renderTemplate = ` const renderTemplate = `
@ -82,8 +87,37 @@ type geminiConfig struct {
Filter map[string]interface{} `json:"filter"` Filter map[string]interface{} `json:"filter"`
} }
func (c *geminiConfig) Clean() { func (c *geminiConfig) Clean(ctx *provider.Context) {
if ctx != nil {
sec, err := getSecrets(ctx)
if err == nil {
if len(sec.APIKey) > 0 && len(sec.Username) > 0 && len(sec.URL) > 0 {
c.APIKey = strings.TrimSpace(sec.APIKey)
c.Username = strings.TrimSpace(sec.Username)
c.URL = strings.TrimSpace(sec.URL)
}
}
}
c.APIKey = strings.TrimSpace(c.APIKey) c.APIKey = strings.TrimSpace(c.APIKey)
c.Username = strings.TrimSpace(c.Username) c.Username = strings.TrimSpace(c.Username)
c.URL = strings.TrimSpace(c.URL) c.URL = strings.TrimSpace(c.URL)
} }
func (c *geminiConfig) SaveSecrets(ctx *provider.Context) {
var sec secrets
sec.APIKey = strings.TrimSpace(c.APIKey)
sec.Username = strings.TrimSpace(c.Username)
sec.URL = strings.TrimSpace(c.URL)
log.IfErr(ctx.MarshalSecrets(sec))
}
type secrets struct {
URL string `json:"url"`
Username string `json:"username"`
APIKey string `json:"apikey"`
}
func getSecrets(ctx *provider.Context) (sec secrets, err error) {
err = ctx.UnmarshalSecrets(&sec)
return
}

30
documize/section/provider/provider.go
View file

@ -210,7 +210,20 @@ func (c *Context) SaveSecrets(JSONobj string) error {
return errors.New("SaveSecrets() may only be called from within Command()") return errors.New("SaveSecrets() may only be called from within Command()")
} }
m := c.prov.Meta() m := c.prov.Meta()
return request.UserConfigSetJSON(c.OrgID, c.UserID, m.ConfigHandle(), JSONobj) return request.UserConfigSetJSON(c.OrgID, c.UserID, m.ContentType, JSONobj)
}
// MarshalSecrets to the database.
// Parameter the same as for json.Marshal().
func (c *Context) MarshalSecrets(sec interface{}) error {
if !c.inCommand {
return errors.New("MarshalSecrets() may only be called from within Command()")
}
byts, err := json.Marshal(sec)
if err != nil {
return err
}
return c.SaveSecrets(string(byts))
} }
// GetSecrets for the current context user/org. // GetSecrets for the current context user/org.
@ -220,7 +233,20 @@ func (c *Context) SaveSecrets(JSONobj string) error {
// Errors return the empty string. // Errors return the empty string.
func (c *Context) GetSecrets(JSONpath string) string { func (c *Context) GetSecrets(JSONpath string) string {
m := c.prov.Meta() m := c.prov.Meta()
return request.UserConfigGetJSON(c.OrgID, c.UserID, m.ConfigHandle(), JSONpath) return request.UserConfigGetJSON(c.OrgID, c.UserID, m.ContentType, JSONpath)
}
// ErrNoSecrets is returned if no secret is found in the database.
var ErrNoSecrets = errors.New("no secrets in database")
// UnmarshalSecrets from the database.
// Parameter the same as for "v" in json.Unmarshal().
func (c *Context) UnmarshalSecrets(v interface{}) error {
secTxt := c.GetSecrets("") // get all the json of the secrets
if len(secTxt) > 0 {
return json.Unmarshal([]byte(secTxt), v)
}
return ErrNoSecrets
} }
// sort sections in order that that should be presented. // sort sections in order that that should be presented.