모듈 업데이트

.gitignore

@@ -4,3 +4,7 @@
 console/
 static/
 config.json
+*-firebase-*.json
+maingate.zip
+maingate.sh
+maingate

config_template.json

@@ -1 +1,30 @@
-{}
+{
+    "maingate_mongodb_url": "mongodb://...",
+    "autologin_ttl": 604800,
+    "redirect_base_url": "",
+    "google_client_id" : "",
+    "google_client_secret" : "",
+
+    "twitter_oauth_key": "",
+    "twitter_oauth_secret": "",
+    "twitter_customer_key": "",
+    "twitter_customer_secret": "",
+
+    "apple_client_id": "",
+    "apple_privatekey": "",
+    "apple_service_id": "",
+    "apple_team_id": "",
+    "apple_key_id": "",
+
+    "microsoft_client_id": "",
+    "microsoft_client_secret" : "",
+
+    "gamepot_project_id": "",
+    "gamepot_logincheckapi_url": "",
+
+    "firebase_admin_sdk_credentialfile": "",
+
+   "maingate_global_admins" : [
+        "mountain@action2quare.com"
+]
+}

core/api.go

@@ -421,6 +421,12 @@ func (caller apiCaller) serviceAPI(w http.ResponseWriter, r *http.Request) error
 			return nil
 		}
 
+		if len(service.ServerApiTokens) == 0 {
+			service.ServerApiTokens = []primitive.ObjectID{
+				primitive.NewObjectID(),
+			}
+		}
+
 		filter := bson.M{"_id": service.Id}
 		if len(service.ServiceCode) == 0 {
 			service.ServiceCode = hex.EncodeToString(service.Id[6:])

core/watch.go

@@ -98,7 +98,7 @@ func (mg *Maingate) watchWhitelistCollection(parentctx context.Context) {
 
 		changed := stream.TryNext(ctx)
 		if ctx.Err() != nil {
-			logger.Error("watchServiceCollection stream.TryNext failed. process should be restarted! :", ctx.Err().Error())
+			logger.Error("watchWhitelistCollection stream.TryNext failed. process should be restarted! :", ctx.Err().Error())
 			break
 		}
 
@@ -124,12 +124,20 @@ func (mg *Maingate) watchWhitelistCollection(parentctx context.Context) {
 					}
 				}
 			} else {
-				logger.Error("watchServiceCollection stream.Decode failed :", err)
+				logger.Error("watchWhitelistCollection stream.Decode failed :", err)
 			}
 		} else if stream.Err() != nil || stream.ID() == 0 {
-			logger.Error("watchServiceCollection stream error :", stream.Err())
+			select {
+			case <-ctx.Done():
+				logger.Println("watchWhitelistCollection is done")
+				stream.Close(ctx)
+				return
+
+			case <-time.After(time.Second):
+				logger.Error("watchWhitelistCollection stream error :", stream.Err())
 				stream.Close(ctx)
 				stream = nil
+			}
 		} else {
 			time.Sleep(time.Second)
 		}
@@ -187,9 +195,17 @@ func (mg *Maingate) watchFileCollection(parentctx context.Context, serveMux *htt
 
 		if !changed {
 			if stream.Err() != nil || stream.ID() == 0 {
+				select {
+				case <-ctx.Done():
+					logger.Println("watchServiceCollection is done")
+					stream.Close(ctx)
+					return
+
+				case <-time.After(time.Second):
 					logger.Error("watchServiceCollection stream error :", stream.Err())
 					stream.Close(ctx)
 					stream = nil
+				}
 			} else {
 				time.Sleep(time.Second)
 			}
@@ -346,9 +362,17 @@ func (mg *Maingate) watchServiceCollection(parentctx context.Context, serveMux *
 				logger.Error("watchServiceCollection stream.Decode failed :", err)
 			}
 		} else if stream.Err() != nil || stream.ID() == 0 {
+			select {
+			case <-ctx.Done():
+				logger.Println("watchServiceCollection is done")
+				stream.Close(ctx)
+				return
+
+			case <-time.After(time.Second):
 				logger.Error("watchServiceCollection stream error :", stream.Err())
 				stream.Close(ctx)
 				stream = nil
+			}
 		} else {
 			time.Sleep(time.Second)
 		}
@@ -422,9 +446,17 @@ func watchAuthCollection(parentctx context.Context, ac *common.AuthCollection, m
 				logger.Error("watchAuthCollection stream.Decode failed :", err)
 			}
 		} else if stream.Err() != nil || stream.ID() == 0 {
+			select {
+			case <-ctx.Done():
+				logger.Println("watchAuthCollection is done")
+				stream.Close(ctx)
+				return
+
+			case <-time.After(time.Second):
 				logger.Error("watchAuthCollection stream error :", stream.Err())
 				stream.Close(ctx)
 				stream = nil
+			}
 		} else {
 			time.Sleep(time.Second)
 		}

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	go.mongodb.org/mongo-driver v1.11.6
 	google.golang.org/api v0.123.0
-	repositories.action2quare.com/ayo/gocommon v0.0.0-20230528100715-93bd4f6c0bab
+	repositories.action2quare.com/ayo/gocommon v0.0.0-20230612013915-5950ff4bb82e
 )
 
 require (

go.sum

@@ -258,9 +258,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20230524061015-e95efa06a6d4 h1:DFrkLvbPWqwVDU4X0QGJs2lhPduJYJU+JM/r1L2RMwo=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20230524061015-e95efa06a6d4/go.mod h1:pw573a06qV7dP1lSyavbWmzyYAsmwtK6mdbFENbh3cs=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20230524093812-0acae49a22e7 h1:4U70jZtyMQpcF1T8z/HU8LOR2/MXoF2eJvun6lbnyuo=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20230524093812-0acae49a22e7/go.mod h1:5RmALPCFGFmqXa+AAPLsQaSlBVBafwX1H2CnIhsCM50=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20230528100715-93bd4f6c0bab h1:EMlxwDayv3rn8ttJcJuDLYoHA5odVn85+LjdAuw+2dw=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20230528100715-93bd4f6c0bab/go.mod h1:ng62uGMGXyQSeuxePG5gJAMtip4Rnspu5Tu7hgvaXns=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20230612013915-5950ff4bb82e h1:m0jo1r+2NtBfxwj92e6EVaBZpzTDT6Hq7D93vWO4h9Y=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20230612013915-5950ff4bb82e/go.mod h1:ng62uGMGXyQSeuxePG5gJAMtip4Rnspu5Tu7hgvaXns=