jamesread 1 rok temu
rodzic
commit
0d981773b3

+ 6 - 6
internal/httpservers/restapi_auth_oauth2.go

@@ -20,10 +20,10 @@ var (
 )
 )
 
 
 type oauth2State struct {
 type oauth2State struct {
-	providerConfig  *oauth2.Config
-	providerName string
-	Username  string
-	Usergroup string
+	providerConfig *oauth2.Config
+	providerName   string
+	Username       string
+	Usergroup      string
 }
 }
 
 
 func assignIfEmpty(target *string, value string) {
 func assignIfEmpty(target *string, value string) {
@@ -125,8 +125,8 @@ func handleOAuthLogin(w http.ResponseWriter, r *http.Request) {
 
 
 	registeredStates[state] = &oauth2State{
 	registeredStates[state] = &oauth2State{
 		providerConfig: provider,
 		providerConfig: provider,
-		providerName: providerName,
-		Username: "",
+		providerName:   providerName,
+		Username:       "",
 	}
 	}
 
 
 	setOauthCallbackCookie(w, r, "olivetin-sid-oauth", state)
 	setOauthCallbackCookie(w, r, "olivetin-sid-oauth", state)

+ 1 - 2
internal/websocket/websocket.go

@@ -38,7 +38,7 @@ type WebsocketExecutionListener struct{}
 func (WebsocketExecutionListener) OnExecutionStarted(ile *executor.InternalLogEntry) {
 func (WebsocketExecutionListener) OnExecutionStarted(ile *executor.InternalLogEntry) {
 	broadcast(&pb.EventExecutionStarted{
 	broadcast(&pb.EventExecutionStarted{
 		LogEntry: internalLogEntryToPb(ile),
 		LogEntry: internalLogEntryToPb(ile),
-	});
+	})
 }
 }
 
 
 func OnEntityChanged() {
 func OnEntityChanged() {
@@ -179,4 +179,3 @@ func internalLogEntryToPb(logEntry *executor.InternalLogEntry) *pb.LogEntry {
 		User:                logEntry.Username,
 		User:                logEntry.Username,
 	}
 	}
 }
 }
-