Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
1cebf1db
Commit
1cebf1db
authored
Mar 28, 2022
by
email
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: const session secret key in dev
parent
8f76120e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
17 deletions
+9
-17
root.go
bin/server/cmd/root.go
+1
-1
server.go
server/server.go
+6
-2
user.go
server/user.go
+1
-1
webhook.go
server/webhook.go
+1
-2
PreferencesSection.tsx
web/src/components/PreferencesSection.tsx
+0
-11
No files found.
bin/server/cmd/root.go
View file @
1cebf1db
...
@@ -37,7 +37,7 @@ func (m *Main) Run() error {
...
@@ -37,7 +37,7 @@ func (m *Main) Run() error {
m
.
db
=
db
m
.
db
=
db
s
:=
server
.
NewServer
(
m
.
profile
.
port
)
s
:=
server
.
NewServer
(
m
.
profile
.
port
,
m
.
profile
.
mode
)
s
.
ShortcutService
=
store
.
NewShortcutService
(
db
)
s
.
ShortcutService
=
store
.
NewShortcutService
(
db
)
s
.
MemoService
=
store
.
NewMemoService
(
db
)
s
.
MemoService
=
store
.
NewMemoService
(
db
)
...
...
server/server.go
View file @
1cebf1db
...
@@ -23,7 +23,7 @@ type Server struct {
...
@@ -23,7 +23,7 @@ type Server struct {
port
int
port
int
}
}
func
NewServer
(
port
int
)
*
Server
{
func
NewServer
(
port
int
,
mode
string
)
*
Server
{
e
:=
echo
.
New
()
e
:=
echo
.
New
()
e
.
Debug
=
true
e
.
Debug
=
true
e
.
HideBanner
=
true
e
.
HideBanner
=
true
...
@@ -46,7 +46,11 @@ func NewServer(port int) *Server {
...
@@ -46,7 +46,11 @@ func NewServer(port int) *Server {
HTML5
:
true
,
HTML5
:
true
,
}))
}))
e
.
Use
(
session
.
Middleware
(
sessions
.
NewCookieStore
([]
byte
(
securecookie
.
GenerateRandomKey
(
16
)))))
secret
:=
[]
byte
(
"justmemos"
)
if
mode
!=
"dev"
{
secret
=
securecookie
.
GenerateRandomKey
(
16
)
}
e
.
Use
(
session
.
Middleware
(
sessions
.
NewCookieStore
(
secret
)))
s
:=
&
Server
{
s
:=
&
Server
{
e
:
e
,
e
:
e
,
...
...
server/user.go
View file @
1cebf1db
...
@@ -11,8 +11,8 @@ import (
...
@@ -11,8 +11,8 @@ import (
)
)
func
(
s
*
Server
)
registerUserRoutes
(
g
*
echo
.
Group
)
{
func
(
s
*
Server
)
registerUserRoutes
(
g
*
echo
.
Group
)
{
// GET /api/user/me is used to check if the user is logged in.
g
.
GET
(
"/user/me"
,
func
(
c
echo
.
Context
)
error
{
g
.
GET
(
"/user/me"
,
func
(
c
echo
.
Context
)
error
{
// /api/user/me is used to check if the user is logged in,
userSessionId
:=
c
.
Get
(
getUserIdContextKey
())
userSessionId
:=
c
.
Get
(
getUserIdContextKey
())
if
userSessionId
==
nil
{
if
userSessionId
==
nil
{
return
echo
.
NewHTTPError
(
http
.
StatusUnauthorized
,
"Missing session"
)
return
echo
.
NewHTTPError
(
http
.
StatusUnauthorized
,
"Missing session"
)
...
...
server/webhook.go
View file @
1cebf1db
...
@@ -103,9 +103,8 @@ func (s *Server) registerWebhookRoutes(g *echo.Group) {
...
@@ -103,9 +103,8 @@ func (s *Server) registerWebhookRoutes(g *echo.Group) {
}
}
c
.
Response
()
.
Writer
.
WriteHeader
(
http
.
StatusOK
)
c
.
Response
()
.
Writer
.
WriteHeader
(
http
.
StatusOK
)
c
.
Response
()
.
Writer
.
Header
()
.
Set
(
"Content-Type"
,
"application/octet-stream"
)
c
.
Response
()
.
Writer
.
Header
()
.
Set
(
"Content-Type"
,
resource
.
Type
)
c
.
Response
()
.
Writer
.
Write
(
resource
.
Blob
)
c
.
Response
()
.
Writer
.
Write
(
resource
.
Blob
)
return
nil
return
nil
})
})
}
}
web/src/components/PreferencesSection.tsx
View file @
1cebf1db
import
{
useContext
}
from
"react"
;
import
{
useContext
}
from
"react"
;
import
appContext
from
"../stores/appContext"
;
import
appContext
from
"../stores/appContext"
;
import
{
globalStateService
,
memoService
}
from
"../services"
;
import
{
globalStateService
,
memoService
}
from
"../services"
;
import
{
parseHtmlToRawText
}
from
"../helpers/marked"
;
import
{
formatMemoContent
}
from
"./Memo"
;
import
{
formatMemoContent
}
from
"./Memo"
;
import
"../less/preferences-section.less"
;
import
"../less/preferences-section.less"
;
...
@@ -49,13 +48,6 @@ const PreferencesSection: React.FC<Props> = () => {
...
@@ -49,13 +48,6 @@ const PreferencesSection: React.FC<Props> = () => {
document
.
body
.
removeChild
(
element
);
document
.
body
.
removeChild
(
element
);
};
};
const
handleFormatMemosBtnClick
=
async
()
=>
{
const
memos
=
memoService
.
getState
().
memos
;
for
(
const
m
of
memos
)
{
memoService
.
updateMemo
(
m
.
id
,
parseHtmlToRawText
(
m
.
content
));
}
};
return
(
return
(
<>
<>
<
div
className=
"section-container preferences-section-container"
>
<
div
className=
"section-container preferences-section-container"
>
...
@@ -83,9 +75,6 @@ const PreferencesSection: React.FC<Props> = () => {
...
@@ -83,9 +75,6 @@ const PreferencesSection: React.FC<Props> = () => {
<
button
className=
"px-2 py-1 border rounded text-base hover:opacity-80"
onClick=
{
handleExportBtnClick
}
>
<
button
className=
"px-2 py-1 border rounded text-base hover:opacity-80"
onClick=
{
handleExportBtnClick
}
>
Export data as JSON
Export data as JSON
</
button
>
</
button
>
<
button
className=
"btn format-btn hidden"
onClick=
{
handleFormatMemosBtnClick
}
>
Format Data
</
button
>
</
div
>
</
div
>
</
div
>
</
div
>
</>
</>
...
...
Write
Preview
Markdown
is supported
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