mirrors/remark42
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused code

Browse Source
This commit is contained in:
Umputun
2018-05-30 18:19:38 -05:00
parent b00a49eaf7
commit ba42e804f7
2 changed files with 16 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main.go
+16 -20
View File
@@ -47,14 +47,13 @@ type Opts struct {
LowScore int `long:"low-score" env:"LOW_SCORE" default:"-5" description:"low score threshold"`
CriticalScore int `long:"critical-score" env:"CRITICAL_SCORE" default:"-10" description:"critical score threshold"`
ReadOnlyAge int `long:"read-age" env:"READONLY_AGE" default:"0" description:"read-only age of comments"`
GoogleCID string `long:"google-cid" env:"REMARK_GOOGLE_CID" description:"Google OAuth client ID"`
GoogleCSEC string `long:"google-csec" env:"REMARK_GOOGLE_CSEC" description:"Google OAuth client secret"`
GithubCID string `long:"github-cid" env:"REMARK_GITHUB_CID" description:"Github OAuth client ID"`
GithubCSEC string `long:"github-csec" env:"REMARK_GITHUB_CSEC" description:"Github OAuth client secret"`
FacebookCID string `long:"facebook-cid" env:"REMARK_FACEBOOK_CID" description:"Facebook OAuth client ID"`
FacebookCSEC string `long:"facebook-csec" env:"REMARK_FACEBOOK_CSEC" description:"Facebook OAuth client secret"`
DisqusCID string `long:"disqus-cid" env:"REMARK_DISQUS_CID" description:"Disqus OAuth client ID"`
DisqusCSEC string `long:"disqus-csec" env:"REMARK_DISQUS_CSEC" description:"Disqus OAuth client secret"`
GoogleCID string `long:"google-cid" env:"REMARK_GOOGLE_CID" description:"Google OAuth client ID"`
GoogleCSEC string `long:"google-csec" env:"REMARK_GOOGLE_CSEC" description:"Google OAuth client secret"`
GithubCID string `long:"github-cid" env:"REMARK_GITHUB_CID" description:"Github OAuth client ID"`
GithubCSEC string `long:"github-csec" env:"REMARK_GITHUB_CSEC" description:"Github OAuth client secret"`
FacebookCID string `long:"facebook-cid" env:"REMARK_FACEBOOK_CID" description:"Facebook OAuth client ID"`
FacebookCSEC string `long:"facebook-csec" env:"REMARK_FACEBOOK_CSEC" description:"Facebook OAuth client secret"`
Port int `long:"port" env:"REMARK_PORT" default:"8080" description:"port"`
WebRoot string `long:"web-root" env:"REMARK_WEB_ROOT" default:"./web" description:"web root directory"`
@@ -65,10 +64,10 @@ var revision = "unknown"
// Application holds all active objects
type Application struct {
Opts
srv *api.Rest
migrator *api.Migrator
exporter migrator.Exporter
terminated chan struct{}
restSrv *api.Rest
migratorSrv *api.Migrator
exporter migrator.Exporter
terminated chan struct{}
}
func main() {
@@ -154,7 +153,7 @@ func New(opts Opts) (*Application, error) {
}
srv.ScoreThresholds.Low, srv.ScoreThresholds.Critical = opts.LowScore, opts.CriticalScore
tch := make(chan struct{})
return &Application{srv: srv, migrator: migr, exporter: exporter, Opts: opts, terminated: tch}, nil
return &Application{restSrv: srv, migratorSrv: migr, exporter: exporter, Opts: opts, terminated: tch}, nil
}
// Run all application objects
@@ -166,12 +165,12 @@ func (a *Application) Run(ctx context.Context) error {
go func() {
// shutdown on context cancellation
<-ctx.Done()
a.srv.Shutdown()
a.migrator.Shutdown()
a.restSrv.Shutdown()
a.migratorSrv.Shutdown()
}()
a.activateBackup(ctx) // runs in goroutine for each site
go a.migrator.Run(a.Port + 1)
a.srv.Run(a.Port)
go a.migratorSrv.Run(a.Port + 1)
a.restSrv.Run(a.Port)
close(a.terminated)
return nil
}
@@ -262,9 +261,6 @@ func makeAuthProviders(jwtService *auth.JWT, avatarProxy *proxy.Avatar, ds servi
if opts.FacebookCID != "" && opts.FacebookCSEC != "" {
providers = append(providers, auth.NewFacebook(makeParams(opts.FacebookCID, opts.FacebookCSEC)))
}
if opts.DisqusCID != "" && opts.DisqusCSEC != "" {
providers = append(providers, auth.NewDisqus(makeParams(opts.DisqusCID, opts.DisqusCSEC)))
}
if len(providers) == 0 {
log.Printf("[WARN] no auth providers defined")
}
app/rest/auth/providers.go
-26
View File
@@ -3,7 +3,6 @@ package auth
import (
"encoding/json"
"golang.org/x/oauth2"
"golang.org/x/oauth2/facebook"
"golang.org/x/oauth2/github"
"golang.org/x/oauth2/google"
@@ -98,28 +97,3 @@ func NewFacebook(p Params) Provider {
},
})
}
// NewDisqus makes disqus oauth2 provider. TODO: WIP - seems to need client_id param
func NewDisqus(p Params) Provider {
return initProvider(p, Provider{
Name: "disqus",
Endpoint: oauth2.Endpoint{
AuthURL: "https://disqus.com/api/oauth/2.0/authorize/",
TokenURL: "https://disqus.com/api/oauth/2.0/access_token/",
},
RedirectURL: p.RemarkURL + "/auth/disqus/callback",
Scopes: []string{"read"},
InfoURL: "https://disqus.com/api/3.0/users/details.json",
MapUser: func(data userData, _ []byte) store.User {
userInfo := store.User{
ID: "disqus_" + store.EncodeID(data.value("login")),
Name: data.value("name"),
Picture: data.value("avatar_url"),
}
if userInfo.Name == "" {
userInfo.Name = userInfo.ID
}
return userInfo
},
})
}