chore: restore default behavior when OAUTH2_ORG is not set

Dockerfile

@@ -4,16 +4,14 @@ FROM golang:alpine AS build-back
 WORKDIR /app
 ARG COMMIT
 COPY . .
-RUN go build -o wg-gen-web-linux github.com/vx3r/wg-gen-web/cmd/wg-gen-web
+RUN go build -o wg-gen-web-linux -ldflags="-X 'github.com/vx3r/wg-gen-web/version.Version=${COMMIT}'" github.com/vx3r/wg-gen-web/cmd/wg-gen-web
 
 FROM node:18.13.0-alpine AS build-front
 WORKDIR /app
 COPY ui/package*.json ./
-COPY ui/yarn.lock ./
 RUN npm install
 COPY ui/ ./
-#RUN yarn build --frozen-lockfile --verbose
+RUN npm run build
-RUN npm ci
 
 FROM alpine
 WORKDIR /app

api/v1/auth/auth.go

@@ -99,17 +99,21 @@ func oauth2Exchange(c *gin.Context) {
 
 	cacheDb.Delete(loginVals.ClientId)
 
-	// check if user is in org
+	// This is primarily used for github, but can be used for other oauth2 providers where it makes sense.
-	teamsEnv := os.Getenv("OAUTH2_TEAMS")
+	// Check if user is in org, use OAUTH2_TEAMS if you want to further restrict access within an org. This is optional.
-	var teams []string
+	if os.Getenv("OAUTH2_ORG") != "" {
-	if teamsEnv != "" {
-		teams = strings.Split(teamsEnv, ",")
-	}
 
-	inOrg, err := oauth2Client.CheckMembership(oauth2Token, os.Getenv("OAUTH2_ORG"), teams)
+		teamsEnv := os.Getenv("OAUTH2_TEAMS")
-	if err != nil || !inOrg {
+		var teams []string
-		c.AbortWithStatus(http.StatusForbidden)
+		if teamsEnv != "" {
-		return
+			teams = strings.Split(teamsEnv, ",")
+		}
+
+		inOrg, err := oauth2Client.CheckMembership(oauth2Token, os.Getenv("OAUTH2_ORG"), teams)
+		if err != nil || !inOrg {
+			c.AbortWithStatus(http.StatusForbidden)
+			return
+		}
 	}
 
 	cacheDb.Set(oauth2Token.AccessToken, oauth2Token, cache.DefaultExpiration)

auth/oauth2oidc/oauth2oidc.go

@@ -51,6 +51,7 @@ func (o *Oauth2idc) CodeUrl(state string) string {
 
 // Check if current user is in given org
 func (o *Oauth2idc) CheckMembership(oauth2Token *oauth2.Token, org string, teams []string) (bool, error) {
+	// TODO: Add real implementation
 	return false, nil
 }